Moving files around, dialogs in dialog directory.

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/i3-support.h\
-    include/run-dialog.h\
-    include/window-dialog.h\
-    include/ssh-dialog.h\
-    include/dmenu-dialog.h\
-    include/script-dialog.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

source/dialogs/dmenu-dialog.c

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "rofi.h"
-#include "dmenu-dialog.h"
+#include "dialogs/dmenu-dialog.h"
 #include "helper.h"
 
 char *dmenu_prompt       = "dmenu ";

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 <time.h>
 #endif

source/dialogs/script-dialog.c

@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <assert.h>
 #include "rofi.h"
-#include "script-dialog.h"
+#include "dialogs/script-dialog.h"
 #include "helper.h"
 
 

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 <time.h>
 #endif

source/dialogs/window-dialog.c

@@ -48,8 +48,8 @@
 #include "rofi.h"
 #include "helper.h"
 #include "x11-helper.h"
-#include "rofi-i3.h"
+#include "i3-support.h"
-#include "window-dialog.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,
+                window_send_message ( display, root, root, netatoms[_NET_CURRENT_DESKTOP],
-                                      SubstructureNotifyMask | SubstructureRedirectMask, time );
+                        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
+                window_send_message ( display, root, ids->array[selected_line],
-                                      SubstructureNotifyMask | SubstructureRedirectMask, time );
+                        netatoms[_NET_ACTIVE_WINDOW], 2, // 2 = pager
+                        SubstructureNotifyMask | SubstructureRedirectMask, time );
             }
         }
 

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 <i3/ipc.h>

source/rofi.c

@@ -50,11 +50,11 @@
 #include "xrmoptions.h"
 #include "textbox.h"
 // Switchers.
-#include "run-dialog.h"
+#include "dialogs/run-dialog.h"
-#include "ssh-dialog.h"
+#include "dialogs/ssh-dialog.h"
-#include "dmenu-dialog.h"
+#include "dialogs/dmenu-dialog.h"
-#include "script-dialog.h"
+#include "dialogs/script-dialog.h"
-#include "window-dialog.h"
+#include "dialogs/window-dialog.h"
 
 #define LINE_MARGIN    3