Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_hints.c
Log Message:
Honor lock flags in e_hints.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -3 -r1.370 -r1.371
--- e_border.c 28 Aug 2005 15:30:58 -0000 1.370
+++ e_border.c 29 Aug 2005 23:04:21 -0000 1.371
@@ -3,8 +3,8 @@
*/
#include "e.h"
-#define INOUTDEBUG_MOUSE 1
-#define INOUTDEBUG_FOCUS 1
+//#define INOUTDEBUG_MOUSE 1
+//#define INOUTDEBUG_FOCUS 1
/* These are compatible with netwm */
#define RESIZE_TL 0
@@ -863,7 +863,7 @@
{
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
- printf("e_border_focus_set(%p, %i %i);\n", bd, focus, set);
+ //printf("e_border_focus_set(%p, %i %i);\n", bd, focus, set);
if ((bd->visible) && (bd->changes.visible))
{
if ((bd->want_focus) && (set) && (!focus))
@@ -968,12 +968,12 @@
if (bd->focused)
{
focused = bd;
- printf("set focused to %p\n", focused);
+ //printf("set focused to %p\n", focused);
}
else if ((!bd->focused) && (focused == bd))
{
focused = NULL;
- printf("set focused to %p\n", focused);
+ //printf("set focused to %p\n", focused);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_hints.c 21 Aug 2005 23:36:07 -0000 1.65
+++ e_hints.c 29 Aug 2005 23:04:21 -0000 1.66
@@ -515,33 +515,30 @@
e_border_iconify(bd);
break;
case ECORE_X_WINDOW_STATE_MODAL:
- changed = 0;
switch (action)
{
case ECORE_X_WINDOW_STATE_ACTION_REMOVE:
if (bd->client.netwm.state.modal)
{
bd->client.netwm.state.modal = 0;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
}
break;
case ECORE_X_WINDOW_STATE_ACTION_ADD:
if (!bd->client.netwm.state.modal)
{
bd->client.netwm.state.modal = 1;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
}
break;
case ECORE_X_WINDOW_STATE_ACTION_TOGGLE:
bd->client.netwm.state.modal = !bd->client.netwm.state.modal;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
break;
}
- if (changed)
- {
- bd->client.netwm.update.state = 1;
- bd->changed = 1;
- }
break;
case ECORE_X_WINDOW_STATE_STICKY:
if (bd->lock_client_sticky) return;
@@ -563,6 +560,10 @@
break;
case ECORE_X_WINDOW_STATE_MAXIMIZED_VERT:
if (bd->lock_client_maximize) return;
+ /* We might end up in a state where maximized_h or maximized_v is
+ * set. This doesn't matter, because E only checks if both are
+ * set for maximization.
+ */
changed = 0;
switch (action)
{
@@ -599,6 +600,10 @@
break;
case ECORE_X_WINDOW_STATE_MAXIMIZED_HORZ:
if (bd->lock_client_maximize) return;
+ /* We might end up in a state where maximized_h or maximized_v is
+ * set. This doesn't matter, because E only checks if both are
+ * set for maximization.
+ */
changed = 0;
switch (action)
{
@@ -652,62 +657,56 @@
}
break;
case ECORE_X_WINDOW_STATE_SKIP_TASKBAR:
- changed = 0;
switch (action)
{
case ECORE_X_WINDOW_STATE_ACTION_REMOVE:
if (bd->client.netwm.state.skip_taskbar)
{
bd->client.netwm.state.skip_taskbar = 0;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
}
break;
case ECORE_X_WINDOW_STATE_ACTION_ADD:
if (!bd->client.netwm.state.skip_taskbar)
{
bd->client.netwm.state.skip_taskbar = 1;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
}
break;
case ECORE_X_WINDOW_STATE_ACTION_TOGGLE:
bd->client.netwm.state.skip_taskbar =
!bd->client.netwm.state.skip_taskbar;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
break;
}
- if (changed)
- {
- bd->client.netwm.update.state = 1;
- bd->changed = 1;
- }
break;
case ECORE_X_WINDOW_STATE_SKIP_PAGER:
- changed = 0;
switch (action)
{
case ECORE_X_WINDOW_STATE_ACTION_REMOVE:
if (bd->client.netwm.state.skip_pager)
{
bd->client.netwm.state.skip_pager = 0;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
}
break;
case ECORE_X_WINDOW_STATE_ACTION_ADD:
if (!bd->client.netwm.state.skip_pager)
{
bd->client.netwm.state.skip_pager = 1;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
}
break;
case ECORE_X_WINDOW_STATE_ACTION_TOGGLE:
bd->client.netwm.state.skip_pager =
!bd->client.netwm.state.skip_pager;
- changed = 1;
+ bd->client.netwm.update.state = 1;
+ bd->changed = 1;
break;
}
- if (changed)
- {
- bd->client.netwm.update.state = 1;
- bd->changed = 1;
- }
break;
case ECORE_X_WINDOW_STATE_HIDDEN:
/* Ignore */
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
