Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_config.c e_font.c e_hints.c e_int_menus.c
e_main.c
Log Message:
shush shush
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -3 -r1.225 -r1.226
--- e_border.c 26 May 2005 11:48:39 -0000 1.225
+++ e_border.c 26 May 2005 12:38:53 -0000 1.226
@@ -213,7 +213,7 @@
if (!bd) return NULL;
e_object_del_func_set(E_OBJECT(bd), E_OBJECT_CLEANUP_FUNC(_e_border_del));
- printf("##- NEW CLIENT 0x%x\n", win);
+// printf("##- NEW CLIENT 0x%x\n", win);
bd->w = 1;
bd->h = 1;
bd->win = ecore_x_window_override_new(con->win, 0, 0, bd->w, bd->h);
@@ -251,7 +251,7 @@
att = &bd->client.initial_attributes;
if ((!ecore_x_window_attributes_get(win, att)) || (att->input_only))
{
- printf("##- ATTR FETCH FAILED/INPUT ONLY FOR 0x%x - ABORT MANAGE\n",
win);
+// printf("##- ATTR FETCH FAILED/INPUT ONLY FOR 0x%x - ABORT MANAGE\n",
win);
e_canvas_del(bd->bg_ecore_evas);
ecore_evas_free(bd->bg_ecore_evas);
ecore_x_window_del(bd->client.shell_win);
@@ -320,15 +320,15 @@
bd->changes.size = 1;
bd->changes.shape = 1;
- printf("##- ON MAP CLIENT 0x%x SIZE %ix%i\n",
- bd->client.win, bd->client.w, bd->client.h);
+// printf("##- ON MAP CLIENT 0x%x SIZE %ix%i\n",
+// bd->client.win, bd->client.w, bd->client.h);
/* FIXME: if first_map is 1 then we should ignore the first hide event
* or ensure the window is alreayd hidden and events flushed before we
* create a border for it */
if (first_map)
{
- printf("##- FIRST MAP\n");
+// printf("##- FIRST MAP\n");
bd->x = att->x;
bd->y = att->y;
bd->changes.pos = 1;
@@ -992,7 +992,7 @@
if ((bd->shaded) || (bd->shading)) return;
if (!bd->fullscreen)
{
- printf("FULLSCREEEN!\n");
+// printf("FULLSCREEEN!\n");
bd->saved.x = bd->x;
bd->saved.y = bd->y;
bd->saved.w = bd->w;
@@ -1025,7 +1025,7 @@
if ((bd->shaded) || (bd->shading)) return;
if (bd->fullscreen)
{
- printf("UNFULLSCREEEN!\n");
+// printf("UNFULLSCREEEN!\n");
e_hints_window_fullscreen_set(bd, 0);
e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w,
bd->saved.h);
@@ -1105,7 +1105,7 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (bd->sticky) return;
- printf("STICK!\n");
+// printf("STICK!\n");
bd->sticky = 1;
e_hints_window_sticky_set(bd, 1);
@@ -1124,7 +1124,7 @@
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
/* Set the desk before we unstick the border */
if (!bd->sticky) return;
- printf("UNSTICK!\n");
+// printf("UNSTICK!\n");
e_border_desk_set(bd, e_desk_current_get(bd->zone));
bd->sticky = 0;
e_hints_window_sticky_set(bd, 0);
@@ -1611,28 +1611,28 @@
bd = data;
e = ev;
- printf("##- CONF REQ 0x%x , %iX%i+%i+%i\n",
- e->win, e->w, e->h, e->x, e->y);
+// printf("##- CONF REQ 0x%x , %iX%i+%i+%i\n",
+// e->win, e->w, e->h, e->x, e->y);
bd = e_border_find_by_client_window(e->win);
if (!bd)
{
- printf("generic config request 0x%x 0x%lx %i %i %ix%i %i 0x%x
0x%x...\n",
- e->win, e->value_mask, e->x, e->y, e->w, e->h, e->border,
e->abovewin, e->detail);
+// printf("generic config request 0x%x 0x%lx %i %i %ix%i %i 0x%x
0x%x...\n",
+// e->win, e->value_mask, e->x, e->y, e->w, e->h, e->border,
e->abovewin, e->detail);
ecore_x_window_configure(e->win, e->value_mask,
e->x, e->y, e->w, e->h, e->border,
e->abovewin, e->detail);
return 1;
}
- printf("##- CONFIGURE REQ 0x%0x mask: %c%c%c%c%c%c%c\n",
- e->win,
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ? 'X':' ',
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y) ? 'Y':' ',
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ? 'W':' ',
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) ? 'H':' ',
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH) ? 'B':'
',
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING) ? 'C':' ',
- (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) ? 'S':' '
- );
+// printf("##- CONFIGURE REQ 0x%0x mask: %c%c%c%c%c%c%c\n",
+// e->win,
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ? 'X':' ',
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y) ? 'Y':' ',
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ? 'W':' ',
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) ? 'H':' ',
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH) ? 'B':'
',
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING) ? 'C':' ',
+// (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) ? 'S':' '
+// );
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ||
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y))
@@ -1641,11 +1641,11 @@
y = bd->y;
x = bd->x;
- printf("##- ASK FOR 0x%x TO MOVE TO [FLG X%liY%li] %i,%i\n",
- bd->client.win,
- e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X,
- e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y,
- x, y);
+// printf("##- ASK FOR 0x%x TO MOVE TO [FLG X%liY%li] %i,%i\n",
+// bd->client.win,
+// e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X,
+// e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y,
+// x, y);
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X)
x = e->x;
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)
@@ -1661,11 +1661,11 @@
w = e->w + bd->client_inset.l + bd->client_inset.r;
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H)
h = e->h + bd->client_inset.t + bd->client_inset.b;
- printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n",
- bd->client.win,
- e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W,
- e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H,
- e->w, e->h);
+// printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n",
+// bd->client.win,
+// e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W,
+// e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H,
+// e->w, e->h);
e_border_move_resize(bd, x, y, w, h);
}
else
@@ -1682,11 +1682,11 @@
w = e->w + bd->client_inset.l + bd->client_inset.r;
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H)
h = e->h + bd->client_inset.t + bd->client_inset.b;
- printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n",
- bd->client.win,
- e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W,
- e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H,
- e->w, e->h);
+// printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n",
+// bd->client.win,
+// e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W,
+// e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H,
+// e->w, e->h);
e_border_resize(bd, w, h);
}
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) &&
@@ -1753,17 +1753,17 @@
bd = data;
e = ev;
- printf("##- RESZ REQ 0x%x , %iX%i\n",
- e->win, e->w, e->h);
+// printf("##- RESZ REQ 0x%x , %iX%i\n",
+// e->win, e->w, e->h);
bd = e_border_find_by_client_window(e->win);
if (!bd)
{
- printf("generic resize request %x %ix%i ...\n",
- e->win, e->w, e->h);
+// printf("generic resize request %x %ix%i ...\n",
+// e->win, e->w, e->h);
ecore_x_window_resize(e->win, e->w, e->h);
return 1;
}
- printf("##- RESIZE REQ 0x%x\n", bd->client.win);
+// printf("##- RESIZE REQ 0x%x\n", bd->client.win);
{
int w, h;
@@ -1771,8 +1771,8 @@
w = bd->w;
w = e->w + bd->client_inset.l + bd->client_inset.r;
h = e->h + bd->client_inset.t + bd->client_inset.b;
- printf("##- ASK FOR 0x%x TO RESIZE TO %i,%i\n",
- bd->client.win, e->w, e->h);
+// printf("##- ASK FOR 0x%x TO RESIZE TO %i,%i\n",
+// bd->client.win, e->w, e->h);
e_border_resize(bd, w, h);
}
return 1;
@@ -2500,7 +2500,7 @@
}
if ((ev->win != bd->event_win) && (ev->event_win != bd->win))
{
- printf("abort ev\n");
+// printf("abort ev\n");
return 1;
}
if ((ev->button >= 1) && (ev->button <= 3))
@@ -2529,8 +2529,8 @@
if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
- printf("mouse %i %i | DBL %i TRIP %i\n",
- ev->x, ev->y, ev->double_click, ev->triple_click);
+// printf("mouse %i %i | DBL %i TRIP %i\n",
+// ev->x, ev->y, ev->double_click, ev->triple_click);
evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
evas_event_feed_mouse_down(bd->bg_evas, ev->button, flags, NULL);
}
@@ -2875,7 +2875,7 @@
}
else
{
- printf("##- NO SIZE HINTS!\n");
+// printf("##- NO SIZE HINTS!\n");
}
if (bd->client.icccm.min_w > 32767) bd->client.icccm.min_w = 32767;
if (bd->client.icccm.min_h > 32767) bd->client.icccm.min_h = 32767;
@@ -2885,12 +2885,12 @@
if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767;
if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1;
if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1;
- printf("##- SIZE HINTS for 0x%x: min %ix%i, max %ix%i, base %ix%i, step
%ix%i\n",
- bd->client.win,
- bd->client.icccm.min_w, bd->client.icccm.min_h,
- bd->client.icccm.max_w, bd->client.icccm.max_h,
- bd->client.icccm.base_w, bd->client.icccm.base_h,
- bd->client.icccm.step_w, bd->client.icccm.step_h);
+// printf("##- SIZE HINTS for 0x%x: min %ix%i, max %ix%i, base %ix%i, step
%ix%i\n",
+// bd->client.win,
+// bd->client.icccm.min_w, bd->client.icccm.min_h,
+// bd->client.icccm.max_w, bd->client.icccm.max_h,
+// bd->client.icccm.base_w, bd->client.icccm.base_h,
+// bd->client.icccm.step_w, bd->client.icccm.step_h);
bd->client.icccm.fetch.size_pos_hints = 0;
}
@@ -2926,7 +2926,7 @@
bd->client.mwm.borderless = 0;
if (bd->client.mwm.exists)
{
- printf("##- MWM HINTS SET 0x%x!\n", bd->client.win);
+// printf("##- MWM HINTS SET 0x%x!\n", bd->client.win);
if ((!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_ALL)) &&
(!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_TITLE)) &&
(!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_BORDER)))
@@ -2939,8 +2939,8 @@
bd->client.border.name = strdup("borderless");
else
bd->client.border.name = strdup("default");
- if (bd->client.mwm.borderless)
- printf("client %s borderless\n", bd->client.icccm.title);
+// if (bd->client.mwm.borderless)
+// printf("client %s borderless\n", bd->client.icccm.title);
bd->client.border.changed = 1;
}
bd->client.mwm.fetch.hints = 0;
@@ -3134,10 +3134,10 @@
E_Event_Border_Add *ev;
bd->new_client = 0;
- printf("##- NEW CLIENT SETUP 0x%x\n", bd->client.win);
+// printf("##- NEW CLIENT SETUP 0x%x\n", bd->client.win);
if (bd->re_manage)
{
- printf("##- REMANAGE!\n");
+// printf("##- REMANAGE!\n");
bd->x -= bd->client_inset.l;
bd->y -= bd->client_inset.t;
bd->changes.pos = 1;
@@ -3150,8 +3150,8 @@
int bw;
att = &bd->client.initial_attributes;
- printf("##- REQUEST POS 0x%x [%i,%i]\n",
- bd->client.win, att->x, att->y);
+// printf("##- REQUEST POS 0x%x [%i,%i]\n",
+// bd->client.win, att->x, att->y);
bw = att->border * 2;
switch (bd->client.icccm.gravity)
{
@@ -3195,7 +3195,7 @@
Evas_List *skiplist = NULL;
int new_x, new_y;
- printf("##- AUTO POS 0x%x\n", bd->client.win);
+// printf("##- AUTO POS 0x%x\n", bd->client.win);
if (bd->zone->w > bd->w)
new_x = bd->zone->x + (rand() % (bd->zone->w - bd->w));
else
@@ -3298,7 +3298,7 @@
if ((bd->changes.pos) && (bd->changes.size))
{
- printf("##- BORDER NEEDS POS/SIZE CHANGE 0x%x\n", bd->client.win);
+// printf("##- BORDER NEEDS POS/SIZE CHANGE 0x%x\n", bd->client.win);
if (bd->shaded && !bd->shading)
{
evas_obscured_clear(bd->bg_evas);
@@ -3357,7 +3357,7 @@
}
else if (bd->changes.size)
{
- printf("##- BORDER NEEDS SIZE CHANGE 0x%x\n", bd->client.win);
+// printf("##- BORDER NEEDS SIZE CHANGE 0x%x\n", bd->client.win);
if (bd->shaded && !bd->shading)
{
evas_obscured_clear(bd->bg_evas);
@@ -3991,7 +3991,7 @@
full = malloc(strlen(file) + strlen(command) + 1);
strcpy(full, command);
strcat(full, file);
- printf("EXEC %s\n", full);
+// printf("EXEC %s\n", full);
process = ecore_exe_run(full, NULL);
if (!process || !ecore_exe_pid_get(process))
e_error_dialog_show(_("Icon Edit Error"),
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_config.c 21 May 2005 02:49:47 -0000 1.54
+++ e_config.c 26 May 2005 12:38:53 -0000 1.55
@@ -696,10 +696,7 @@
/* apply lang config - exception because config is loaded after intl setup
*/
if ((e_config->language) && (strlen(e_config->language) > 0))
- {
- printf("SET LANG %s\n", e_config->language);
- e_intl_language_set(e_config->language);
- }
+ e_intl_language_set(e_config->language);
return 1;
}
@@ -830,7 +827,6 @@
static void
_e_config_save_cb(void *data)
{
- printf("SAVE!!!!\n");
e_module_save_all();
e_config_domain_save("e", _e_config_edd, e_config);
_e_config_save_job = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_font.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_font.c 20 May 2005 03:09:44 -0000 1.9
+++ e_font.c 26 May 2005 12:38:53 -0000 1.10
@@ -324,8 +324,8 @@
char buf[4096];
FILE *f;
- sprintf (buf, "%s/fonts.alias", font_dir);
- f = fopen (buf, "r");
+ snprintf(buf, sizeof(buf), "%s/fonts.alias", font_dir);
+ f = fopen(buf, "r");
if (f)
{
char fname[4096], fdef[4096];
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_hints.c 25 May 2005 10:09:34 -0000 1.33
+++ e_hints.c 26 May 2005 12:38:53 -0000 1.34
@@ -346,7 +346,7 @@
{
if (bd->client.netwm.desktop == 0xffffffff)
{
- printf("CLIENT asks for all desks!\n");
+// printf("CLIENT asks for all desks!\n");
e_border_stick(bd);
}
else if (bd->client.netwm.desktop < (bd->zone->desk_x_count *
bd->zone->desk_y_count))
@@ -374,7 +374,7 @@
if (bd->client.netwm.state.sticky)
{
- printf("CLIENT asks for stickiness!\n");
+// printf("CLIENT asks for stickiness!\n");
e_border_stick(bd);
}
if (bd->client.netwm.state.shaded)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e_int_menus.c 25 May 2005 08:08:44 -0000 1.61
+++ e_int_menus.c 26 May 2005 12:38:53 -0000 1.62
@@ -252,7 +252,6 @@
static void
_e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi)
{
- printf("RESTART ON!\n");
restart = 1;
ecore_main_loop_quit();
}
@@ -690,7 +689,6 @@
e_config_save_queue();
- printf("RESTART ON!\n");
restart = 1;
ecore_main_loop_quit();
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- e_main.c 20 May 2005 06:30:26 -0000 1.83
+++ e_main.c 26 May 2005 12:38:53 -0000 1.84
@@ -590,7 +590,6 @@
snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/.order", homedir);
if (!ecore_file_exists(buf))
{
- printf("GETTING YOU STARTED!\n");
snprintf(buf, sizeof(buf),
"gzip -d -c < %s/data/other/applications.tar.gz | "
"(cd %s/.e/e/ ; tar -xf -)",
@@ -863,7 +862,6 @@
_e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev
__UNUSED__)
{
/* called on SIGHUP to restart Enlightenment */
- printf("RESTART ON!\n");
restart = 1;
ecore_main_loop_quit();
return 1;
-------------------------------------------------------
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
