Changeset 5637

Timestamp:

Nov 30, 2005, 11:56:41 AM (21 years ago)

Author:

eugene

Message:

adding no X mode

Location:

trunk/Ohana/src/kii

Files:

• event/CheckPipe.c (modified) (1 diff)
• event/EventLoop.c (modified) (2 diffs)
• include/prototypes.h (modified) (1 diff)
• picture/JPEGit24.c (added)
• setup/CloseDisplay.c (modified) (2 diffs)
• setup/DefineLayout.c (modified) (1 diff)
• setup/Ximage.c (modified) (1 diff)
• setup/args.c (added)

trunk/Ohana/src/kii/event/CheckPipe.c

@@ -101 +101 @@
 
   if (!strcmp (buffer, "JPEG")) {
-    status = JPEGit (graphic, layout);
+    status = JPEGit24 (graphic, layout);
     write (layout[0].Ximage, "DONE", 4);
     return (status);

trunk/Ohana/src/kii/event/EventLoop.c

@@ -20 +20 @@
   Display        *display;
   
-  Refresh (graphic, layout, 1);
+  if (USE_XWINDOW) Refresh (graphic, layout, 1);
 
   status = TRUE;
@@ -28 +28 @@
       return (FALSE);
     
+    if (!USE_XWINDOW) {
+      usleep (50000);
+      continue;
+    }
+
     if (XEventsQueued (graphic[0].display, QueuedAfterFlush) < 1) {
       usleep (10000);

trunk/Ohana/src/kii/include/prototypes.h

@@ -6 +6 @@
 int PSit (Graphic *graphic, Layout *layout, int Raw);
 int JPEGit (Graphic *graphic, Layout *layout);
+int JPEGit24 (Graphic *graphic, Layout *layout);
 int Resize (Graphic *graphic, Layout *layout);
 int Center (Graphic *graphic, Layout *layout);

trunk/Ohana/src/kii/setup/CloseDisplay.c

@@ -2 +2 @@
 
 /************** CloseDisplay *************/
-void
-CloseDisplay (graphic)
-Graphic *graphic;
-{
+void CloseDisplay (Graphic *graphic) {
+
+  XFlush (graphic[0].display);
+  XFreeFont (graphic[0].display, graphic[0].font); 
   XFreeGC (graphic[0].display, graphic[0].gc);
   XDestroySubwindows (graphic[0].display, graphic[0].window);
@@ -11 +11 @@
   XFlush (graphic[0].display);
   XCloseDisplay (graphic[0].display);
+  return;
 }
 

trunk/Ohana/src/kii/setup/DefineLayout.c

@@ -6 +6 @@
   struct sockaddr_un Address;
   char temp[100];
-
-  DEBUG = FALSE;
-  if ((N = get_argument (argc, argv, "-debug"))) {
-    remove_argument(N, &argc, argv);
-    DEBUG = TRUE;
-  }
 
   /** initiate connection with mana **/

trunk/Ohana/src/kii/setup/Ximage.c

@@ -6 +6 @@
   Layout  layout;
   
+  args (&argc, argv);
+
   bzero (&graphic, sizeof(Graphic));
   bzero (&layout, sizeof(Layout));
 
-  SetUpDisplay (&graphic, &argc, argv);
-  SetUpWindow (&graphic, &argc, argv);
+  if (USE_XWINDOW) SetUpDisplay (&graphic, &argc, argv);
+  if (USE_XWINDOW) SetUpWindow (&graphic, &argc, argv);
 
   DefineLayout (&layout, &graphic, argc, argv);
   EventLoop (&graphic, &layout);
 
-  XFlush (graphic.display);
-  XFreeFont (graphic.display, graphic.font); 
-  CloseDisplay (&graphic);
+  if (USE_XWINDOW) CloseDisplay (&graphic);
   exit (0);
 }