summaryrefslogtreecommitdiff
path: root/src/main.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/main.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/main.c')
-rw-r--r--src/main.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c
index 129f1a9..29ce345 100644
--- a/src/main.c
+++ b/src/main.c
@@ -113,7 +113,7 @@ xrealloc (void *ptr, size_t size)
register void *value = realloc (ptr, size);
if (value == 0)
fatal ("Virtual memory exhausted");
- PRINT_DEBUG("realloc: %d\n", size);
+ PRINT_DEBUG (("realloc: %d\n", size));
return value;
}
@@ -216,7 +216,7 @@ chld_handler (int signum)
if (pid <= 0)
break;
- PRINT_DEBUG("Child status: %d\n", WEXITSTATUS (status));
+ PRINT_DEBUG(("Child status: %d\n", WEXITSTATUS (status)));
/* Tell ratpoison about the CHLD signal. We are only interested
in reporting commands that failed to execute. These processes
@@ -270,7 +270,7 @@ set_sig_handler (int sig, void (*action)(int))
/* check setting for sig */
if (sigaction (sig, NULL, &act))
{
- PRINT_ERROR ("Error %d fetching SIGALRM handler\n", errno );
+ PRINT_ERROR (("Error %d fetching SIGALRM handler\n", errno ));
}
else
{
@@ -283,7 +283,7 @@ set_sig_handler (int sig, void (*action)(int))
act.sa_flags = 0;
if (sigaction (sig, &act, NULL))
{
- PRINT_ERROR ("Error %d setting SIGALRM handler\n", errno );
+ PRINT_ERROR (("Error %d setting SIGALRM handler\n", errno ));
}
}
}
@@ -344,7 +344,7 @@ read_rc_file (FILE *file)
if (*(line + strlen(line) - 1) == '\n')
*(line + strlen(line) - 1) = '\0';
- PRINT_DEBUG ("rcfile line: %s\n", line);
+ PRINT_DEBUG (("rcfile line: %s\n", line));
/* do it */
if (*line != '#')
@@ -378,7 +378,7 @@ read_startup_files ()
homedir = getenv ("HOME");
if (!homedir)
{
- PRINT_ERROR ("ratpoison: $HOME not set!?\n");
+ PRINT_ERROR (("ratpoison: $HOME not set!?\n"));
}
else
{
@@ -388,12 +388,12 @@ read_startup_files ()
if ((fileptr = fopen (filename, "r")) == NULL)
{
/* we probably don't need to report this, its not an error */
- PRINT_DEBUG ("ratpoison: could not open %s\n", filename);
+ PRINT_DEBUG (("ratpoison: could not open %s\n", filename));
if ((fileptr = fopen ("/etc/ratpoisonrc", "r")) == NULL)
{
/* neither is this */
- PRINT_DEBUG ("ratpoison: could not open /etc/ratpoisonrc\n");
+ PRINT_DEBUG (("ratpoison: could not open /etc/ratpoisonrc\n"));
}
}
@@ -577,7 +577,7 @@ main (int argc, char *argv[])
/* Initialize the screens */
num_screens = ScreenCount (dpy);
screens = (screen_info *)xmalloc (sizeof (screen_info) * num_screens);
- PRINT_DEBUG ("%d screens.\n", num_screens);
+ PRINT_DEBUG (("%d screens.\n", num_screens));
for (i=0; i<num_screens; i++)
{