|
From: <enl...@li...> - 2004-12-30 05:38:02
|
Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_border.c e_border.h e_main.c
Log Message:
Beginning of WM hints abstraction, NetWM hints
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 21 Dec 2004 03:01:18 -0000 1.8
+++ Makefile.am 30 Dec 2004 05:37:53 -0000 1.9
@@ -36,7 +36,8 @@
e_place.h \
e_resist.h \
e_startup.h \
-e_iconify.h
+e_iconify.h \
+e_hints.h
enlightenment_SOURCES = \
@@ -68,6 +69,7 @@
e_resist.c \
e_startup.c \
e_iconify.c \
+e_hints.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_border.c 26 Dec 2004 05:04:02 -0000 1.36
+++ e_border.c 30 Dec 2004 05:37:53 -0000 1.37
@@ -385,7 +385,9 @@
if (bd->client.icccm.take_focus)
{
printf("take focus!\n");
- ecore_x_icccm_take_focus_send(bd->client.win, ECORE_X_CURRENT_TIME);
+ /*
+ ecore_x_icccm_take_focus_send(bd->client.win, ECORE_X_CURRENT_TIME);*/
+ e_hints_active_window_set(bd->client.win);
ecore_x_window_focus(bd->client.win);
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_border.h 23 Dec 2004 06:43:37 -0000 1.12
+++ e_border.h 30 Dec 2004 05:37:53 -0000 1.13
@@ -120,6 +120,18 @@
unsigned int pid : 1;
unsigned int desktop : 1;
} fetch;
+
+ /* NetWM Window state */
+ struct {
+ unsigned char modal : 1;
+ unsigned char maximized_v : 1;
+ unsigned char maximized_h : 1;
+ unsigned char skip_taskbar : 1;
+ unsigned char skip_pager : 1;
+ unsigned char fullscreen : 1;
+ unsigned char stacking : 2; /* 0 = None, 1 = Above, 2 = Below */
+ } state;
+
} netwm;
Ecore_X_Window_Attributes initial_attributes;
} client;
@@ -133,6 +145,7 @@
unsigned char re_manage : 1;
unsigned char shading : 1;
unsigned char shaded : 1;
+ unsigned char sticky : 1;
unsigned char maximized : 1;
unsigned char iconic : 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_main.c 25 Dec 2004 15:33:48 -0000 1.17
+++ e_main.c 30 Dec 2004 05:37:53 -0000 1.18
@@ -112,7 +112,7 @@
_e_main_shutdown(-1);
}
- /* an intle enterer to be called before all others */
+ /* an idle enterer to be called before all others */
_e_main_idle_enterer_before = ecore_idle_enterer_add(_e_main_cb_idler_before, NULL);
/* init x */
@@ -127,6 +127,9 @@
ecore_x_grab();
ecore_x_io_error_handler_set(_e_main_cb_x_fatal, NULL);
+
+ /* Init window manager hints */
+ e_hints_init();
/* setup menu handlers etc. FIXME: check return value */
e_menu_init();
|