Trivial stuff, loose ends.

SVN revision: 16387
This commit is contained in:
Kim Woelders 2005-08-27 14:42:58 +00:00
parent 06ffd5be4f
commit 52f6f269e5
2 changed files with 20 additions and 17 deletions

View File

@ -462,58 +462,56 @@ IPC_WinOps(const char *params, Client * c __UNUSED__)
#if USE_COMPOSITE #if USE_COMPOSITE
case EWIN_OP_SHADOW: case EWIN_OP_SHADOW:
on = EoGetShadow(ewin); on = EoGetShadow(ewin);
if (SetEwinBoolean("shadow", &on, param1, 0)) if (SetEwinBoolean(wop->name, &on, param1, 0))
EoSetShadow(ewin, !on); EoSetShadow(ewin, !on);
break; break;
case EWIN_OP_NO_REDIRECT: case EWIN_OP_NO_REDIRECT:
on = EoGetNoRedirect(ewin); on = EoGetNoRedirect(ewin);
on = ewin->o.noredir; on = ewin->o.noredir;
if (SetEwinBoolean("noredir", &on, param1, 0)) if (SetEwinBoolean(wop->name, &on, param1, 0))
EoSetNoRedirect(ewin, !on); EoSetNoRedirect(ewin, !on);
break; break;
#endif #endif
case EWIN_OP_SHADE: case EWIN_OP_SHADE:
if (SetEwinBoolean("shaded", &ewin->state.shaded, param1, 0)) if (SetEwinBoolean(wop->name, &ewin->state.shaded, param1, 0))
EwinOpShade(ewin, !ewin->state.shaded); EwinOpShade(ewin, !ewin->state.shaded);
break; break;
case EWIN_OP_STICK: case EWIN_OP_STICK:
on = EoIsSticky(ewin); on = EoIsSticky(ewin);
if (SetEwinBoolean("sticky", &on, param1, 0)) if (SetEwinBoolean(wop->name, &on, param1, 0))
EwinOpStick(ewin, !on); EwinOpStick(ewin, !on);
break; break;
case EWIN_OP_FIXED_POS: case EWIN_OP_FIXED_POS:
SetEwinBoolean("fixedpos", &ewin->props.fixedpos, param1, 1); SetEwinBoolean(wop->name, &ewin->props.fixedpos, param1, 1);
EwinStateUpdate(ewin); EwinStateUpdate(ewin);
HintsSetWindowState(ewin); HintsSetWindowState(ewin);
break; break;
case EWIN_OP_FIXED_SIZE: case EWIN_OP_FIXED_SIZE:
SetEwinBoolean("fixedsize", &ewin->props.fixedsize, param1, 1); SetEwinBoolean(wop->name, &ewin->props.fixedsize, param1, 1);
EwinStateUpdate(ewin); EwinStateUpdate(ewin);
HintsSetWindowState(ewin); HintsSetWindowState(ewin);
break; break;
case EWIN_OP_NEVER_USE_AREA: case EWIN_OP_NEVER_USE_AREA:
SetEwinBoolean("never_use_area", &ewin->props.never_use_area, param1, SetEwinBoolean(wop->name, &ewin->props.never_use_area, param1, 1);
1);
break; break;
case EWIN_OP_FOCUS_CLICK: case EWIN_OP_FOCUS_CLICK:
SetEwinBoolean("focusclick", &ewin->props.focusclick, param1, 1); SetEwinBoolean(wop->name, &ewin->props.focusclick, param1, 1);
break; break;
case EWIN_OP_FOCUS_NEVER: case EWIN_OP_FOCUS_NEVER:
SetEwinBoolean("neverfocus", &ewin->props.never_focus, param1, 1); SetEwinBoolean(wop->name, &ewin->props.never_focus, param1, 1);
EwinStateUpdate(ewin); EwinStateUpdate(ewin);
break; break;
case EWIN_OP_NO_BUTTON_GRABS: case EWIN_OP_NO_BUTTON_GRABS:
if (SetEwinBoolean if (SetEwinBoolean(wop->name, &ewin->props.no_button_grabs, param1, 1))
("no_button_grabs", &ewin->props.no_button_grabs, param1, 1))
{ {
if (ewin->props.no_button_grabs) if (ewin->props.no_button_grabs)
UnGrabButtonGrabs(ewin); UnGrabButtonGrabs(ewin);
@ -720,12 +718,12 @@ IPC_WinOps(const char *params, Client * c __UNUSED__)
case EWIN_OP_FULLSCREEN: case EWIN_OP_FULLSCREEN:
on = ewin->state.fullscreen; on = ewin->state.fullscreen;
if (SetEwinBoolean("fullscreen", &on, param1, 0)) if (SetEwinBoolean(wop->name, &on, param1, 0))
EwinSetFullscreen(ewin, !on); EwinSetFullscreen(ewin, !on);
break; break;
case EWIN_OP_SKIP_LISTS: case EWIN_OP_SKIP_LISTS:
if (SetEwinBoolean("skiplists", &ewin->props.skip_ext_task, param1, 1)) if (SetEwinBoolean(wop->name, &ewin->props.skip_ext_task, param1, 1))
EwinOpSkipLists(ewin, ewin->props.skip_ext_task); EwinOpSkipLists(ewin, ewin->props.skip_ext_task);
break; break;
@ -1097,7 +1095,7 @@ EwinShowInfo2(const EWin * ewin)
"Struts lrtb %i,%i,%i,%i\n" "Struts lrtb %i,%i,%i,%i\n"
"MWM border %i resizeh %i title %i menu %i minimize %i maximize %i\n" "MWM border %i resizeh %i title %i menu %i minimize %i maximize %i\n"
"NeedsInput %i TakeFocus %i FocusNever %i FocusClick %i\n" "NeedsInput %i TakeFocus %i FocusNever %i FocusClick %i\n"
"NeverUseArea %i FixedPos %i\n" "NeverUseArea %i FixedPos %i FixedSize %i\n"
"Desktop %i Layer %i(%i)\n" "Desktop %i Layer %i(%i)\n"
"Iconified %i Sticky %i Shaded %i Docked %i\n" "Iconified %i Sticky %i Shaded %i Docked %i\n"
"State %i Shown %i Visibility %i Active %i\n" "State %i Shown %i Visibility %i Active %i\n"
@ -1142,7 +1140,8 @@ EwinShowInfo2(const EWin * ewin)
ewin->mwm.decor_minimize, ewin->mwm.decor_maximize, ewin->mwm.decor_minimize, ewin->mwm.decor_maximize,
ewin->icccm.need_input, ewin->icccm.take_focus, ewin->icccm.need_input, ewin->icccm.take_focus,
ewin->props.never_focus, ewin->props.focusclick, ewin->props.never_focus, ewin->props.focusclick,
ewin->props.never_use_area, ewin->props.fixedpos, EoGetDesk(ewin), ewin->props.never_use_area, ewin->props.fixedpos,
ewin->props.fixedsize, EoGetDesk(ewin),
EoGetLayer(ewin), ewin->o.ilayer, EoGetLayer(ewin), ewin->o.ilayer,
ewin->state.iconified, EoIsSticky(ewin), ewin->state.shaded, ewin->state.iconified, EoIsSticky(ewin), ewin->state.shaded,
ewin->state.docked, ewin->state.state, EoIsShown(ewin), ewin->state.docked, ewin->state.state, EoIsShown(ewin),
@ -1411,7 +1410,7 @@ IpcItem IPCArray[] = {
"status of that flag\n" "status of that flag\n"
"available win_op commands are:\n" "available win_op commands are:\n"
" win_op <windowid> <close/kill>\n" " win_op <windowid> <close/kill>\n"
" win_op <windowid> <fixedpos/never_use_area>\n" " win_op <windowid> <fixedpos/fixedsize/never_use_area>\n"
" win_op <windowid> <focus/focusclick/neverfocus>\n" " win_op <windowid> <focus/focusclick/neverfocus>\n"
" win_op <windowid> <fullscreen/iconify/shade/stick>\n" " win_op <windowid> <fullscreen/iconify/shade/stick>\n"
" win_op <windowid> no_button_grabs\n" " win_op <windowid> no_button_grabs\n"

View File

@ -683,6 +683,10 @@ WindowMatchEwinOpsAction(EWin * ewin, int op, const char *args)
WINOP_GET_BOOL(ewin->props.fixedpos, args); WINOP_GET_BOOL(ewin->props.fixedpos, args);
break; break;
case EWIN_OP_FIXED_SIZE:
WINOP_GET_BOOL(ewin->props.fixedsize, args);
break;
case EWIN_OP_NEVER_USE_AREA: case EWIN_OP_NEVER_USE_AREA:
WINOP_GET_BOOL(ewin->props.never_use_area, args); WINOP_GET_BOOL(ewin->props.never_use_area, args);
break; break;