Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e.h e_border.c e_main.c
Added Files:
e_atoms.c e_atoms.h
Log Message:
Knocked off one FIXME. Only handle necessary properties on a window property
change callback.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 2 Dec 2004 04:24:54 -0000 1.4
+++ Makefile.am 2 Dec 2004 07:43:33 -0000 1.5
@@ -49,6 +49,8 @@
e_module.c \
e_apps.h \
e_apps.c \
+e_atoms.h \
+e_atoms.c \
e_utils.h \
e_utils.c \
e_canvas.h \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e.h 25 Nov 2004 05:31:20 -0000 1.3
+++ e.h 2 Dec 2004 07:43:33 -0000 1.4
@@ -61,6 +61,7 @@
#include "e_int_menus.h"
#include "e_module.h"
#include "e_apps.h"
+#include "e_atoms.h"
#include "e_utils.h"
#include "e_canvas.h"
#include "e_focus.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_border.c 29 Nov 2004 07:40:06 -0000 1.9
+++ e_border.c 2 Dec 2004 07:43:33 -0000 1.10
@@ -640,24 +640,62 @@
if (!bd) return 1;
{
char *name;
-
+
name = XGetAtomName(ecore_x_display_get(), e->atom);
printf("property for %0x [%s]\n", e->win, name);
XFree(name);
}
- /* FIXME: only flag the property to fetch based on the atom of the change */
- bd->client.icccm.fetch.title = 1;
- bd->client.icccm.fetch.name_class = 1;
- bd->client.icccm.fetch.icon_name = 1;
- bd->client.icccm.fetch.machine = 1;
- bd->client.icccm.fetch.hints = 1;
- bd->client.icccm.fetch.size_pos_hints = 1;
- bd->client.icccm.fetch.protocol = 1;
- bd->client.mwm.fetch.hints = 1;
- bd->client.netwm.fetch.pid = 1;
- bd->client.netwm.fetch.desktop = 1;
+ if (e->atom == _e_atom_wm_name)
+ {
+ bd->client.icccm.fetch.title = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_class)
+ {
+ bd->client.icccm.fetch.name_class = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_icon_name)
+ {
+ bd->client.icccm.fetch.icon_name = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_client_machine)
+ {
+ bd->client.icccm.fetch.machine = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_protocols)
+ {
+ bd->client.icccm.fetch.protocol = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_hints)
+ {
+ bd->client.icccm.fetch.hints = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_size_hints)
+ {
+ bd->client.icccm.fetch.size_pos_hints = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_wm_hints)
+ {
+ bd->client.mwm.fetch.hints = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_netwm_pid)
+ {
+ bd->client.netwm.fetch.pid = 1;
+ bd->changed = 1;
+ }
+ else if (e->atom == _e_atom_netwm_desktop)
+ {
+ bd->client.netwm.fetch.desktop = 1;
+ bd->changed = 1;
+ }
// bd->client.border.changed = 1;
- bd->changed = 1;
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_main.c 2 Dec 2004 07:00:30 -0000 1.5
+++ e_main.c 2 Dec 2004 07:43:33 -0000 1.6
@@ -181,6 +181,13 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_screens_shutdown);
+ /* init global atoms */
+ if (!e_atoms_init())
+ {
+ e_error_message_show("Enlightenment cannot set up atoms system.");
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(e_atoms_shutdown);
/* init border system */
if (!e_focus_init())
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
