e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

EwinGetName -> EwinGetTitle. 

SVN revision: 27212
This commit is contained in:
Kim Woelders 2006-11-26 11:30:59 +00:00
parent a2594a1e81
commit d31b01dfee
16 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/borders.c
View File

@ -83,7 +83,7 @@ BorderWinpartITclassApply(EWin * ewin, int i, int force)
#if 0 /* Debug */
Eprintf("BorderWpITApply: %#lx %#lx %2d %d %s\n",
EwinGetClientXwin(ewin), EoGetWin(ewin), i, force,
EwinGetName(ewin));
EwinGetTitle(ewin));
#endif
is = ImageclassGetImageState(ewin->border->part[i].iclass, ewb->state,
@ -94,7 +94,7 @@ BorderWinpartITclassApply(EWin * ewin, int i, int force)
switch (ewin->border->part[i].flags)
{
case FLAG_TITLE:
txt = EwinGetName(ewin);
txt = EwinGetTitle(ewin);
if (txt && ewin->border->part[i].tclass)
ts = TextclassGetTextState(ewin->border->part[i].tclass, ewb->state,
ewin->state.active, EoIsSticky(ewin));
@ -283,7 +283,7 @@ BorderWinpartCalc(EWin * ewin, int i, int ww, int hh)
tclass = ewin->border->part[i].tclass;
pad = ImageclassGetPadding(iclass);
TextSize(tclass, ewin->state.active, EoIsSticky(ewin),
ewin->bits[i].state, EwinGetName(ewin), &max, &dummywidth,
ewin->bits[i].state, EwinGetTitle(ewin), &max, &dummywidth,
w - (pad->top + pad->bottom));
max += pad->left + pad->right;
if (h > max)
@ -331,7 +331,7 @@ BorderWinpartCalc(EWin * ewin, int i, int ww, int hh)
tclass = ewin->border->part[i].tclass;
pad = ImageclassGetPadding(iclass);
TextSize(tclass, ewin->state.active, EoIsSticky(ewin),
ewin->bits[i].state, EwinGetName(ewin), &max,
ewin->bits[i].state, EwinGetTitle(ewin), &max,
&dummyheight, h - (pad->top + pad->bottom));
max += pad->left + pad->right;

2
src/ewin-ops.c
View File

@ -312,7 +312,7 @@ doEwinMoveResize(EWin * ewin, Desk * dsk, int x, int y, int w, int h, int flags)
if (EDebug(EDBUG_TYPE_MOVERESIZE))
Eprintf("doEwinMoveResize(%d,%d) %#lx f=%x d=%d %d+%d %d*%d %s\n",
call_depth, Mode.mode, EwinGetClientXwin(ewin), flags,
(dsk) ? (int)dsk->num : -1, x, y, w, h, EwinGetName(ewin));
(dsk) ? (int)dsk->num : -1, x, y, w, h, EwinGetTitle(ewin));
pdesk = (ewin->o.stacked >= 0) ? EoGetDesk(ewin) : NULL;
reparent = move = resize = raise = 0;

40
src/ewins.c
View File

@ -170,7 +170,7 @@ EwinGetAttributes(EWin * ewin, Win win, Window xwin)
if (EDebug(EDBUG_TYPE_SNAPS))
Eprintf("Snap get attr %#lx: %4d+%4d %4dx%4d: %s\n",
EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y,
ewin->client.w, ewin->client.h, EwinGetName(ewin));
ewin->client.w, ewin->client.h, EwinGetTitle(ewin));
return 0;
}
@ -336,7 +336,7 @@ EwinConfigure(EWin * ewin)
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinConfigure %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
ewin->state.state, EwinGetTitle(ewin));
}
static void
@ -356,7 +356,7 @@ EwinDestroy(EWin * ewin)
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
ewin->state.state, EwinGetTitle(ewin));
EventCallbackUnregister(EoGetWin(ewin), 0, EwinHandleEventsToplevel, ewin);
EventCallbackUnregister(ewin->win_container, 0, EwinHandleEventsContainer,
@ -537,7 +537,7 @@ GetContextEwin(void)
done:
#if 0
Eprintf("GetContextEwin %#lx %s\n", EwinGetClientXwin(ewin),
EwinGetName(ewin));
EwinGetTitle(ewin));
#endif
return ewin;
}
@ -549,7 +549,7 @@ SetContextEwin(EWin * ewin)
return;
#if 0
Eprintf("SetContextEwin %#lx %s\n", EwinGetClientXwin(ewin),
EwinGetName(ewin));
EwinGetTitle(ewin));
#endif
Mode.context_ewin = ewin;
}
@ -1040,7 +1040,7 @@ EwinWithdraw(EWin * ewin, Win to)
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinWithdraw %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
ewin->state.state, EwinGetTitle(ewin));
EGrabServer();
@ -1103,7 +1103,7 @@ EwinEventDestroy(EWin * ewin)
{
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinEventDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
ewin->state.state, EwinGetTitle(ewin));
EwinDestroy(ewin);
}
@ -1123,7 +1123,7 @@ EwinEventReparent(EWin * ewin)
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinEventReparent %#lx st=%d parent=%#lx: %s\n",
EwinGetClientXwin(ewin), ewin->state.state, parent,
EwinGetName(ewin));
EwinGetTitle(ewin));
if (parent != EwinGetContainerXwin(ewin))
EwinDestroy(ewin);
@ -1144,7 +1144,7 @@ EwinEventMap(EWin * ewin, XEvent * ev)
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinEventMap %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
ewin->state.state, EwinGetTitle(ewin));
/* If first time we may want to focus it (unless during startup) */
if (old_state == EWIN_STATE_NEW)
@ -1160,7 +1160,7 @@ EwinEventUnmap(EWin * ewin, XEvent * ev)
{
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinEventUnmap %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
ewin->state.state, EwinGetTitle(ewin));
if (ewin->state.state == EWIN_STATE_NEW)
{
@ -1377,7 +1377,7 @@ EwinRaise(EWin * ewin)
if (EDebug(EDBUG_TYPE_RAISELOWER))
Eprintf("EwinRaise(%d) %#lx %s n=%d\n", call_depth,
EwinGetClientXwin(ewin), EwinGetName(ewin), num);
EwinGetClientXwin(ewin), EwinGetTitle(ewin), num);
if (num == 0) /* Quit if stacking is unchanged */
goto done;
@ -1410,7 +1410,7 @@ EwinLower(EWin * ewin)
if (EDebug(EDBUG_TYPE_RAISELOWER))
Eprintf("EwinLower(%d) %#lx %s n=%d\n", call_depth,
EwinGetClientXwin(ewin), EwinGetName(ewin), num);
EwinGetClientXwin(ewin), EwinGetTitle(ewin), num);
if (num == 0) /* Quit if stacking is unchanged */
goto done;
@ -1500,7 +1500,7 @@ EwinKill(EWin * ewin)
}
const char *
EwinGetName(const EWin * ewin)
EwinGetTitle(const EWin * ewin)
{
const char *name;
@ -1529,7 +1529,7 @@ EwinGetIconName(const EWin * ewin)
if (name)
goto done;
return EwinGetName(ewin);
return EwinGetTitle(ewin);
done:
return (name && strlen(name)) ? name : NULL;
@ -1684,7 +1684,7 @@ EwinSetPlacementGravity(EWin * ewin, int x, int y)
#if 0 /* Debug */
Eprintf("Set gravity %d,%d %d,%d %d %d,%d %d,%d: %s\n", ax, ay, x, y,
ewin->place.gravity, ewin->place.ax, ewin->place.ay,
ewin->place.gx, ewin->place.gy, EwinGetName(ewin));
ewin->place.gx, ewin->place.gy, EwinGetTitle(ewin));
#endif
}
@ -1753,7 +1753,7 @@ EwinReposition(EWin * ewin)
yn = y;
#if 0 /* Debug */
Eprintf("Reposition %d,%d -> %d,%d: %s\n", x, y, xn, yn, EwinGetName(ewin));
Eprintf("Reposition %d,%d -> %d,%d: %s\n", x, y, xn, yn, EwinGetTitle(ewin));
#endif
xn += ax * wdn;
@ -2047,7 +2047,7 @@ EwinHandleEventsToplevel(Win win __UNUSED__, XEvent * ev, void *prm)
default:
#if DEBUG_EWIN_EVENTS
Eprintf("EwinHandleEventsToplevel: type=%2d win=%#lx: %s\n",
ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin));
ev->type, EwinGetClientXwin(ewin), EwinGetTitle(ewin));
#endif
break;
}
@ -2060,7 +2060,7 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * ev, void *prm)
#if 0
Eprintf("EwinHandleEventsContainer: type=%2d win=%#lx: %s\n",
ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin));
ev->type, EwinGetClientXwin(ewin), EwinGetTitle(ewin));
#endif
switch (ev->type)
{
@ -2107,7 +2107,7 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * ev, void *prm)
default:
Eprintf("EwinHandleEventsContainer: type=%2d win=%#lx: %s\n",
ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin));
ev->type, EwinGetClientXwin(ewin), EwinGetTitle(ewin));
break;
}
}
@ -2155,7 +2155,7 @@ EwinHandleEventsClient(Win win __UNUSED__, XEvent * ev, void *prm)
default:
#if DEBUG_EWIN_EVENTS
Eprintf("EwinHandleEventsClient: type=%2d win=%#lx: %s\n",
ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin));
ev->type, EwinGetClientXwin(ewin), EwinGetTitle(ewin));
#endif
break;
}

2
src/ewins.h
View File

@ -352,7 +352,7 @@ EWin *AddInternalToFamily(Win win, const char *bname, int type,
void *ptr,
void (*init) (EWin * ewin, void *ptr));
void EwinReparent(EWin * ewin, Win parent);
const char *EwinGetName(const EWin * ewin);
const char *EwinGetTitle(const EWin * ewin);
const char *EwinGetIconName(const EWin * ewin);
const char *EwinBorderGetName(const EWin * ewin);
void EwinBorderGetSize(const EWin * ewin, int *bl, int *br,

2
src/ewmh.c
View File

@ -655,7 +655,7 @@ EWMH_GetWindowIcons(EWin * ewin)
{
Eprintf
("*** EWMH_GetWindowIcons Icon data/size mismatch (ignoring): %s: N=%d WxH=%dx%d\n",
EwinGetName(ewin), num, val[0], (num >= 2) ? val[1] : 0);
EwinGetTitle(ewin), num, val[0], (num >= 2) ? val[1] : 0);
Efree(val);
return;
}

12
src/focus.c
View File

@ -71,7 +71,7 @@ FocusEwinValid(EWin * ewin, int want_on_screen, int click, int want_visible)
#if 0
Eprintf("FocusEwinValid %#lx %s: st=%d sh=%d inh=%d cl=%d(%d) vis=%d(%d)\n",
EwinGetClientXwin(ewin), EwinGetName(ewin),
EwinGetClientXwin(ewin), EwinGetTitle(ewin),
ewin->state.state, EoIsShown(ewin), ewin->state.inhibit_focus,
click, ewin->props.focusclick, want_visible, ewin->state.visibility);
#endif
@ -224,7 +224,7 @@ FocusEwinSetGrabs(EWin * ewin)
ButtonPressMask, ECSR_PGRAB, 1);
if (EDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusEwinSetGrabs: %#lx set %s\n",
EwinGetClientXwin(ewin), EwinGetName(ewin));
EwinGetClientXwin(ewin), EwinGetTitle(ewin));
ewin->state.click_grab_isset = 1;
}
}
@ -236,7 +236,7 @@ FocusEwinSetGrabs(EWin * ewin)
EwinGetContainerWin(ewin));
if (EDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusEwinSetGrabs: %#lx unset %s\n",
EwinGetClientXwin(ewin), EwinGetName(ewin));
EwinGetClientXwin(ewin), EwinGetTitle(ewin));
ewin->state.click_grab_isset = 0;
}
}
@ -294,7 +294,7 @@ doFocusToEwin(EWin * ewin, int why)
if (EDebug(EDBUG_TYPE_FOCUS))
Eprintf("doFocusToEWin %#lx %s why=%d\n",
(ewin) ? EwinGetClientXwin(ewin) : 0,
(ewin) ? EwinGetName(ewin) : "None", why);
(ewin) ? EwinGetTitle(ewin) : "None", why);
switch (why)
{
@ -457,7 +457,7 @@ FocusToEWin(EWin * ewin, int why)
if (EDebug(EDBUG_TYPE_FOCUS))
Eprintf("FocusToEWin(%d) %#lx %s why=%d\n", focus_inhibit,
(ewin) ? EwinGetClientXwin(ewin) : 0,
(ewin) ? EwinGetName(ewin) : "None", why);
(ewin) ? EwinGetTitle(ewin) : "None", why);
switch (why)
{
@ -605,7 +605,7 @@ FocusHandleChange(EWin * ewin __UNUSED__, XEvent * ev __UNUSED__)
{
#if 0 /* Debug */
if (ewin == Mode.focuswin && ev->type == FocusOut)
Eprintf("??? Lost focus: %s\n", EwinGetName(ewin));
Eprintf("??? Lost focus: %s\n", EwinGetTitle(ewin));
#endif
}

2
src/groups.c
View File

@ -377,7 +377,7 @@ GetWinGroupMemberNames(Group ** groups, int num)
for (j = 0; j < groups[i]->num_members; j++)
{
strcat(group_member_strings[i],
EwinGetName(groups[i]->members[j]));
EwinGetTitle(groups[i]->members[j]));
strcat(group_member_strings[i], "\n");
}
}

4
src/hints.c
View File

@ -361,7 +361,7 @@ EHintsSetInfo(const EWin * ewin)
if (EDebug(EDBUG_TYPE_SNAPS))
Eprintf("Snap set einf %#lx: %4d+%4d %4dx%4d: %s\n",
EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y,
ewin->client.w, ewin->client.h, EwinGetName(ewin));
ewin->client.w, ewin->client.h, EwinGetTitle(ewin));
}
void
@ -407,7 +407,7 @@ EHintsGetInfo(EWin * ewin)
if (EDebug(EDBUG_TYPE_SNAPS))
Eprintf("Snap get einf %#lx: %4d+%4d %4dx%4d: %s\n",
EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y,
ewin->client.w, ewin->client.h, EwinGetName(ewin));
ewin->client.w, ewin->client.h, EwinGetTitle(ewin));
}
void

6
src/hiwin.c
View File

@ -246,7 +246,7 @@ HiwinEwinEvent(Win win __UNUSED__, XEvent * ev, void *prm)
Hiwin *phi = prm;
#if DEBUG_HIWIN
Eprintf("HiwinEwinEvent type=%d %s\n", ev->type, EwinGetName(phi->ewin));
Eprintf("HiwinEwinEvent type=%d %s\n", ev->type, EwinGetTitle(phi->ewin));
#endif
switch (ev->type)
@ -298,7 +298,7 @@ HiwinInit(Hiwin * phi, EWin * ewin)
if (phi->ewin)
{
#if DEBUG_HIWIN
Eprintf("Unregister %s\n", EwinGetName(phi->ewin));
Eprintf("Unregister %s\n", EwinGetTitle(phi->ewin));
#endif
EventCallbackUnregister(EoGetWin(phi->ewin), 0, HiwinEwinEvent, phi);
}
@ -310,7 +310,7 @@ HiwinInit(Hiwin * phi, EWin * ewin)
if (phi->ewin)
{
#if DEBUG_HIWIN
Eprintf("Register %s\n", EwinGetName(phi->ewin));
Eprintf("Register %s\n", EwinGetTitle(phi->ewin));
#endif
EventCallbackRegister(EoGetWin(phi->ewin), 0, HiwinEwinEvent, phi);
}

4
src/icccm.c
View File

@ -364,7 +364,7 @@ ICCCM_Focus(const EWin * ewin)
{
if (ewin)
Eprintf("ICCCM_Focus T=%#lx %#lx %s\n", Mode.events.time,
EwinGetClientXwin(ewin), EwinGetName(ewin));
EwinGetClientXwin(ewin), EwinGetTitle(ewin));
else
Eprintf("ICCCM_Focus None T=%#lx\n", Mode.events.time);
}
@ -527,7 +527,7 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change)
if (EDebug(EDBUG_TYPE_SNAPS))
Eprintf("Snap get icccm %#lx: %4d+%4d %4dx%4d: %s\n",
EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y,
ewin->client.w, ewin->client.h, EwinGetName(ewin));
ewin->client.w, ewin->client.h, EwinGetTitle(ewin));
}
#define TryGroup(e) (((e)->icccm.group != None) && ((e)->icccm.group != EwinGetClientXwin(e)))

6
src/menus-misc.c
View File

@ -633,7 +633,7 @@ MenuCreateFromBorders(const char *name, MenuStyle * ms)
static int
MenuCheckShowEwinDesk(EWin * ewin, void *prm)
{
if (!EwinGetName(ewin) || ewin->props.skip_winlist)
if (!EwinGetTitle(ewin) || ewin->props.skip_winlist)
return 0;
return prm == NULL || EwinGetDesk(ewin) == prm;
}
@ -653,7 +653,7 @@ MenuLoadFromEwins(Menu * m, int (*f) (EWin * ewin, void *prm), void *prm)
continue;
Esnprintf(s, sizeof(s), "wop %#lx focus", EwinGetClientXwin(lst[i]));
mi = MenuItemCreate(EwinGetName(lst[i]), NULL, s, NULL);
mi = MenuItemCreate(EwinGetTitle(lst[i]), NULL, s, NULL);
MenuAddItem(m, mi);
}
}
@ -753,7 +753,7 @@ MenuLoadFromGroups(Menu * m)
{
Esnprintf(s, sizeof(s), "wop %#lx focus",
EwinGetClientXwin(lst[i]->members[j]));
mi = MenuItemCreate(EwinGetName(lst[i]->members[j]), NULL,
mi = MenuItemCreate(EwinGetTitle(lst[i]->members[j]), NULL,
s, NULL);
MenuAddItem(mm, mi);
}

2
src/menus.c
View File

@ -359,7 +359,7 @@ MenuShow(Menu * m, char noshow)
Mode_menus.context_ewin = GetContextEwin();
#if 0
Eprintf("Mode_menus.context_ewin set %s\n",
EwinGetName(Mode_menus.context_ewin));
EwinGetTitle(Mode_menus.context_ewin));
#endif
ESync();
Mode_menus.first = m;

2
src/pager.c
View File

@ -319,7 +319,7 @@ PagerEwinUpdateMini(Pager * p, EWin * ewin)
Dprintf("PagerEwinUpdateMini %#lx/%#lx wxh=%dx%d ser=%#x/%#x dif=%d: %s\n",
EwinGetClientXwin(ewin), EoGetXwin(ewin), w, h,
EoGetSerial(ewin), p->serial, serdif, EwinGetName(ewin));
EoGetSerial(ewin), p->serial, serdif, EwinGetTitle(ewin));
p->do_update = 1;

6
src/snaps.c
View File

@ -541,7 +541,7 @@ SnapshotEwinUpdate(const EWin * ewin, unsigned int flags)
return;
#if 0
Eprintf("SnapshotEwinUpdate %s: %#x\n", EwinGetName(ewin), flags);
Eprintf("SnapshotEwinUpdate %s: %#x\n", EwinGetTitle(ewin), flags);
#endif
if (flags & sn->use_flags)
@ -1040,7 +1040,7 @@ _DlgFillRemember(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
DialogItemSetColSpan(di, 2);
DialogItemSetAlign(di, 0, 512);
if (sn->used)
s = EwinGetName(sn->used);
s = EwinGetTitle(sn->used);
else if (sn->win_title)
s = sn->win_title;
else
@ -1518,7 +1518,7 @@ SnapshotEwinApply(EWin * ewin)
if (EDebug(EDBUG_TYPE_SNAPS))
Eprintf("Snap get snap %#lx: %4d+%4d %4dx%4d: %s\n",
EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y,
ewin->client.w, ewin->client.h, EwinGetName(ewin));
ewin->client.w, ewin->client.h, EwinGetTitle(ewin));
}
/* Detach snapshot from ewin */

2
src/warp.c
View File

@ -131,7 +131,7 @@ WarpFocusWinShow(WarpFocusWin * fw)
fmt = "=%s=";
else
fmt = "%s";
Esnprintf(s, sizeof(s), fmt, EwinGetName(wi->ewin));
Esnprintf(s, sizeof(s), fmt, EwinGetTitle(wi->ewin));
wi->txt = strdup(s);
TextSize(fw->tc, 0, 0, 0, wi->txt, &ww, &hh, 17);
if (ww > w)

4
src/windowmatch.c
View File

@ -639,7 +639,7 @@ WindowMatchEwinBorder(const EWin * ewin)
wm = WindowMatchType(ewin, MATCH_OP_BORDER);
#if 0
Eprintf("WindowMatchEwinBorder %s %s\n", EwinGetName(ewin),
Eprintf("WindowMatchEwinBorder %s %s\n", EwinGetTitle(ewin),
(wm) ? BorderGetName(wm->border) : "???");
#endif
if (wm)
@ -654,7 +654,7 @@ WindowMatchEwinIcon(const EWin * ewin)
wm = WindowMatchType(ewin, MATCH_OP_ICON);
#if 0
Eprintf("WindowMatchEwinIcon %s %s\n", EwinGetName(ewin),
Eprintf("WindowMatchEwinIcon %s %s\n", EwinGetTitle(ewin),
(wm) ? wm->args : "???");
#endif
if (wm)