Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x_window_prop.c
Log Message:
Added support for NetWM window state hints.
All were successfully tested except the fullscreen state (is this
supported in E16.6?)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Ecore_X.h 14 Oct 2003 21:42:28 -0000 1.14
+++ Ecore_X.h 3 Nov 2003 00:27:15 -0000 1.15
@@ -503,6 +503,43 @@
ECORE_X_WINDOW_INPUT_MODE_ACTIVE_GLOBAL
} Ecore_X_Window_Input_Mode;
+typedef enum _Ecore_X_Window_State {
+ /** The window is a modal dialog box. */
+ ECORE_X_WINDOW_STATE_MODAL,
+
+ /** The window manager should keep the window's position fixed
+ * even if the virtual desktop scrolls. */
+ ECORE_X_WINDOW_STATE_STICKY,
+
+ /** The window has the maximum vertical size. */
+ ECORE_X_WINDOW_STATE_MAXIMIZED_VERT,
+
+ /** The window has the maximum horizontal size. */
+ ECORE_X_WINDOW_STATE_MAXIMIZED_HORZ,
+
+ /** The window is shaded. */
+ ECORE_X_WINDOW_STATE_SHADED,
+
+ /** The window should not be included in the taskbar. */
+ ECORE_X_WINDOW_STATE_SKIP_TASKBAR,
+
+ /** The window should not be included in the pager. */
+ ECORE_X_WINDOW_STATE_SKIP_PAGER,
+
+ /** The window is invisible (i.e. minimized/iconified) */
+ ECORE_X_WINDOW_STATE_HIDDEN,
+
+ /** The window should fill the entire screen and have no
+ * window border/decorations */
+ ECORE_X_WINDOW_STATE_FULLSCREEN,
+
+ /* The following are not documented because they are not
+ * intended for use in applications. */
+ ECORE_X_WINDOW_STATE_ABOVE,
+ ECORE_X_WINDOW_STATE_BELOW
+
+} Ecore_X_Window_State;
+
int ecore_x_init(const char *name);
int ecore_x_shutdown(void);
Ecore_X_Display *ecore_x_display_get(void);
@@ -574,6 +611,9 @@
void ecore_x_window_prop_window_type_splash_set(Ecore_X_Window win);
void ecore_x_window_prop_window_type_dialog_set(Ecore_X_Window win);
void ecore_x_window_prop_window_type_normal_set(Ecore_X_Window win);
+void ecore_x_window_prop_state_set(Ecore_X_Window win,
Ecore_X_Window_State s);
+int ecore_x_window_prop_state_isset(Ecore_X_Window win,
Ecore_X_Window_State s);
+void ecore_x_window_prop_state_unset(Ecore_X_Window win,
Ecore_X_Window_State s);
void ecore_x_window_shape_mask_set(Ecore_X_Window win, Ecore_X_Pixmap
mask);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_window_prop.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_x_window_prop.c 14 Oct 2003 21:42:28 -0000 1.15
+++ ecore_x_window_prop.c 3 Nov 2003 00:27:15 -0000 1.16
@@ -801,7 +801,7 @@
}
/**
- * Change a windows type.
+ * Change a window's type.
* @param win The Window
* @param type The Type
*
@@ -830,6 +830,152 @@
free(data);
}
+static Ecore_X_Atom
+_ecore_x_window_prop_state_atom_get(Ecore_X_Window_State s)
+{
+ switch(s)
+ {
+ case ECORE_X_WINDOW_STATE_MODAL:
+ return _ecore_x_atom_net_wm_state_modal;
+ case ECORE_X_WINDOW_STATE_STICKY:
+ return _ecore_x_atom_net_wm_state_sticky;
+ case ECORE_X_WINDOW_STATE_MAXIMIZED_VERT:
+ return _ecore_x_atom_net_wm_state_maximized_vert;
+ case ECORE_X_WINDOW_STATE_MAXIMIZED_HORZ:
+ return _ecore_x_atom_net_wm_state_maximized_horz;
+ case ECORE_X_WINDOW_STATE_SHADED:
+ return _ecore_x_atom_net_wm_state_shaded;
+ case ECORE_X_WINDOW_STATE_SKIP_TASKBAR:
+ return _ecore_x_atom_net_wm_state_skip_taskbar;
+ case ECORE_X_WINDOW_STATE_SKIP_PAGER:
+ return _ecore_x_atom_net_wm_state_skip_pager;
+ case ECORE_X_WINDOW_STATE_HIDDEN:
+ return _ecore_x_atom_net_wm_state_skip_pager;
+ case ECORE_X_WINDOW_STATE_FULLSCREEN:
+ return _ecore_x_atom_net_wm_state_fullscreen;
+ case ECORE_X_WINDOW_STATE_ABOVE:
+ return _ecore_x_atom_net_wm_state_above;
+ case ECORE_X_WINDOW_STATE_BELOW:
+ return _ecore_x_atom_net_wm_state_below;
+ default:
+ return 0;
+ }
+}
+
+/**
+ * Set a state for a window
+ * @param win The Window whose properties will be changed
+ * @param s The state to be set for this window
+ *
+ * Adds the state to the window's properties if not already included.
+ * <hr><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+ */
+void
+ecore_x_window_prop_state_set(Ecore_X_Window win, Ecore_X_Window_State s)
+{
+ int num = 0, i;
+ unsigned char *oldset = NULL;
+ unsigned char *newset = NULL;
+ Ecore_X_Atom state = _ecore_x_window_prop_state_atom_get(s);
+
+ ecore_x_window_prop_property_get(win, _ecore_x_atom_net_wm_state,
+ XA_ATOM, 32, &oldset, &num);
+
+ newset = malloc(sizeof(Ecore_X_Atom) * (num + 1));
+
+ for (i = 0; i < num; ++i)
+ {
+ if (oldset[i] == state)
+ {
+ XFree(oldset);
+ free(newset);
+ return;
+ }
+
+ newset[i] = oldset[i];
+ }
+
+ newset[i] = state;
+
+ ecore_x_window_prop_property_set(win, _ecore_x_atom_net_wm_state,
+ XA_ATOM, 32, newset, num + 1);
+ XFree(oldset);
+ free(newset);
+}
+
+/**
+ * Check if a state is set for a window.
+ * @param win The window to be checked
+ * @param s The state whose state will be checked
+ * @return 1 if the state has been set for this window, 0 otherwise.
+ *
+ * This function will look up the window's properties to determine
+ * if a particular state is set for that window.
+ * <hr><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+ */
+int
+ecore_x_window_prop_state_isset(Ecore_X_Window win, Ecore_X_Window_State s)
+{
+ int num, i;
+ unsigned char *data;
+ Ecore_X_Atom state = _ecore_x_window_prop_state_atom_get(s);
+
+ if (!ecore_x_window_prop_property_get(win, _ecore_x_atom_net_wm_state,
+ XA_ATOM, 32, &data, &num))
+ {
+ XFree(data);
+ return 0;
+ }
+
+ for (i = 0; i < num; ++i)
+ {
+ if(data[i] == state)
+ {
+ XFree(data);
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * Remove the specified state from a window.
+ * @param win The window whose properties will be changed
+ * @param s The state to be deleted from the window's properties
+ *
+ * Checks if the specified state is set for the window, and if so, deletes
+ * that state from the window's properties.
+ * <hr><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+ */
+void
+ecore_x_window_prop_state_unset(Ecore_X_Window win, Ecore_X_Window_State s)
+{
+ int num = 0, i, j = 0;
+ unsigned char *oldset = NULL;
+ unsigned char *newset = NULL;
+ Ecore_X_Atom state = _ecore_x_window_prop_state_atom_get(s);
+
+ if (!ecore_x_window_prop_state_isset(win, s)) {
+ return;
+ }
+
+ ecore_x_window_prop_property_get(win, _ecore_x_atom_net_wm_state,
+ XA_ATOM, 32, &oldset, &num);
+ if(num > 1)
+ {
+ newset = calloc(sizeof(Ecore_X_Atom), num - 1);
+ for (i = 0; i < num; ++i)
+ if (oldset[i] != state)
+ newset[j++] = oldset[i];
+ }
+
+ ecore_x_window_prop_property_set(win, _ecore_x_atom_net_wm_state,
+ XA_ATOM, 32, newset, j);
+ XFree(oldset);
+ free(newset);
+}
+
/**
* Set a window as a desktop type.
* @param win The Window
@@ -933,3 +1079,4 @@
{
ecore_x_window_prop_window_type_set(win, _ecore_x_atom_net_wm_window_type_normal);
}
+
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
