summaryrefslogtreecommitdiff
path: root/src/input.c
diff options
context:
space:
mode:
authorsabetts <sabetts>2003-02-23 01:40:42 +0000
committersabetts <sabetts>2003-02-23 01:40:42 +0000
commit49ca20c9fc7807d612ef9925c110e8da6c3c1a8f (patch)
treef532251c2f3835e9ecd81f46e17900e95603be52 /src/input.c
parent5e4c6e4a9729e1ec546535cfc6ee264768c6b987 (diff)
downloadratpoison-49ca20c9fc7807d612ef9925c110e8da6c3c1a8f.zip
* configure.in: don't check for variable argument support in
preprocessor. * src/ratpoison.h (PRINT_LINE): new macro. (PRE_PRINT_LOCATION): remove macro (PRINT_ERROR): takes one argument which is the argument list ,parens and all, to be passed to printf. Callers updated. * src/actions.c (cmd_number): use list delete entry macro (cmd_number): likewise (cmd_escape): use list looping macro (cmd_escape): likewise (cmd_defpadding): likewise (cmd_defborder): likewise * src/events.c (mapping_notify): use list looping macro (mapping_notify): likewise * src/list.c: rename rp_unmapped_window_sentinel to rp_unmapped_window and rp_mapped_window_sentinel to rp_mapped_window. Use LIST_HEAD to create them. externs updated. (add_to_window_list): use list add entry macro. (find_window_in_list): list head is of type list_head. Prototype and callers updated. (find_window_in_list): use list looping macro (init_window_list): remove function (find_window_number): use list looping macro (find_window_name): likewise (find_window_prev): use list previous entry macro (find_window_next): use list next entry macro (find_window_other): use list looping macro (append_to_list): remove function (insert_into_list): use list looping macro (insert_into_list): use list add entry macro (remove_from_list): remove function (get_window_list): use list looping macro * src/main.c (main): do not call init_window_list() * src/manage.c (unmanage): use list delete macro (map_window): likewise (withdraw_window): use list moving macro to move entry to another list. (hide_others): use list looping macro * src/split.c (num_frames): use list looping macro (frames_screen): likewise (maximize_all_windows_in_frame): likewise (delete_frame_from_list): remove function (create_initial_frame): remove list init code. Add current frame to screen's frame list. (init_frame_list): use list init macro (find_last_frame): use list looping macro (find_windows_frame): likewise (find_frame_next): use list next entry macro (find_frame_prev): use list previous entry macro (find_window_for_frame): use list looping macro (split_frame): use list add entry macro (remove_all_splits): use list looping macro (resize_frame_vertically): likewise (resize_frame_horizontally): likewise (total_frame_area): likewise (frame_overlaps): likewise (remove_frame): likewise (find_frame_up): likewise (find_frame_down): likewise (find_frame_left): likewise (find_frame_right): likewise
Diffstat (limited to 'src/input.c')
-rw-r--r--src/input.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/input.c b/src/input.c
index b0ae865..1f46508 100644
--- a/src/input.c
+++ b/src/input.c
@@ -40,7 +40,7 @@ x11_mask_to_rp_mask (unsigned int mask)
{
unsigned int result = 0;
- PRINT_DEBUG ("x11 mask = %x\n", mask);
+ PRINT_DEBUG (("x11 mask = %x\n", mask));
result |= mask & ControlMask ? RP_CONTROL_MASK:0;
result |= mask & rp_modifier_info.meta_mod_mask ? RP_META_MASK:0;
@@ -48,7 +48,7 @@ x11_mask_to_rp_mask (unsigned int mask)
result |= mask & rp_modifier_info.hyper_mod_mask ? RP_HYPER_MASK:0;
result |= mask & rp_modifier_info.super_mod_mask ? RP_SUPER_MASK:0;
- PRINT_DEBUG ("rp mask = %x\n", mask);
+ PRINT_DEBUG (("rp mask = %x\n", mask));
return result;
}
@@ -61,7 +61,7 @@ rp_mask_to_x11_mask (unsigned int mask)
{
unsigned int result = 0;
- PRINT_DEBUG ("rp mask = %x\n", mask);
+ PRINT_DEBUG (("rp mask = %x\n", mask));
result |= mask & RP_CONTROL_MASK ? ControlMask:0;
result |= mask & RP_META_MASK ? rp_modifier_info.meta_mod_mask:0;
@@ -69,7 +69,7 @@ rp_mask_to_x11_mask (unsigned int mask)
result |= mask & RP_HYPER_MASK ? rp_modifier_info.hyper_mod_mask:0;
result |= mask & RP_SUPER_MASK ? rp_modifier_info.super_mod_mask:0;
- PRINT_DEBUG ("x11 mask = %x\n", mask);
+ PRINT_DEBUG (("x11 mask = %x\n", mask));
return result;
}
@@ -105,41 +105,41 @@ update_modifier_map ()
case XK_Meta_L:
case XK_Meta_R:
rp_modifier_info.meta_mod_mask |= modmasks[row - 3];
- PRINT_DEBUG ("Found Meta on %d\n",
- rp_modifier_info.meta_mod_mask);
+ PRINT_DEBUG (("Found Meta on %d\n",
+ rp_modifier_info.meta_mod_mask));
break;
case XK_Alt_L:
case XK_Alt_R:
rp_modifier_info.alt_mod_mask |= modmasks[row - 3];
- PRINT_DEBUG ("Found Alt on %d\n",
- rp_modifier_info.alt_mod_mask);
+ PRINT_DEBUG (("Found Alt on %d\n",
+ rp_modifier_info.alt_mod_mask));
break;
case XK_Super_L:
case XK_Super_R:
rp_modifier_info.super_mod_mask |= modmasks[row - 3];
- PRINT_DEBUG ("Found Super on %d\n",
- rp_modifier_info.super_mod_mask);
+ PRINT_DEBUG (("Found Super on %d\n",
+ rp_modifier_info.super_mod_mask));
break;
case XK_Hyper_L:
case XK_Hyper_R:
rp_modifier_info.hyper_mod_mask |= modmasks[row - 3];
- PRINT_DEBUG ("Found Hyper on %d\n",
- rp_modifier_info.hyper_mod_mask);
+ PRINT_DEBUG (("Found Hyper on %d\n",
+ rp_modifier_info.hyper_mod_mask));
break;
case XK_Num_Lock:
rp_modifier_info.num_lock_mask |= modmasks[row - 3];
- PRINT_DEBUG ("Found NumLock on %d\n",
- rp_modifier_info.num_lock_mask);
+ PRINT_DEBUG (("Found NumLock on %d\n",
+ rp_modifier_info.num_lock_mask));
break;
case XK_Scroll_Lock:
rp_modifier_info.scroll_lock_mask |= modmasks[row - 3];
- PRINT_DEBUG ("Found ScrollLock on %d\n",
- rp_modifier_info.scroll_lock_mask);
+ PRINT_DEBUG (("Found ScrollLock on %d\n",
+ rp_modifier_info.scroll_lock_mask));
break;
default:
break;
@@ -360,7 +360,7 @@ get_more_input (char *prompt, char *preinput)
nbytes = read_key (&ch, &modifier, keysym_buf, keysym_bufsize);
while (ch != XK_Return)
{
- PRINT_DEBUG ("key %ld\n", ch);
+ PRINT_DEBUG (("key %ld\n", ch));
if (ch == XK_BackSpace)
{
if (cur_len > 0) cur_len--;