aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/illume2/policies/illume/layout.c
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2010-01-04 18:15:56 +0000
committerChristopher Michael <cpmichael1@comcast.net>2010-01-04 18:15:56 +0000
commitf435c770e41b0c2c0ce79d861d2fbb8d8f6aa2e9 (patch)
tree88944113b94f7854f61ec80eb40eff98e442196f /src/modules/illume2/policies/illume/layout.c
parent5ebb87d1581f428f20b99c1e5dfa6b2a6bf8aafe (diff)
downloadenlightenment-f435c770e41b0c2c0ce79d861d2fbb8d8f6aa2e9.tar.gz
enlightenment-f435c770e41b0c2c0ce79d861d2fbb8d8f6aa2e9.tar.xz
enlightenment-f435c770e41b0c2c0ce79d861d2fbb8d8f6aa2e9.zip
Add illume atoms to e_border struct.
Add code to fetch illume atoms on border map & property changes (if needed). - This avoids a lot of round-trip calls to X when running illume2. Remove whitespace & fix some formatting. Use PATH_MAX instead of 4096. Update illume2 code to use new border atoms and avoid round-trip X calls. SVN revision: 44879
Diffstat (limited to 'src/modules/illume2/policies/illume/layout.c')
-rw-r--r--src/modules/illume2/policies/illume/layout.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/modules/illume2/policies/illume/layout.c b/src/modules/illume2/policies/illume/layout.c
index fde9ee7e2..14b690e27 100644
--- a/src/modules/illume2/policies/illume/layout.c
+++ b/src/modules/illume2/policies/illume/layout.c
@@ -178,7 +178,7 @@ _layout_zone_layout(E_Zone *zone)
if (e_illume_border_is_top_shelf(bd))
{
/* make sure we are not dragging the shelf */
- if (!ecore_x_e_illume_drag_get(bd->client.win))
+ if (!bd->client.illume.drag.drag)
{
/* if we are not in dual mode, then set shelf to top */
if (!il_cfg->policy.mode.dual)
@@ -199,7 +199,7 @@ _layout_zone_layout(E_Zone *zone)
else if (e_illume_border_is_bottom_panel(bd))
{
/* make sure we are not dragging the bottom panel */
- if (!ecore_x_e_illume_drag_get(bd->client.win))
+ if (!bd->client.illume.drag.drag)
_border_resize_fx(bd, zone->x, (zone->y + zone->h - panelsize),
zone->w, panelsize);
e_border_stick(bd);
@@ -477,8 +477,9 @@ _zone_layout_dual_top_custom(E_Border *bd)
/* more than one valid border */
- if (ecore_x_e_virtual_keyboard_state_get(bd->client.win) >
- ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+ if (bd->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+// if (ecore_x_e_virtual_keyboard_state_get(bd->client.win) >
+// ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
{
bh = ah;
by = ay;
@@ -501,8 +502,9 @@ _zone_layout_dual_top_custom(E_Border *bd)
{
if (bt == e_border_focused_get())
{
- if (ecore_x_e_virtual_keyboard_state_get(bd->client.win) <=
- ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+ if (bd->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+// if (ecore_x_e_virtual_keyboard_state_get(bd->client.win) <=
+// ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
{
bh = zh;
by = zy;
@@ -515,8 +517,9 @@ _zone_layout_dual_top_custom(E_Border *bd)
}
else if (bb = e_border_focused_get())
{
- if (ecore_x_e_virtual_keyboard_state_get(bd->client.win) <=
- ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+ if (bd->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+// if (ecore_x_e_virtual_keyboard_state_get(bd->client.win) <=
+// ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
{
bh = ah;
by = ay;