enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Fix some formatting in connman. 

Remove some commented lines in quickpanel.
Add some printfs to quickpanel sort.
Remove dead code line in illume2 layout.
Separate illume and illume2 modules in build process (this allows illume &
illume2 to be enabled/disabled separately)



SVN revision: 44841
This commit is contained in:
Christopher Michael 2010-01-01 17:15:16 +00:00
parent e06cd87c39
commit a1bc311d9a
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -481,6 +481,7 @@ AC_E_OPTIONAL_MODULE([gadman], true)
AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER]) AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN]) AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
AC_E_OPTIONAL_MODULE([illume], true) AC_E_OPTIONAL_MODULE([illume], true)
AC_E_OPTIONAL_MODULE([illume2], true)
AC_E_OPTIONAL_MODULE([syscon], true) AC_E_OPTIONAL_MODULE([syscon], true)
AC_E_OPTIONAL_MODULE([everything], true) AC_E_OPTIONAL_MODULE([everything], true)
AC_E_OPTIONAL_MODULE([systray], true) AC_E_OPTIONAL_MODULE([systray], true)

6
src/modules/Makefile.am
View File

@ -239,7 +239,11 @@ SUBDIRS += connman
endif endif
if USE_MODULE_ILLUME if USE_MODULE_ILLUME
SUBDIRS += illume illume2 illume-home illume-softkey illume-keyboard illume-indicator illume-kbd-toggle illume-mode-toggle SUBDIRS += illume
endif
if USE_MODULE_ILLUME2
SUBDIRS += illume2 illume-home illume-softkey illume-keyboard illume-indicator illume-kbd-toggle illume-mode-toggle
endif endif
if USE_MODULE_SYSCON if USE_MODULE_SYSCON

1
src/modules/illume2/e_mod_layout_illume.c
View File

@ -230,7 +230,6 @@ _drag_end(E_Border *bd)
{ {
/* HANDLE A BORDER DRAG BEING ENDED */ /* HANDLE A BORDER DRAG BEING ENDED */
ecore_x_e_illume_drag_set(bd->client.win, 0); ecore_x_e_illume_drag_set(bd->client.win, 0);
// _zone_layout(bd->zone);
} }
static void static void

20
src/modules/illume2/e_quickpanel.c
View File

@ -225,9 +225,7 @@ _e_quickpanel_cb_border_pre_post_fetch(void *data, void *data2)
e_mod_border_top_shelf_size_get(qp->zone, NULL, &th); e_mod_border_top_shelf_size_get(qp->zone, NULL, &th);
e_border_fx_offset(bd, 0, (bd->h - th)); e_border_fx_offset(bd, 0, (bd->h - th));
} }
qp->borders = eina_list_append(qp->borders, bd); qp->borders = eina_list_sorted_insert(qp->borders, _e_quickpanel_cb_sort, bd);
qp->borders = eina_list_sort(qp->borders, -1, _e_quickpanel_cb_sort);
// qp->borders = eina_list_reverse(qp->borders);
} }
static E_Quickpanel * static E_Quickpanel *
@ -365,13 +363,15 @@ _e_quickpanel_cb_sort(const void *b1, const void *b2)
const E_Border *bd1, *bd2; const E_Border *bd1, *bd2;
int major1, major2; int major1, major2;
if (!(bd1 = b1)) return -1; if (!(bd1 = b1)) return 0;
if (!(bd2 = b2)) return 1; if (!(bd2 = b2)) return 1;
printf("Checking: %s against %s\n", bd2->client.icccm.name, bd1->client.icccm.name);
major1 = ecore_x_e_illume_quickpanel_priority_major_get(bd1->client.win); major1 = ecore_x_e_illume_quickpanel_priority_major_get(bd1->client.win);
major2 = ecore_x_e_illume_quickpanel_priority_major_get(bd2->client.win); major2 = ecore_x_e_illume_quickpanel_priority_major_get(bd2->client.win);
if (major1 < major2) return -1; if (major2 > major1) return 1;
else if (major1 > major2) return 1; else if (major2 < major1) return -1;
else /*
else if (major2 == major1)
{ {
int minor1, minor2; int minor1, minor2;
@ -379,9 +379,11 @@ _e_quickpanel_cb_sort(const void *b1, const void *b2)
ecore_x_e_illume_quickpanel_priority_minor_get(bd1->client.win); ecore_x_e_illume_quickpanel_priority_minor_get(bd1->client.win);
minor2 = minor2 =
ecore_x_e_illume_quickpanel_priority_minor_get(bd2->client.win); ecore_x_e_illume_quickpanel_priority_minor_get(bd2->client.win);
if (minor1 < minor2) return -1; printf("Minors: %d %d\n", minor2, minor1);
else if (minor1 > minor2) return 1; if (minor2 > minor1) return 1;
else if (minor2 < minor1) return -1;
} }
*/
return 0; return 0;
} }

2
x-ui.sh
View File

@ -10,7 +10,7 @@ Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 -host-cursor &
#Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x800x16 & #Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x800x16 &
#Xephyr :1 -noreset -ac -br -dpi 183 -screen 800x480x16 & #Xephyr :1 -noreset -ac -br -dpi 183 -screen 800x480x16 &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 & #Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 & #Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 -host-cursor &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 & #Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 &
#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480 & #Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480 &