diff --git a/Makefile.am b/Makefile.am index 25952c86..f17d4469 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,30 +23,30 @@ AM_CFLAGS=\ rofi_SOURCES=\ source/rofi.c\ - source/rofi-i3.c\ + source/i3-support.c\ source/textbox.c\ source/xrmoptions.c\ - source/dmenu-dialog.c\ - source/run-dialog.c\ - source/window-dialog.c\ - source/ssh-dialog.c\ - source/script-dialog.c\ source/history.c\ config/config.c\ source/helper.c\ + source/dialogs/dmenu-dialog.c\ + source/dialogs/run-dialog.c\ + source/dialogs/window-dialog.c\ + source/dialogs/ssh-dialog.c\ + source/dialogs/script-dialog.c\ source/x11-helper.c\ include/rofi.h\ - include/rofi-i3.h\ - include/run-dialog.h\ - include/window-dialog.h\ - include/ssh-dialog.h\ - include/dmenu-dialog.h\ - include/script-dialog.h\ + include/i3-support.h\ include/xrmoptions.h\ include/history.h\ include/textbox.h\ include/helper.h\ - include/x11-helper.h + include/x11-helper.h\ + include/dialogs/run-dialog.h\ + include/dialogs/window-dialog.h\ + include/dialogs/ssh-dialog.h\ + include/dialogs/dmenu-dialog.h\ + include/dialogs/script-dialog.h ## # Manpage diff --git a/include/dmenu-dialog.h b/include/dialogs/dmenu-dialog.h similarity index 100% rename from include/dmenu-dialog.h rename to include/dialogs/dmenu-dialog.h diff --git a/include/run-dialog.h b/include/dialogs/run-dialog.h similarity index 100% rename from include/run-dialog.h rename to include/dialogs/run-dialog.h diff --git a/include/script-dialog.h b/include/dialogs/script-dialog.h similarity index 100% rename from include/script-dialog.h rename to include/dialogs/script-dialog.h diff --git a/include/ssh-dialog.h b/include/dialogs/ssh-dialog.h similarity index 100% rename from include/ssh-dialog.h rename to include/dialogs/ssh-dialog.h diff --git a/include/window-dialog.h b/include/dialogs/window-dialog.h similarity index 100% rename from include/window-dialog.h rename to include/dialogs/window-dialog.h diff --git a/include/rofi-i3.h b/include/i3-support.h similarity index 100% rename from include/rofi-i3.h rename to include/i3-support.h diff --git a/source/dmenu-dialog.c b/source/dialogs/dmenu-dialog.c similarity index 99% rename from source/dmenu-dialog.c rename to source/dialogs/dmenu-dialog.c index 3bb32328..9907a024 100644 --- a/source/dmenu-dialog.c +++ b/source/dialogs/dmenu-dialog.c @@ -33,7 +33,7 @@ #include #include #include "rofi.h" -#include "dmenu-dialog.h" +#include "dialogs/dmenu-dialog.h" #include "helper.h" char *dmenu_prompt = "dmenu "; diff --git a/source/run-dialog.c b/source/dialogs/run-dialog.c similarity index 99% rename from source/run-dialog.c rename to source/dialogs/run-dialog.c index 964aa0f3..4b845dec 100644 --- a/source/run-dialog.c +++ b/source/dialogs/run-dialog.c @@ -41,7 +41,7 @@ #include "rofi.h" #include "helper.h" #include "history.h" -#include "run-dialog.h" +#include "dialogs/run-dialog.h" #ifdef TIMING #include #endif diff --git a/source/script-dialog.c b/source/dialogs/script-dialog.c similarity index 99% rename from source/script-dialog.c rename to source/dialogs/script-dialog.c index 26c72ebc..5d7e4067 100644 --- a/source/script-dialog.c +++ b/source/dialogs/script-dialog.c @@ -35,7 +35,7 @@ #include #include #include "rofi.h" -#include "script-dialog.h" +#include "dialogs/script-dialog.h" #include "helper.h" diff --git a/source/ssh-dialog.c b/source/dialogs/ssh-dialog.c similarity index 99% rename from source/ssh-dialog.c rename to source/dialogs/ssh-dialog.c index ac4eb050..06e12ae7 100644 --- a/source/ssh-dialog.c +++ b/source/dialogs/ssh-dialog.c @@ -42,7 +42,7 @@ #include "rofi.h" #include "history.h" -#include "ssh-dialog.h" +#include "dialogs/ssh-dialog.h" #ifdef TIMING #include #endif diff --git a/source/window-dialog.c b/source/dialogs/window-dialog.c similarity index 97% rename from source/window-dialog.c rename to source/dialogs/window-dialog.c index 993b885c..cd358365 100644 --- a/source/window-dialog.c +++ b/source/dialogs/window-dialog.c @@ -48,8 +48,8 @@ #include "rofi.h" #include "helper.h" #include "x11-helper.h" -#include "rofi-i3.h" -#include "window-dialog.h" +#include "i3-support.h" +#include "dialogs/window-dialog.h" #define WINLIST 32 @@ -460,12 +460,14 @@ SwitcherMode run_switcher_window ( char **input, G_GNUC_UNUSED void *data ) else{ // Change to the desktop of the selected window/client. // TODO: get rid of strtol - window_send_message ( display, root, root, netatoms[_NET_CURRENT_DESKTOP], strtol ( list[selected_line], NULL, 10 ) - 1, - SubstructureNotifyMask | SubstructureRedirectMask, time ); + window_send_message ( display, root, root, netatoms[_NET_CURRENT_DESKTOP], + strtol ( list[selected_line], NULL, 10 ) - 1, + SubstructureNotifyMask | SubstructureRedirectMask, time ); XSync ( display, False ); - window_send_message ( display, root, ids->array[selected_line], netatoms[_NET_ACTIVE_WINDOW], 2, // 2 = pager - SubstructureNotifyMask | SubstructureRedirectMask, time ); + window_send_message ( display, root, ids->array[selected_line], + netatoms[_NET_ACTIVE_WINDOW], 2, // 2 = pager + SubstructureNotifyMask | SubstructureRedirectMask, time ); } } diff --git a/source/rofi-i3.c b/source/i3-support.c similarity index 99% rename from source/rofi-i3.c rename to source/i3-support.c index bcf753e7..96f13f4c 100644 --- a/source/rofi-i3.c +++ b/source/i3-support.c @@ -40,7 +40,7 @@ #include "rofi.h" #include "x11-helper.h" -#include "rofi-i3.h" +#include "i3-support.h" #ifdef HAVE_I3_IPC_H #include diff --git a/source/rofi.c b/source/rofi.c index 4b3fc784..b32cbb66 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -50,11 +50,11 @@ #include "xrmoptions.h" #include "textbox.h" // Switchers. -#include "run-dialog.h" -#include "ssh-dialog.h" -#include "dmenu-dialog.h" -#include "script-dialog.h" -#include "window-dialog.h" +#include "dialogs/run-dialog.h" +#include "dialogs/ssh-dialog.h" +#include "dialogs/dmenu-dialog.h" +#include "dialogs/script-dialog.h" +#include "dialogs/window-dialog.h" #define LINE_MARGIN 3