yosh
/
hikari
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

rename iconified to invisible 

Iconified state has always been a misnomer. The view is not iconified at all,
there is no icon laying around it is just invisible when a sheet is shown.
This commit is contained in:
raichoo 2020-03-10 09:13:35 +00:00
parent 4add59560f
commit 8fa65949dd
12 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/hikari/indicator.h
View File

@ -40,7 +40,7 @@ hikari_indicator_update_sheet(struct hikari_indicator *indicator,
struct hikari_output *output,
struct hikari_sheet *sheet,
float background[static 4],
bool iconified,
bool invisible,
bool floating);
void

6
include/hikari/server.h
View File

@ -236,7 +236,7 @@ WORKSPACE_ACTION(toggle_view_vertical_maximize)
WORKSPACE_ACTION(toggle_view_horizontal_maximize)
WORKSPACE_ACTION(toggle_view_full_maximize)
WORKSPACE_ACTION(toggle_view_floating)
WORKSPACE_ACTION(toggle_view_iconified)
WORKSPACE_ACTION(toggle_view_invisible)
WORKSPACE_ACTION(only_view)
WORKSPACE_ACTION(only_group)
WORKSPACE_ACTION(hide_view)
@ -246,8 +246,8 @@ WORKSPACE_ACTION(raise_view)
WORKSPACE_ACTION(raise_group)
WORKSPACE_ACTION(lower_view)
WORKSPACE_ACTION(lower_group)
WORKSPACE_ACTION(show_iconified_sheet_views)
WORKSPACE_ACTION(show_all_iconified_views)
WORKSPACE_ACTION(show_invisible_sheet_views)
WORKSPACE_ACTION(show_all_invisible_views)
WORKSPACE_ACTION(reset_view_geometry)
WORKSPACE_ACTION(quit_view)
WORKSPACE_ACTION(exchange_next_view)

6
include/hikari/view.h
View File

@ -131,7 +131,7 @@ hikari_view_subsurface_fini(struct hikari_view_subsurface *view_subsurface);
}
FLAG(hidden, 0UL)
FLAG(iconified, 1UL)
FLAG(invisible, 1UL)
FLAG(floating, 2UL)
#undef FLAG
@ -166,7 +166,7 @@ VIEW_ACTION(damage_whole)
VIEW_ACTION(top_left_cursor)
VIEW_ACTION(bottom_right_cursor)
VIEW_ACTION(center_cursor)
VIEW_ACTION(toggle_iconified)
VIEW_ACTION(toggle_invisible)
VIEW_ACTION(reset_geometry)
#undef VIEW_ACTION
@ -310,7 +310,7 @@ hikari_view_is_tiled(struct hikari_view *view)
static inline bool
hikari_view_is_tileable(struct hikari_view *view)
{
return !hikari_view_is_floating(view) && !hikari_view_is_iconified(view) &&
return !hikari_view_is_floating(view) && !hikari_view_is_invisible(view) &&
!hikari_view_is_dirty(view);
}

6
include/hikari/workspace.h
View File

@ -122,15 +122,15 @@ WORKSPACE_ACTION(pin_view_to_sheet_alternate)
WORKSPACE_ACTION(pin_view_to_sheet_current)
WORKSPACE_ACTION(pin_view_to_sheet_next)
WORKSPACE_ACTION(pin_view_to_sheet_prev)
WORKSPACE_ACTION(toggle_view_iconified)
WORKSPACE_ACTION(toggle_view_invisible)
WORKSPACE_ACTION(toggle_view_floating)
WORKSPACE_ACTION(toggle_view_full_maximize)
WORKSPACE_ACTION(toggle_view_vertical_maximize)
WORKSPACE_ACTION(toggle_view_horizontal_maximize)
WORKSPACE_ACTION(toggle_view_horizontal_maximize)
WORKSPACE_ACTION(reset_view_geometry)
WORKSPACE_ACTION(show_iconified_sheet_views)
WORKSPACE_ACTION(show_all_iconified_views)
WORKSPACE_ACTION(show_invisible_sheet_views)
WORKSPACE_ACTION(show_all_invisible_views)
WORKSPACE_ACTION(exchange_next_view)
WORKSPACE_ACTION(exchange_prev_view)
WORKSPACE_ACTION(exchange_main_layout_view)

4
share/examples/hikari.conf
View File

@ -182,7 +182,7 @@ bindings {
"L+Comma" = workspace-switch-to-sheet-next-inhabited
"LS+Comma" = workspace-switch-to-sheet-prev-inhabited
"LC+i" = sheet-show-iconified
"LC+i" = sheet-show-invisible
"LC+Period" = sheet-show-all
"LA+r" = layout-reset
@ -235,7 +235,7 @@ bindings {
"L+less" = view-toggle-maximize-horizontal
"L+f" = view-toggle-maximize-full
"L5-35" = view-toggle-floating # 'AltGr +' for '~'
"L+i" = view-toggle-iconified
"L+i" = view-toggle-invisible
"LS+o" = group-only
"LS+h" = group-hide

28
share/man/man1/hikari.md
View File

@ -36,12 +36,12 @@ several states.
*Floating* _views_ can never become part of a layout.
* **iconified**
* **invisible**
When a _view_ is set into *iconified* state it will not be displayed when
When a _view_ is set into *invisible* state it will not be displayed when
switching to the containing sheet and stay hidden until it is explicitly
requested to be shown. This can be used to keep long running _views_ from
cluttering the workspace. An *iconified* _view_ can never be *tiled*.
cluttering the workspace. An *invisible* _view_ can never be *tiled*.
* **maximized** (horizontal, vertical and full)
@ -300,11 +300,11 @@ Sheet actions
* **sheet-show-all**
Clears the current workspace and populates it with all views that are a member
of its current sheet. This includes **iconified** views as well.
of its current sheet. This includes **invisible** views as well.
* **sheet-show-iconified**
* **sheet-show-invisible**
Clears the current workspace and populates it with all **iconified** views
Clears the current workspace and populates it with all **invisible** views
that are a member of its current sheet.
View actions
@ -373,13 +373,13 @@ View actions
part of a layout. If a view that is already tiled is set to floating state it
will be taken out of the layout and reset its geometry.
* **view-toggle-iconified**
* **view-toggle-invisible**
Toggles the iconified state of the focused view. A view in iconified state is
Toggles the invisible state of the focused view. A view in invisible state is
not displayed if a user switches to the sheet containing this view. They need
to be shown explicitly, either by using marks or by issuing actions showing
views in this state. Iconified views can not be part of a layout. If a view
that is already tiled is set to iconified state it will be taken out of the
that is already tiled is set to invisible state it will be taken out of the
layout and reset its geometry.
* **view-toggle-maximize-[full|horizontal|vertical]**
@ -403,7 +403,7 @@ Workspace actions
workspace to this very sheet. Views that are a member of sheet **0** will also
be displayed on the bottom of the stacking order. Switching to the current
sheet will reset the state of the sheet e.g. hiding borrowed views, showing
views that have previously been hidden and hiding views that are in iconified
views that have previously been hidden and hiding views that are in invisible
state.
* **workspace-switch-to-sheet-[next|prev]-inhabited**
@ -542,10 +542,10 @@ an existing layout the user has to issue a tiling action. This way opening a new
view does not scramble an existing layout and the user can actively decide when
to incorporate a view into a layout.
A layout is bound to a sheet, each sheet can have at most one layout and
laying out a sheet will incorporate all of its views unless they are **iconifed**
or **floating**. Resetting a layout will reset the geometry of all of the
laid out views to its original geometry (also resetting maximization).
A layout is bound to a sheet, each sheet can have at most one layout and laying
out a sheet will incorporate all of its views unless they are **invisible** or
**floating**. Resetting a layout will reset the geometry of all of the laid out
views to its original geometry (also resetting maximization).
Configuring layouts happens in the _layouts_ section in the configuration file.
Layouts are assigned to layout registers from **a** to **z**. A layout itself is

8
src/configuration.c
View File

@ -1172,8 +1172,8 @@ parse_binding(struct hikari_configuration *configuration,
} else if (!strcmp(str, "view-toggle-floating")) {
*action = hikari_server_toggle_view_floating;
*arg = NULL;
} else if (!strcmp(str, "view-toggle-iconified")) {
*action = hikari_server_toggle_view_iconified;
} else if (!strcmp(str, "view-toggle-invisible")) {
*action = hikari_server_toggle_view_invisible;
*arg = NULL;
} else if (!strcmp(str, "view-raise")) {
@ -1266,8 +1266,8 @@ parse_binding(struct hikari_configuration *configuration,
*action = hikari_server_switch_to_prev_inhabited_sheet;
*arg = NULL;
} else if (!strcmp(str, "sheet-show-iconified")) {
*action = hikari_server_show_iconified_sheet_views;
} else if (!strcmp(str, "sheet-show-invisible")) {
*action = hikari_server_show_invisible_sheet_views;
*arg = NULL;
} else if (!strcmp(str, "sheet-show-all")) {
*action = hikari_server_show_all_sheet_views;

6
src/indicator.c
View File

@ -54,7 +54,7 @@ hikari_indicator_update(struct hikari_indicator *indicator,
output,
view->sheet,
background,
hikari_view_is_iconified(view),
hikari_view_is_invisible(view),
hikari_view_is_floating(view));
if (view->sheet->group != view->group) {
@ -108,7 +108,7 @@ hikari_indicator_update_sheet(struct hikari_indicator *indicator,
struct hikari_output *output,
struct hikari_sheet *sheet,
float background[static 4],
bool iconified,
bool invisible,
bool floating)
{
char *output_name = sheet->workspace->output->output->name;
@ -119,7 +119,7 @@ hikari_indicator_update_sheet(struct hikari_indicator *indicator,
text[i++] = '~';
}
if (iconified) {
if (invisible) {
text[i++] = '[';
text[i++] = sheet->group->name[0];
text[i++] = ']';

2
src/server.c
View File

@ -891,7 +891,7 @@ hikari_server_enter_sheet_assign_mode(void *arg)
workspace->output,
focus_view->sheet,
hikari_configuration->indicator_insert,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
hikari_server.sheet_assign_mode.sheet = focus_view->sheet;

6
src/sheet_assign_mode.c
View File

@ -123,7 +123,7 @@ confirm_sheet_assign(struct hikari_workspace *workspace)
workspace->output,
sheet,
hikari_configuration->indicator_selected,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
hikari_view_pin_to_sheet(focus_view, sheet);
@ -144,7 +144,7 @@ cancel_sheet_assign(struct hikari_workspace *workspace)
workspace->output,
focus_view->sheet,
hikari_configuration->indicator_selected,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
hikari_server_enter_normal_mode(NULL);
@ -171,7 +171,7 @@ update_state(struct hikari_workspace *workspace,
workspace->output,
sheet,
hikari_configuration->indicator_insert,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
mode->sheet = sheet;

8
src/view.c
View File

@ -1231,15 +1231,15 @@ hikari_view_bottom_right_cursor(struct hikari_view *view)
}
void
hikari_view_toggle_iconified(struct hikari_view *view)
hikari_view_toggle_invisible(struct hikari_view *view)
{
if (hikari_view_is_iconified(view)) {
hikari_view_unset_iconified(view);
if (hikari_view_is_invisible(view)) {
hikari_view_unset_invisible(view);
} else {
if (hikari_view_is_tiled(view)) {
hikari_view_reset_geometry(view);
}
hikari_view_set_iconified(view);
hikari_view_set_invisible(view);
}
}

22
src/workspace.c
View File

@ -141,7 +141,7 @@ display_sheet(struct hikari_workspace *workspace, struct hikari_sheet *sheet)
struct hikari_sheet *sheets = workspace->sheets;
wl_list_for_each_reverse (view, &sheets[0].views, sheet_views) {
if (!hikari_view_is_iconified(view)) {
if (!hikari_view_is_invisible(view)) {
hikari_view_show(view);
}
}
@ -149,7 +149,7 @@ display_sheet(struct hikari_workspace *workspace, struct hikari_sheet *sheet)
if (sheet->nr != 0) {
view = NULL;
wl_list_for_each_reverse (view, &sheet->views, sheet_views) {
if (!hikari_view_is_iconified(view)) {
if (!hikari_view_is_invisible(view)) {
hikari_view_show(view);
}
}
@ -771,7 +771,7 @@ pin_to_sheet(struct hikari_workspace *workspace, struct hikari_sheet *sheet)
output,
focus_view->sheet,
hikari_configuration->indicator_selected,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
}
@ -816,11 +816,11 @@ MAXIMIZE(horizontal)
#undef MAXIMIZE
void
hikari_workspace_toggle_view_iconified(struct hikari_workspace *workspace)
hikari_workspace_toggle_view_invisible(struct hikari_workspace *workspace)
{
FOCUS_GUARD(workspace, focus_view)
hikari_view_toggle_iconified(focus_view);
hikari_view_toggle_invisible(focus_view);
struct wlr_box *geometry = hikari_view_geometry(focus_view);
struct hikari_output *output = workspace->output;
@ -830,7 +830,7 @@ hikari_workspace_toggle_view_iconified(struct hikari_workspace *workspace)
output,
focus_view->sheet,
hikari_configuration->indicator_selected,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
}
@ -849,18 +849,18 @@ hikari_workspace_toggle_view_floating(struct hikari_workspace *workspace)
output,
focus_view->sheet,
hikari_configuration->indicator_selected,
hikari_view_is_iconified(focus_view),
hikari_view_is_invisible(focus_view),
hikari_view_is_floating(focus_view));
}
void
hikari_workspace_show_iconified_sheet_views(struct hikari_workspace *workspace)
hikari_workspace_show_invisible_sheet_views(struct hikari_workspace *workspace)
{
hikari_workspace_clear(workspace);
struct hikari_view *view = NULL;
wl_list_for_each_reverse (view, &workspace->sheet->views, sheet_views) {
if (hikari_view_is_iconified(view)) {
if (hikari_view_is_invisible(view)) {
hikari_view_show(view);
}
}
@ -869,13 +869,13 @@ hikari_workspace_show_iconified_sheet_views(struct hikari_workspace *workspace)
}
void
hikari_workspace_show_all_iconified_views(struct hikari_workspace *workspace)
hikari_workspace_show_all_invisible_views(struct hikari_workspace *workspace)
{
hikari_workspace_clear(workspace);
struct hikari_view *view = NULL;
wl_list_for_each_reverse (view, &workspace->output->views, output_views) {
if (hikari_view_is_iconified(view)) {
if (hikari_view_is_invisible(view)) {
hikari_view_show(view);
}
}