Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ipc.c
Log Message:
Enable using names in some IPC window info functions.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- ipc.c 16 May 2004 09:59:34 -0000 1.157
+++ ipc.c 30 May 2004 15:14:24 -0000 1.158
@@ -83,6 +83,29 @@
bufsiz += len;
}
+static EWin *
+IpcFindEwin(const char *windowid)
+{
+ unsigned int win;
+
+ if (!strcmp(windowid, "current"))
+ return GetFocusEwin();
+
+ if (isdigit(windowid[0]))
+ {
+ sscanf(windowid, "%x", &win);
+ return FindEwinByChildren(win);
+ }
+
+ if (windowid[0] == '+')
+ return FindEwinByPartial(windowid + 1, '+');
+
+ if (windowid[0] == '=')
+ return FindEwinByPartial(windowid + 1, '=');
+
+ return FindEwinByPartial(windowid, '=');
+}
+
static int
SetEwinBoolean(char *buf, int len, const char *txt, char *item,
const char *value, int set)
@@ -3101,27 +3124,7 @@
param1[0] = 0;
word(params, 1, windowid);
- if (!strcmp(windowid, "current"))
- {
- ewin = GetFocusEwin();
- }
- else if (isdigit(windowid[0]))
- {
- sscanf(windowid, "%x", &win);
- ewin = FindEwinByChildren(win);
- }
- else if (windowid[0] == '+')
- {
- ewin = FindEwinByPartial(windowid + 1, '+');
- }
- else if (windowid[0] == '=')
- {
- ewin = FindEwinByPartial(windowid + 1, '=');
- }
- else
- {
- ewin = FindEwinByPartial(windowid, '=');
- }
+ ewin = IpcFindEwin(windowid);
if (!ewin)
{
Esnprintf(buf, sizeof(buf), "Error: no such window: %8x", win);
@@ -5809,7 +5812,6 @@
{
char param1[FILEPATH_LEN_MAX];
EWin *ewin;
- unsigned int win;
if (params == NULL)
return;
@@ -5827,16 +5829,11 @@
}
else
{
- sscanf(param1, "%x", &win);
- ewin = (EWin *) FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
+ ewin = IpcFindEwin(param1);
if (ewin)
- {
- EwinShowInfo1(ewin);
- }
+ EwinShowInfo1(ewin);
else
- {
- IpcPrintf("No matching EWin found\n");
- }
+ IpcPrintf("No matching EWin found\n");
}
}
@@ -5845,7 +5842,6 @@
{
char param1[FILEPATH_LEN_MAX];
EWin *ewin;
- unsigned int win;
if (params == NULL)
return;
@@ -5863,16 +5859,11 @@
}
else
{
- sscanf(param1, "%x", &win);
- ewin = (EWin *) FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
+ ewin = IpcFindEwin(param1);
if (ewin)
- {
- EwinShowInfo2(ewin);
- }
+ EwinShowInfo2(ewin);
else
- {
- IpcPrintf("No matching EWin found\n");
- }
+ IpcPrintf("No matching EWin found\n");
}
}
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
