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

Trivial renaming of placement options. 

SVN revision: 10672
This commit is contained in:
Kim Woelders 2004-07-03 00:30:50 +00:00
parent 5337b5a6ee
commit 7ab2bebe6e
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/E.h
View File

@ -1227,6 +1227,11 @@ typedef struct
int menu_button;
} pagers;
struct
{
char manual;
char manual_mouse_pointer;
} place;
struct
{
char enable;
int edge_snap_dist;
@ -1285,8 +1290,6 @@ typedef struct
char save_under;
char menuslide;
char menusonscreen;
char manual_placement;
char manual_placement_mouse_pointer;
char warpmenus;
int edge_flip_resistance;
GroupConfig group_config;

9
src/borders.c
View File

@ -489,7 +489,7 @@ AddToFamily(Window win)
ewin->desktop = DESKTOPS_WRAP_NUM(ewin->desktop);
}
if ((!ewin->client.transient) && (Conf.manual_placement)
if ((!ewin->client.transient) && (Conf.place.manual)
&& (!ewin->client.already_placed) && (!Mode.wm.startup) && (!Mode.place))
{
cangrab = GrabThePointer(VRoot.win);
@ -511,9 +511,8 @@ AddToFamily(Window win)
y = ewin->y;
if ((!ewin->client.already_placed) && (!manplace))
{
/* Place the window below the mouse pointer */
if (Conf.manual_placement_mouse_pointer)
if (Conf.place.manual_mouse_pointer)
{
int rx, ry, wx, wy;
unsigned int mask;
@ -556,8 +555,8 @@ AddToFamily(Window win)
{
ewin->client.already_placed = 1;
ArrangeEwinXY(ewin, &x, &y);
} /* (Conf.manual_placement_mouse_pointer) */
} /* ((!ewin->client.already_placed) && (!manplace)) */
}
}
/* if the window asked to be iconified at the start */
if (ewin->client.start_iconified)

8
src/config.c
View File

@ -750,10 +750,10 @@ Config_Control(FILE * ConfigFile)
Conf.focus.new_transients_get_focus_if_group_focused = i2;
break;
case CONTROL_MANUAL_PLACEMENT:
Conf.manual_placement = i2;
Conf.place.manual = i2;
break;
case CONTROL_MANUAL_PLACEMENT_MOUSE_POINTER:
Conf.manual_placement_mouse_pointer = i2;
Conf.place.manual_mouse_pointer = i2;
break;
case CONTROL_RAISE_ON_NEXT_FOCUS:
Conf.focus.raise_on_next_focus = i2;
@ -3893,9 +3893,9 @@ SaveUserControlConfig(FILE * autosavefile)
(int)Conf.focus.new_transients_get_focus);
fprintf(autosavefile, "342 %i\n",
(int)Conf.focus.new_transients_get_focus_if_group_focused);
fprintf(autosavefile, "343 %i\n", (int)Conf.manual_placement);
fprintf(autosavefile, "343 %i\n", (int)Conf.place.manual);
fprintf(autosavefile, "3360 %i\n",
(int)Conf.manual_placement_mouse_pointer);
(int)Conf.place.manual_mouse_pointer);
fprintf(autosavefile, "344 %i\n", (int)Conf.focus.raise_on_next_focus);
fprintf(autosavefile, "345 %i\n", (int)Conf.focus.warp_on_next_focus);
fprintf(autosavefile, "346 %i\n", (int)Conf.edge_flip_resistance);

18
src/ipc.c
View File

@ -2038,15 +2038,15 @@ IPC_AdvancedFocus(const char *params, Client * c)
{
if (!strcmp(param2, "on"))
{
Conf.manual_placement = 1;
Conf.place.manual = 1;
}
else if (!strcmp(param2, "off"))
{
Conf.manual_placement = 0;
Conf.place.manual = 0;
}
else if (!strcmp(param2, "?"))
{
if (Conf.manual_placement)
if (Conf.place.manual)
{
Esnprintf(buf, sizeof(buf), "manual_placement: on");
}
@ -2064,15 +2064,15 @@ IPC_AdvancedFocus(const char *params, Client * c)
{
if (!strcmp(param2, "on"))
{
Conf.manual_placement_mouse_pointer = 1;
Conf.place.manual_mouse_pointer = 1;
}
else if (!strcmp(param2, "off"))
{
Conf.manual_placement_mouse_pointer = 0;
Conf.place.manual_mouse_pointer = 0;
}
else if (!strcmp(param2, "?"))
{
if (Conf.manual_placement_mouse_pointer)
if (Conf.place.manual_mouse_pointer)
{
Esnprintf(buf, sizeof(buf),
"manual_placement_mouse_pointer: on");
@ -5484,12 +5484,12 @@ IPC_ControlsSet(const char *s, Client * c __UNUSED__)
else if (!strcmp(w, "MANUAL_PLACEMENT:"))
{
word(s, wd, w);
Conf.manual_placement = atoi(w);
Conf.place.manual = atoi(w);
}
else if (!strcmp(w, "MANUAL_PLACEMENT_MOUSE_POINTER:"))
{
word(s, wd, w);
Conf.manual_placement_mouse_pointer = atoi(w);
Conf.place.manual_mouse_pointer = atoi(w);
}
else if (!strcmp(w, "RAISE_ON_NEXT_FOCUS:"))
{
@ -5613,7 +5613,7 @@ IPC_ControlsGet(const char *s __UNUSED__, Client * c)
Conf.focus.all_new_windows_get_focus,
Conf.focus.new_transients_get_focus,
Conf.focus.new_transients_get_focus_if_group_focused,
Conf.manual_placement, Conf.manual_placement_mouse_pointer,
Conf.place.manual, Conf.place.manual_mouse_pointer,
Conf.focus.raise_on_next_focus,
Conf.focus.raise_after_next_focus, Conf.warplist.enable,
Conf.focus.warp_on_next_focus,

9
src/settings.c
View File

@ -1462,9 +1462,8 @@ CB_ConfigurePlacement(int val, void *data)
{
Conf.focus.transientsfollowleader = tmp_with_leader;
Conf.focus.switchfortransientmap = tmp_switch_popup;
Conf.manual_placement = tmp_manual_placement;
Conf.manual_placement_mouse_pointer =
tmp_manual_placement_mouse_pointer;
Conf.place.manual = tmp_manual_placement;
Conf.place.manual_mouse_pointer = tmp_manual_placement_mouse_pointer;
#ifdef HAS_XINERAMA
if (xinerama_active)
Conf.extra_head = tmp_extra_head;
@ -1491,8 +1490,8 @@ SettingsPlacement(void)
tmp_with_leader = Conf.focus.transientsfollowleader;
tmp_switch_popup = Conf.focus.switchfortransientmap;
tmp_manual_placement = Conf.manual_placement;
tmp_manual_placement_mouse_pointer = Conf.manual_placement_mouse_pointer;
tmp_manual_placement = Conf.place.manual;
tmp_manual_placement_mouse_pointer = Conf.place.manual_mouse_pointer;
#ifdef HAS_XINERAMA
tmp_extra_head = Conf.extra_head;
#endif

2
src/setup.c
View File

@ -486,7 +486,7 @@ SetupX(void)
Conf.menuslide = 0;
Conf.menusonscreen = 1;
Conf.warpmenus = 1;
Conf.manual_placement = 0;
Conf.place.manual = 0;
Conf.edge_flip_resistance = 15;
#ifdef USE_IMLIB2