Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_atoms.c e_atoms.h e_border.c e_hints.c e_hints.h
Log Message:
Cleanup.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_atoms.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_atoms.c 10 Jul 2005 17:12:01 -0000 1.11
+++ e_atoms.c 11 Aug 2005 04:44:08 -0000 1.12
@@ -11,7 +11,7 @@
Ecore_X_Atom E_ATOM_MAPPED = 0;
Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0;
Ecore_X_Atom E_ATOM_HIDDEN = 0;
-Ecore_X_Atom E_ATOM_SAVED_SIZE = 0;
+Ecore_X_Atom E_ATOM_BORDER_SIZE = 0;
/* externally accessible functions */
int
@@ -24,7 +24,7 @@
E_ATOM_MAPPED = ecore_x_atom_get("__E_WINDOW_MAPPED");
E_ATOM_SHADE_DIRECTION = ecore_x_atom_get("__E_WINDOW_SHADE_DIRECTION");
E_ATOM_HIDDEN = ecore_x_atom_get("__E_WINDOW_HIDDEN");
- E_ATOM_SAVED_SIZE = ecore_x_atom_get("__E_WINDOW_SAVED_SIZE");
+ E_ATOM_BORDER_SIZE = ecore_x_atom_get("__E_WINDOW_BORDER_SIZE");
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_atoms.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_atoms.h 10 Jul 2005 17:12:01 -0000 1.11
+++ e_atoms.h 11 Aug 2005 04:44:08 -0000 1.12
@@ -16,7 +16,7 @@
extern EAPI Ecore_X_Atom E_ATOM_MAPPED;
extern EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION;
extern EAPI Ecore_X_Atom E_ATOM_HIDDEN;
-extern EAPI Ecore_X_Atom E_ATOM_SAVED_SIZE;
+extern EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE;
EAPI int e_atoms_init(void);
EAPI int e_atoms_shutdown(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -3 -r1.354 -r1.355
--- e_border.c 9 Aug 2005 02:42:34 -0000 1.354
+++ e_border.c 11 Aug 2005 04:44:08 -0000 1.355
@@ -1136,15 +1136,11 @@
int x1, y1, x2, y2;
int w, h;
-// printf("MAXIMIZE!!\n");
- if (!bd->saved.x && !bd->saved.y && !bd->saved.w && !bd->saved.h)
- {
- bd->saved.x = bd->x;
- bd->saved.y = bd->y;
- bd->saved.w = bd->w;
- bd->saved.h = bd->h;
- e_hints_window_saved_size_set(bd);
- }
+ bd->saved.x = bd->x;
+ bd->saved.y = bd->y;
+ bd->saved.w = bd->w;
+ bd->saved.h = bd->h;
+ e_hints_window_size_set(bd);
e_border_raise(bd);
switch (max)
@@ -1286,7 +1282,7 @@
e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w,
bd->saved.h);
bd->saved.x = bd->saved.y = bd->saved.w = bd->saved.h = 0;
- e_hints_window_saved_size_set(bd);
+ e_hints_window_size_unset(bd);
edje_object_signal_emit(bd->bg_object, "unmaximize", "");
}
@@ -1307,15 +1303,12 @@
if (!bd->fullscreen)
{
int x, y, w, h;
-// printf("FULLSCREEEN!\n");
- if (!bd->saved.x && !bd->saved.y && !bd->saved.w && !bd->saved.h)
- {
- bd->saved.x = bd->x;
- bd->saved.y = bd->y;
- bd->saved.w = bd->w;
- bd->saved.h = bd->h;
- e_hints_window_saved_size_set(bd);
- }
+
+ bd->saved.x = bd->x;
+ bd->saved.y = bd->y;
+ bd->saved.w = bd->w;
+ bd->saved.h = bd->h;
+ e_hints_window_size_set(bd);
bd->client_inset.sl = bd->client_inset.l;
bd->client_inset.sr = bd->client_inset.r;
@@ -1344,6 +1337,7 @@
bd->fullscreen = 1;
e_hints_window_fullscreen_set(bd, 1);
+ e_hints_window_size_unset(bd);
edje_object_signal_emit(bd->bg_object, "fullscreen", "");
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- e_hints.c 11 Aug 2005 04:10:59 -0000 1.63
+++ e_hints.c 11 Aug 2005 04:44:08 -0000 1.64
@@ -399,12 +399,12 @@
e_border_shade(bd, e_hints_window_shade_direction_get(bd));
if ((bd->client.netwm.state.maximized_v) &&
(bd->client.netwm.state.maximized_h))
{
- e_hints_window_saved_size_get(bd);
+ e_hints_window_size_get(bd);
e_border_maximize(bd, e_config->maximize_policy);
}
if (bd->client.netwm.state.fullscreen)
{
- e_hints_window_saved_size_get(bd);
+ e_hints_window_size_get(bd);
e_border_fullscreen(bd);
}
if ((bd->client.icccm.state == ECORE_X_WINDOW_STATE_HINT_ICONIC)
@@ -909,32 +909,41 @@
}
void
-e_hints_window_saved_size_set(E_Border *bd)
+e_hints_window_size_set(E_Border *bd)
{
unsigned int sizes[4];
- sizes[0] = bd->saved.x;
- sizes[1] = bd->saved.y;
- sizes[2] = bd->saved.w;
- sizes[3] = bd->saved.h;
- ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_SAVED_SIZE, sizes, 4);
+ sizes[0] = bd->x;
+ sizes[1] = bd->y;
+ sizes[2] = bd->w;
+ sizes[3] = bd->h;
+ ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_BORDER_SIZE, sizes,
4);
+}
+
+void
+e_hints_window_size_unset(E_Border *bd)
+{
+ ecore_x_window_prop_property_del(bd->client.win, E_ATOM_BORDER_SIZE);
}
int
-e_hints_window_saved_size_get(E_Border *bd)
+e_hints_window_size_get(E_Border *bd)
{
int ret;
unsigned int sizes[4];
memset(sizes, 0, sizeof(sizes));
- ret = ecore_x_window_prop_card32_get(bd->client.win, E_ATOM_SAVED_SIZE,
+ ret = ecore_x_window_prop_card32_get(bd->client.win, E_ATOM_BORDER_SIZE,
sizes, 4);
- bd->saved.x = sizes[0];
- bd->saved.y = sizes[1];
- bd->saved.w = sizes[2];
- bd->saved.h = sizes[3];
+ if (ret != 4)
+ return 0;
+
+ bd->x = sizes[0];
+ bd->y = sizes[1];
+ bd->w = sizes[2];
+ bd->h = sizes[3];
- return ret;
+ return 1;
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_hints.h 19 Jul 2005 09:11:21 -0000 1.19
+++ e_hints.h 11 Aug 2005 04:44:08 -0000 1.20
@@ -30,8 +30,9 @@
EAPI void e_hints_window_shade_direction_set(E_Border *bd, E_Direction dir);
EAPI E_Direction e_hints_window_shade_direction_get(E_Border *bd);
-EAPI void e_hints_window_saved_size_set(E_Border *bd);
-EAPI int e_hints_window_saved_size_get(E_Border *bd);
+EAPI void e_hints_window_size_set(E_Border *bd);
+EAPI void e_hints_window_size_unset(E_Border *bd);
+EAPI int e_hints_window_size_get(E_Border *bd);
EAPI void e_hints_window_shaded_set(E_Border *bd, int on);
EAPI void e_hints_window_maximized_set(E_Border *bd, int on);
-------------------------------------------------------
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
