Simplified command arguments

1 files changed, 88 insertions, 88 deletions

diff --git a/config.def.h b/config.def.h
index f3fd9d3..ac32bd7 100644
--- a/config.def.h
+++ b/config.def.h
@@ -62,99 +62,99 @@ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 };
 /* keyboard mappings for image and thumbnail mode: */
 static const keymap_t keys[] = {
 	/* modifiers    key               function              argument */
-	{ 0,            XK_q,             g_quit,               (arg_t) None },
-	{ 0,            XK_Return,        g_switch_mode,        (arg_t) None },
-	{ 0,            XK_f,             g_toggle_fullscreen,  (arg_t) None },
-	{ 0,            XK_b,             g_toggle_bar,         (arg_t) None },
-	{ ControlMask,  XK_x,             g_prefix_external,    (arg_t) None },
-	{ 0,            XK_g,             g_first,              (arg_t) None },
-	{ 0,            XK_G,             g_n_or_last,          (arg_t) None },
-	{ 0,            XK_r,             g_reload_image,       (arg_t) None },
-	{ 0,            XK_D,             g_remove_image,       (arg_t) None },
-	{ ControlMask,  XK_h,             g_scroll_screen,      (arg_t) DIR_LEFT },
-	{ ControlMask,  XK_Left,          g_scroll_screen,      (arg_t) DIR_LEFT },
-	{ ControlMask,  XK_j,             g_scroll_screen,      (arg_t) DIR_DOWN },
-	{ ControlMask,  XK_Down,          g_scroll_screen,      (arg_t) DIR_DOWN },
-	{ ControlMask,  XK_k,             g_scroll_screen,      (arg_t) DIR_UP },
-	{ ControlMask,  XK_Up,            g_scroll_screen,      (arg_t) DIR_UP },
-	{ ControlMask,  XK_l,             g_scroll_screen,      (arg_t) DIR_RIGHT },
-	{ ControlMask,  XK_Right,         g_scroll_screen,      (arg_t) DIR_RIGHT },
-	{ 0,            XK_plus,          g_zoom,               (arg_t) +1 },
-	{ 0,            XK_KP_Add,        g_zoom,               (arg_t) +1 },
-	{ 0,            XK_minus,         g_zoom,               (arg_t) -1 },
-	{ 0,            XK_KP_Subtract,   g_zoom,               (arg_t) -1 },
-	{ 0,            XK_m,             g_toggle_image_mark,  (arg_t) None },
-	{ 0,            XK_M,             g_reverse_marks,      (arg_t) None },
-	{ ControlMask,  XK_m,             g_unmark_all,         (arg_t) None },
-	{ 0,            XK_N,             g_navigate_marked,    (arg_t) +1 },
-	{ 0,            XK_P,             g_navigate_marked,    (arg_t) -1 },
-	{ 0,            XK_braceleft,     g_change_gamma,       (arg_t) -1 },
-	{ 0,            XK_braceright,    g_change_gamma,       (arg_t) +1 },
-	{ ControlMask,  XK_g,             g_change_gamma,       (arg_t)  0 },
-
-	{ 0,            XK_h,             t_move_sel,           (arg_t) DIR_LEFT },
-	{ 0,            XK_Left,          t_move_sel,           (arg_t) DIR_LEFT },
-	{ 0,            XK_j,             t_move_sel,           (arg_t) DIR_DOWN },
-	{ 0,            XK_Down,          t_move_sel,           (arg_t) DIR_DOWN },
-	{ 0,            XK_k,             t_move_sel,           (arg_t) DIR_UP },
-	{ 0,            XK_Up,            t_move_sel,           (arg_t) DIR_UP },
-	{ 0,            XK_l,             t_move_sel,           (arg_t) DIR_RIGHT },
-	{ 0,            XK_Right,         t_move_sel,           (arg_t) DIR_RIGHT },
-	{ 0,            XK_R,             t_reload_all,         (arg_t) None },
-
-	{ 0,            XK_n,             i_navigate,           (arg_t) +1 },
-	{ 0,            XK_n,             i_scroll_to_edge,     (arg_t) (DIR_LEFT | DIR_UP) },
-	{ 0,            XK_space,         i_navigate,           (arg_t) +1 },
-	{ 0,            XK_p,             i_navigate,           (arg_t) -1 },
-	{ 0,            XK_p,             i_scroll_to_edge,     (arg_t) (DIR_LEFT | DIR_UP) },
-	{ 0,            XK_BackSpace,     i_navigate,           (arg_t) -1 },
-	{ 0,            XK_bracketright,  i_navigate,           (arg_t) +10 },
-	{ 0,            XK_bracketleft,   i_navigate,           (arg_t) -10 },
-	{ ControlMask,  XK_6,             i_alternate,          (arg_t) None },
-	{ ControlMask,  XK_n,             i_navigate_frame,     (arg_t) +1 },
-	{ ControlMask,  XK_p,             i_navigate_frame,     (arg_t) -1 },
-	{ ControlMask,  XK_space,         i_toggle_animation,   (arg_t) None },
-	{ 0,            XK_h,             i_scroll,             (arg_t) DIR_LEFT },
-	{ 0,            XK_Left,          i_scroll,             (arg_t) DIR_LEFT },
-	{ 0,            XK_j,             i_scroll,             (arg_t) DIR_DOWN },
-	{ 0,            XK_Down,          i_scroll,             (arg_t) DIR_DOWN },
-	{ 0,            XK_k,             i_scroll,             (arg_t) DIR_UP },
-	{ 0,            XK_Up,            i_scroll,             (arg_t) DIR_UP },
-	{ 0,            XK_l,             i_scroll,             (arg_t) DIR_RIGHT },
-	{ 0,            XK_Right,         i_scroll,             (arg_t) DIR_RIGHT },
-	{ 0,            XK_H,             i_scroll_to_edge,     (arg_t) DIR_LEFT },
-	{ 0,            XK_J,             i_scroll_to_edge,     (arg_t) DIR_DOWN },
-	{ 0,            XK_K,             i_scroll_to_edge,     (arg_t) DIR_UP },
-	{ 0,            XK_L,             i_scroll_to_edge,     (arg_t) DIR_RIGHT },
-	{ 0,            XK_equal,         i_set_zoom,           (arg_t) 100 },
-	{ 0,            XK_w,             i_fit_to_win,         (arg_t) SCALE_DOWN },
-	{ 0,            XK_W,             i_fit_to_win,         (arg_t) SCALE_FIT },
-	{ 0,            XK_e,             i_fit_to_win,         (arg_t) SCALE_WIDTH },
-	{ 0,            XK_E,             i_fit_to_win,         (arg_t) SCALE_HEIGHT },
-	{ 0,            XK_less,          i_rotate,             (arg_t) DEGREE_270 },
-	{ 0,            XK_greater,       i_rotate,             (arg_t) DEGREE_90 },
-	{ 0,            XK_question,      i_rotate,             (arg_t) DEGREE_180 },
-	{ 0,            XK_bar,           i_flip,               (arg_t) FLIP_HORIZONTAL },
-	{ 0,            XK_underscore,    i_flip,               (arg_t) FLIP_VERTICAL },
-	{ 0,            XK_a,             i_toggle_antialias,   (arg_t) None },
-	{ 0,            XK_A,             i_toggle_alpha,       (arg_t) None },
-	{ 0,            XK_s,             i_slideshow,          (arg_t) None },
+	{ 0,            XK_q,             g_quit,               None },
+	{ 0,            XK_Return,        g_switch_mode,        None },
+	{ 0,            XK_f,             g_toggle_fullscreen,  None },
+	{ 0,            XK_b,             g_toggle_bar,         None },
+	{ ControlMask,  XK_x,             g_prefix_external,    None },
+	{ 0,            XK_g,             g_first,              None },
+	{ 0,            XK_G,             g_n_or_last,          None },
+	{ 0,            XK_r,             g_reload_image,       None },
+	{ 0,            XK_D,             g_remove_image,       None },
+	{ ControlMask,  XK_h,             g_scroll_screen,      DIR_LEFT },
+	{ ControlMask,  XK_Left,          g_scroll_screen,      DIR_LEFT },
+	{ ControlMask,  XK_j,             g_scroll_screen,      DIR_DOWN },
+	{ ControlMask,  XK_Down,          g_scroll_screen,      DIR_DOWN },
+	{ ControlMask,  XK_k,             g_scroll_screen,      DIR_UP },
+	{ ControlMask,  XK_Up,            g_scroll_screen,      DIR_UP },
+	{ ControlMask,  XK_l,             g_scroll_screen,      DIR_RIGHT },
+	{ ControlMask,  XK_Right,         g_scroll_screen,      DIR_RIGHT },
+	{ 0,            XK_plus,          g_zoom,               +1 },
+	{ 0,            XK_KP_Add,        g_zoom,               +1 },
+	{ 0,            XK_minus,         g_zoom,               -1 },
+	{ 0,            XK_KP_Subtract,   g_zoom,               -1 },
+	{ 0,            XK_m,             g_toggle_image_mark,  None },
+	{ 0,            XK_M,             g_reverse_marks,      None },
+	{ ControlMask,  XK_m,             g_unmark_all,         None },
+	{ 0,            XK_N,             g_navigate_marked,    +1 },
+	{ 0,            XK_P,             g_navigate_marked,    -1 },
+	{ 0,            XK_braceleft,     g_change_gamma,       -1 },
+	{ 0,            XK_braceright,    g_change_gamma,       +1 },
+	{ ControlMask,  XK_g,             g_change_gamma,        0 },
+
+	{ 0,            XK_h,             t_move_sel,           DIR_LEFT },
+	{ 0,            XK_Left,          t_move_sel,           DIR_LEFT },
+	{ 0,            XK_j,             t_move_sel,           DIR_DOWN },
+	{ 0,            XK_Down,          t_move_sel,           DIR_DOWN },
+	{ 0,            XK_k,             t_move_sel,           DIR_UP },
+	{ 0,            XK_Up,            t_move_sel,           DIR_UP },
+	{ 0,            XK_l,             t_move_sel,           DIR_RIGHT },
+	{ 0,            XK_Right,         t_move_sel,           DIR_RIGHT },
+	{ 0,            XK_R,             t_reload_all,         None },
+
+	{ 0,            XK_n,             i_navigate,           +1 },
+	{ 0,            XK_n,             i_scroll_to_edge,     DIR_LEFT | DIR_UP },
+	{ 0,            XK_space,         i_navigate,           +1 },
+	{ 0,            XK_p,             i_navigate,           -1 },
+	{ 0,            XK_p,             i_scroll_to_edge,     DIR_LEFT | DIR_UP },
+	{ 0,            XK_BackSpace,     i_navigate,           -1 },
+	{ 0,            XK_bracketright,  i_navigate,           +10 },
+	{ 0,            XK_bracketleft,   i_navigate,           -10 },
+	{ ControlMask,  XK_6,             i_alternate,          None },
+	{ ControlMask,  XK_n,             i_navigate_frame,     +1 },
+	{ ControlMask,  XK_p,             i_navigate_frame,     -1 },
+	{ ControlMask,  XK_space,         i_toggle_animation,   None },
+	{ 0,            XK_h,             i_scroll,             DIR_LEFT },
+	{ 0,            XK_Left,          i_scroll,             DIR_LEFT },
+	{ 0,            XK_j,             i_scroll,             DIR_DOWN },
+	{ 0,            XK_Down,          i_scroll,             DIR_DOWN },
+	{ 0,            XK_k,             i_scroll,             DIR_UP },
+	{ 0,            XK_Up,            i_scroll,             DIR_UP },
+	{ 0,            XK_l,             i_scroll,             DIR_RIGHT },
+	{ 0,            XK_Right,         i_scroll,             DIR_RIGHT },
+	{ 0,            XK_H,             i_scroll_to_edge,     DIR_LEFT },
+	{ 0,            XK_J,             i_scroll_to_edge,     DIR_DOWN },
+	{ 0,            XK_K,             i_scroll_to_edge,     DIR_UP },
+	{ 0,            XK_L,             i_scroll_to_edge,     DIR_RIGHT },
+	{ 0,            XK_equal,         i_set_zoom,           100 },
+	{ 0,            XK_w,             i_fit_to_win,         SCALE_DOWN },
+	{ 0,            XK_W,             i_fit_to_win,         SCALE_FIT },
+	{ 0,            XK_e,             i_fit_to_win,         SCALE_WIDTH },
+	{ 0,            XK_E,             i_fit_to_win,         SCALE_HEIGHT },
+	{ 0,            XK_less,          i_rotate,             DEGREE_270 },
+	{ 0,            XK_greater,       i_rotate,             DEGREE_90 },
+	{ 0,            XK_question,      i_rotate,             DEGREE_180 },
+	{ 0,            XK_bar,           i_flip,               FLIP_HORIZONTAL },
+	{ 0,            XK_underscore,    i_flip,               FLIP_VERTICAL },
+	{ 0,            XK_a,             i_toggle_antialias,   None },
+	{ 0,            XK_A,             i_toggle_alpha,       None },
+	{ 0,            XK_s,             i_slideshow,          None },
 };
 
 /* mouse button mappings for image mode: */
 static const button_t buttons[] = {
 	/* modifiers    button            function              argument */
-	{ 0,            1,                i_navigate,           (arg_t) +1 },
-	{ 0,            3,                i_navigate,           (arg_t) -1 },
-	{ 0,            2,                i_drag,               (arg_t) None },
-	{ 0,            4,                i_scroll,             (arg_t) DIR_UP },
-	{ 0,            5,                i_scroll,             (arg_t) DIR_DOWN },
-	{ ShiftMask,    4,                i_scroll,             (arg_t) DIR_LEFT },
-	{ ShiftMask,    5,                i_scroll,             (arg_t) DIR_RIGHT },
-	{ 0,            6,                i_scroll,             (arg_t) DIR_LEFT },
-	{ 0,            7,                i_scroll,             (arg_t) DIR_RIGHT },
-	{ ControlMask,  4,                g_zoom,               (arg_t) +1 },
-	{ ControlMask,  5,                g_zoom,               (arg_t) -1 },
+	{ 0,            1,                i_navigate,           +1 },
+	{ 0,            3,                i_navigate,           -1 },
+	{ 0,            2,                i_drag,               None },
+	{ 0,            4,                i_scroll,             DIR_UP },
+	{ 0,            5,                i_scroll,             DIR_DOWN },
+	{ ShiftMask,    4,                i_scroll,             DIR_LEFT },
+	{ ShiftMask,    5,                i_scroll,             DIR_RIGHT },
+	{ 0,            6,                i_scroll,             DIR_LEFT },
+	{ 0,            7,                i_scroll,             DIR_RIGHT },
+	{ ControlMask,  4,                g_zoom,               +1 },
+	{ ControlMask,  5,                g_zoom,               -1 },
 };
 
 #endif