* src/list.h (update_window_position): new prototype

(window_name): new prototype
(get_window_list): update prototype

* src/events.c (grab_rat): Don't wrap in an #ifdef
(ungrab_rat): likewise
(handle_key): record if the rat is grabbed and only ungrab it at
the end if it was first grabbed.

* src/actions.h (cmd_pos): new prototype
(cmd_defwinpos): new prototype
(cmd_deftranspos): new prototype
(cmd_defmaxsizepos): new prototype
(cmd_defbartimeout): new prototype
(cmd_defbarloc): new prototype
(cmd_deffont): new prototype
(cmd_defpadding): new prototype
(cmd_defborder): new prototype
(cmd_definputwidth): new prototype
(cmd_defwaitcursor): new prototype
(cmd_defwinfmt): new prototype
(cmd_defwinname): new prototype

* src/messages.h (MESSAGE_FRAME_STRING): new message

* src/manage.c (get_wmname): renamed from get_window_name
(get_class_hints): new function
(get_res_name): likewise
(get_res_class): likewise
(update_window_name): update the window's wm_name, res_name, and
res_class fields.
(update_window_name): calls functions get_wmname, get_res_name,
get_res_class.
(update_window_name): Don't crop the window name.
(update_window_information): call update_window_position.
(move_window): new function
(maximize_transient): only set the window's width and height
fields.
(maximize_normal): likewise
(maximize): call move_window
(force_maximize): likewise
(force_maximize): if the window has resize hints, resize it 1
resize unit.

* src/main.c: new global variable, defaults.  remove static
variable, font, and move to defaults. Dependant code updated.
(init_defaults): new function
(main): call init_defaults.
(init_screen): initialize the screen's fg_color to black and
bg_color to white.

* src/list.c (free_window): free the fields user_name, res_name,
res_class, and wm_name.
(update_window_position): new function
(window_name): new function. Code accessing a window's name uses
this function. All code updated.
(add_to_window_list): call update_window_position
(add_to_window_list): initialize wm_name, res_name, and res_class
for the new window.
(format_window_name): new function
(get_window_list): Add parameter fmt. All callers updated.
(get_window_list): call format_window_name.

* src/conf.h: move Configuration variables to the global variable,
defaults. Dependant code updated.

* src/data.h (TOP_LEFT): new define
(TOP_CENTER): likewise
(TOP_RIGHT): likewise
(CENTER_LEFT): likewise
(CENTER_CENTER): likewise
(CENTER_RIGHT): likewise
(BOTTOM_LEFT): likewise
(BOTTOM_CENTER): likewise
(BOTTOM_RIGHT): likewise
(struct rp_window): new fields user_name, wm_name, res_name,
res_class, position.
(struct rp_window): remove field name. Replaced with
user_name. Dependant code updated.
(struct screen_info): remove field font. dependant code updated.
(struct screen_info): new fields fg_color, bg_color.
(struct rp_defaults): new struct
(defaults): new global

* src/actions.c (parse_winpos): new function
(cmd_pos): likewise
(cmd_defwinpos): likewise
(cmd_deftranspos): likewise
(cmd_defmaxsizepos): likewise
(cmd_defbartimeout): likewise
(cmd_defbarloc): likewise
(cmd_deffont): likewise
(cmd_defpadding): likewise
(cmd_defborder): likewise
(cmd_definputwidth): likewise
(cmd_defwaitcursor): likewise
(cmd_defwinfmt): likewise
(cmd_defwinname): likewise
(user_commands): New commands defbarloc, defbartimeout, defborder,
deffont, defintputwidth, defmaxsizepos, defpadding, deftranspos,
defwaitcursor, defwinfmt, defwinname, defwinpos.

1 files changed, 0 insertions, 51 deletions

diff --git a/src/conf.h b/src/conf.h
index 32d4041..d3e6043 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -32,56 +32,10 @@
 #define INPUT_ABORT_KEY      XK_g
 #define INPUT_ABORT_MODIFIER ControlMask
 
-/* After hitting the prefix key ratpoison will change the mouse cursor
-   to a square to indicate that it is waiting for a second
-   keystroke. If do not wish this functionality, comment out the
-   following line. */
-#define USE_WAITFORKEY_CURSOR
-
-/* Quit ratpoison when there are no more managed windows. */
-/* #define AUTO_CLOSE */
-
-/* Treat windows with maxsize hints as if they were a transient window
-   (don't hide the windows underneath, and center them) */
-#define MAXSIZE_WINDOWS_ARE_TRANSIENTS
-
-/* The minimum size of the input window */
-#define INPUT_WINDOW_SIZE 200
-
-/* If you want the input window to take up the length of the screen,
-   use this: */
-/* #define INPUT_WINDOW_SIZE (s->root_attr.width - prompt_width) */
-
-
-/* The border width ratpoison configures all windows with */
-#define WINDOW_BORDER_WIDTH 1
-
 /* Pressing a key sends the mouse to the bottom right corner. This
    doesn't work very well yet. */
 /* #define HIDE_MOUSE  */
 
-#define FOREGROUND	"black"
-#define BACKGROUND	"white"
-#define FONT		"9x15bold"
-
-#define BAR_Y_PADDING   0       /* The amount of padding on the top
-				   and bottom of the message bar  */
-#define BAR_X_PADDING   0       /* The amount of padding on the left
-				   and right of the message bar  */
-#define BAR_LOCATION    3	/* 0=bottom-left 1=top-left 2=bottom-right 3=top-right */
-#define BAR_TIMEOUT     5	/* Number of seconds before the progam bar autohides 0=don't autohide */
-
-/* Number of seconds before the frame indicator disappears */
-#define FRAME_INDICATOR_TIMEOUT 1
-
-/* What to display in the frame indicator */
-#define FRAME_STRING    "Current Frame"
-
-#define PADDING_LEFT 	0	/* space not to be taken up around managed windows */
-#define PADDING_TOP 	0
-#define PADDING_RIGHT 	0
-#define PADDING_BOTTOM 	0
-
 /* If for some sick reason you don't want ratpoison to manage a
    window, put its name in this list. These windows get drawn but
    ratpoison won't have any knowledge of them and you won't be able to
@@ -89,9 +43,4 @@
    mostly for use with hand-helds. */
 #define UNMANAGED_WINDOW_LIST "xapm","xclock","xscribble"
 
-#define RAT_WIDTH 	16
-#define RAT_HEIGHT 	16
-#define RAT_HOT_X 	8
-#define RAT_HOT_Y 	8
-
 #endif /* !_ _RATPOISON_CONF_H */