Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_hints.c e_utils.c
Log Message:
revert patch. never tested by submiter.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -3 -r1.627 -r1.628
--- e_border.c 6 Mar 2008 10:17:39 -0000 1.627
+++ e_border.c 7 Mar 2008 10:35:57 -0000 1.628
@@ -3266,6 +3266,8 @@
free(bd->client.netwm.icons[i].data);
free(bd->client.netwm.icons);
}
+ if (bd->client.netwm.extra_types)
+ free(bd->client.netwm.extra_types);
if (bd->client.border.name) evas_stringshare_del(bd->client.border.name);
if (bd->bordername) evas_stringshare_del(bd->bordername);
if (bd->client.icccm.title) free(bd->client.icccm.title);
@@ -5054,6 +5056,7 @@
int rem_change = 0;
int send_event = 1;
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_FETCH, bd);
/* fetch any info queued to be fetched */
if (bd->client.icccm.fetch.client_leader)
{
@@ -5812,6 +5815,7 @@
}
_e_border_hook_call(E_BORDER_HOOK_EVAL_POST_FETCH, bd);
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
if ((bd->client.border.changed) && (!bd->shaded) &&
(!(((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN))))
@@ -5990,6 +5994,9 @@
bd->need_reparent = 0;
}
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN, bd);
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_NEW_BORDER, bd);
+
if (bd->new_client)
{
// printf("##- NEW CLIENT SETUP 0x%x\n", bd->client.win);
@@ -6209,6 +6216,8 @@
e_border_zone_set(bd, zone);
}
}
+
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_NEW_BORDER, bd);
/* effect changes to the window border itself */
if ((bd->changes.shading))
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- e_border.h 11 Jan 2008 07:33:55 -0000 1.169
+++ e_border.h 7 Mar 2008 10:35:58 -0000 1.170
@@ -80,7 +80,12 @@
typedef enum _E_Border_Hook_Point
{
- E_BORDER_HOOK_EVAL_POST_FETCH
+ E_BORDER_HOOK_EVAL_PRE_FETCH,
+ E_BORDER_HOOK_EVAL_POST_FETCH,
+ E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN,
+ E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
+ E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
+ E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
} E_Border_Hook_Point;
typedef struct _E_Border E_Border;
@@ -296,6 +301,8 @@
} action;
Ecore_X_Window_Type type;
+ Ecore_X_Window_Type *extra_types;
+ int extra_types_num;
int startup_id;
struct {
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- e_hints.c 25 Mar 2007 22:44:59 -0000 1.94
+++ e_hints.c 7 Mar 2008 10:35:58 -0000 1.95
@@ -656,7 +656,36 @@
EAPI void
e_hints_window_type_get(E_Border *bd)
{
- ecore_x_netwm_window_type_get(bd->client.win, &bd->client.netwm.type);
+ Ecore_X_Window_Type *types = NULL;
+ int num, i;
+
+ num = ecore_x_netwm_window_types_get(bd->client.win, &types);
+ if (bd->client.netwm.extra_types)
+ {
+ free(bd->client.netwm.extra_types);
+ bd->client.netwm.extra_types = NULL;
+ bd->client.netwm.extra_types_num = 0;
+ }
+ if (num == 0)
+ {
+ bd->client.netwm.type = ECORE_X_WINDOW_TYPE_UNKNOWN;
+ }
+ else
+ {
+ bd->client.netwm.type = types[0];
+ if (num > 1)
+ {
+ bd->client.netwm.extra_types =
+ malloc((num - 1) * sizeof(Ecore_X_Window_Type));
+ if (bd->client.netwm.extra_types)
+ {
+ for (i = 1; i < num; i++)
+ bd->client.netwm.extra_types[i - 1] = types[i];
+ bd->client.netwm.extra_types_num = num - 1;
+ }
+ }
+ free(types);
+ }
}
EAPI void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- e_utils.c 5 Mar 2008 04:00:17 -0000 1.80
+++ e_utils.c 7 Mar 2008 10:35:58 -0000 1.81
@@ -592,24 +592,15 @@
while (*p)
{
if ((q - buf) > 4090) return NULL;
- if (*p == '\'')
- {
- *q= '\'';
- q++;
- *q = '\\';
- q++;
- *q= '\'';
- q++;
- }
- else if (
+ if (
(*p == ' ') || (*p == '\t') || (*p == '\n') ||
- (*p == '\\') || (*p == '\"') || (*p == '\?') ||
+ (*p == '\\') || (*p == '\'') || (*p == '\"') ||
(*p == ';') || (*p == '!') || (*p == '#') ||
(*p == '$') || (*p == '%') || (*p == '&') ||
(*p == '*') || (*p == '(') || (*p == ')') ||
(*p == '[') || (*p == ']') || (*p == '{') ||
(*p == '}') || (*p == '|') || (*p == '<') ||
- (*p == '>')
+ (*p == '>') || (*p == '?')
)
{
*q = '\\';
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
