Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
      Tag: branch-exp
        E.h config.c ewmh.c extinitwin.c main.c mod-misc.c setup.c x.c 


Log Message:
Multihead fixes, .enlightenment->.e16, misc.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.38
retrieving revision 1.314.2.39
diff -u -3 -r1.314.2.38 -r1.314.2.39
--- E.h 5 Sep 2004 11:46:30 -0000       1.314.2.38
+++ E.h 5 Sep 2004 22:24:35 -0000       1.314.2.39
@@ -2308,6 +2308,7 @@
 /* x.c */
 Display            *EDisplayOpen(const char *dstr);
 void                EDisplayClose(void);
+void                EDisplayDisconnect(void);
 typedef void        (EventCallbackFunc) (XEvent * ev, void *prm);
 void                EventCallbackRegister(Window win, int type,
                                          EventCallbackFunc * func, void *prm);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.111.2.17
retrieving revision 1.111.2.18
diff -u -3 -r1.111.2.17 -r1.111.2.18
--- config.c    5 Sep 2004 11:46:44 -0000       1.111.2.17
+++ config.c    5 Sep 2004 22:24:35 -0000       1.111.2.18
@@ -527,7 +527,7 @@
           EDBUG_RETURN(Estrdup(s));
      }
 
-   /* look in ~/.enlightenment first */
+   /* look in ~/.e16 first */
 
    Esnprintf(s, sizeof(s), "%s/%s", EDirUser(), file);
    if (findLocalizedFile(s) || isfile(s))
@@ -562,7 +562,7 @@
           EDBUG_RETURN(Estrdup(s));
      }
 
-   /* look in ~/.enlightenment first */
+   /* look in ~/.e16 first */
    Esnprintf(s, sizeof(s), "%s/%s", EDirUser(), file);
    if (findLocalizedFile(s) || isfile(s))
       EDBUG_RETURN(Estrdup(s));
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.55.2.4
retrieving revision 1.55.2.5
diff -u -3 -r1.55.2.4 -r1.55.2.5
--- ewmh.c      23 Aug 2004 21:14:42 -0000      1.55.2.4
+++ ewmh.c      5 Sep 2004 22:24:35 -0000       1.55.2.5
@@ -154,6 +154,10 @@
 Atom                _G_WIN_LAUER;
 #endif
 
+/* Startup notification */
+Atom                _NET_STARTUP_INFO_BEGIN;
+Atom                _NET_STARTUP_INFO;
+
 /*
  * Set/clear Atom in list
  */
@@ -264,6 +268,12 @@
    EWMH_SetDesktopSize();
    EWMH_SetWorkArea();
 
+   /* Misc atoms */
+   atom_count = 0;
+
+   _ATOM_INIT(_NET_STARTUP_INFO_BEGIN);
+   _ATOM_INIT(_NET_STARTUP_INFO);
+
    EDBUG_RETURN_;
 }
 
@@ -869,6 +879,22 @@
        EWMH_SetShowingDesktop(event->data.l[0]);
        goto done;
      }
+   else if (event->message_type == _NET_STARTUP_INFO_BEGIN)
+     {
+#if 0
+       Eprintf("EWMH_ProcessClientMessage: _NET_STARTUP_INFO_BEGIN: %lx: %s\n",
+               event->window, (char *)event->data.l);
+#endif
+       goto done;
+     }
+   else if (event->message_type == _NET_STARTUP_INFO)
+     {
+#if 0
+       Eprintf("EWMH_ProcessClientMessage: _NET_STARTUP_INFO      : %lx: %s\n",
+               event->window, (char *)event->data.l);
+#endif
+       goto done;
+     }
 
    /*
     * The ones that do target an application window
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/extinitwin.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- extinitwin.c        5 Sep 2004 11:46:44 -0000       1.1.2.1
+++ extinitwin.c        5 Sep 2004 22:24:35 -0000       1.1.2.2
@@ -208,13 +208,8 @@
 
    SignalsRestore();
 
+   EDisplayDisconnect();
    /* on solairs connection stays up - close */
-   XSetErrorHandler((XErrorHandler) NULL);
-   XSetIOErrorHandler((XIOErrorHandler) NULL);
-
-#ifndef USE_ECORE_X
-   close(ConnectionNumber(disp));
-#endif
 
    ExtInitWinMain();
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.99.2.19
retrieving revision 1.99.2.20
diff -u -3 -r1.99.2.19 -r1.99.2.20
--- main.c      5 Sep 2004 11:46:44 -0000       1.99.2.19
+++ main.c      5 Sep 2004 22:24:35 -0000       1.99.2.20
@@ -84,12 +84,14 @@
    if (str)
       Mode.wm.coredump = 1;
 
+#if 0                          /* No! */
    str = getenv("ECONFDIR");
    if (str)
       EDirUserSet(str);
    str = getenv("ECACHEDIR");
    if (str)
       EDirUserCacheSet(str);
+#endif
 
    /* go head and set up the internal data lists that enlightenment
     * uses for finding everything
@@ -171,7 +173,7 @@
             printf("enlightenment options:\n"
                    "\t-display display_name\n"
                    "\t-ecachedir /path/to/cached/dir\n"
-                   "\t-econfdir /path/to/.enlightenment/conf/dir\n"
+                   "\t-econfdir /path/to/config/dir\n"
                    "\t-ext_init_win window_id\n"
                    "\t-smfile file\n"
                    "\t[-smid | -clientId | --sm-client-id] id\n"
@@ -413,7 +415,7 @@
       return userDir;
 
    home = homedir(getuid());
-   Esnprintf(buf, sizeof(buf), "%s/.enlightenment", home);
+   Esnprintf(buf, sizeof(buf), "%s/.e16", home);
    Efree(home);
    userDir = Estrdup(buf);
 
@@ -511,7 +513,7 @@
 }
 
 /*
- * The user control config is called "~/.enlightenment/e_config-$DISPLAY"
+ * The user control config is called "~/.e16/e_config-$DISPLAY"
  * The client data appends ".clients" onto this filename and the snapshot data
  * appends ".snapshots".
  */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-misc.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -3 -r1.1.2.13 -r1.1.2.14
--- mod-misc.c  1 Sep 2004 23:37:20 -0000       1.1.2.13
+++ mod-misc.c  5 Sep 2004 22:24:35 -0000       1.1.2.14
@@ -105,6 +105,8 @@
    if (!Conf_misc.firsttime)
       return;
    Conf_misc.firsttime = 0;
+   if (!Mode.wm.master)
+      return;
 
    if (fork() == 0)
      {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.139.2.10
retrieving revision 1.139.2.11
diff -u -3 -r1.139.2.10 -r1.139.2.11
--- setup.c     5 Sep 2004 11:46:46 -0000       1.139.2.10
+++ setup.c     5 Sep 2004 22:24:35 -0000       1.139.2.11
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include <signal.h>
 #include <X11/keysym.h>
 
 void
@@ -177,6 +178,7 @@
             else
               {
                  /* We are a slave */
+                 EDisplayDisconnect();
                  Mode.wm.master = 0;
                  VRoot.scr = i;
 #ifdef SIGSTOP
@@ -192,7 +194,7 @@
                    }
                  Esnprintf(subdisplay + strlen(subdisplay), 10, ".%d", i);
                  dstr = Estrdup(subdisplay);
-                 disp = XOpenDisplay(dstr);
+                 disp = EDisplayOpen(dstr);
                  /* Terminate the loop as I am the child process... */
                  break;
               }
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.71.2.10
retrieving revision 1.71.2.11
diff -u -3 -r1.71.2.10 -r1.71.2.11
--- x.c 5 Sep 2004 11:46:47 -0000       1.71.2.10
+++ x.c 5 Sep 2004 22:24:35 -0000       1.71.2.11
@@ -1086,6 +1086,21 @@
 #endif
    XSetErrorHandler((XErrorHandler) NULL);
    XSetIOErrorHandler((XIOErrorHandler) NULL);
+   disp = NULL;
+}
+
+void
+EDisplayDisconnect(void)
+{
+   if (!disp)
+      return;
+#ifdef USE_ECORE_X
+   ecore_x_disconnect();
+#else
+   close(ConnectionNumber(disp));
+#endif
+   XSetErrorHandler((XErrorHandler) NULL);
+   XSetIOErrorHandler((XIOErrorHandler) NULL);
 
    disp = NULL;
 }




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to