* 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, 175 insertions, 71 deletions

diff --git a/src/manage.c b/src/manage.c
index 47e5574..60f7971 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -84,8 +84,8 @@ update_normal_hints (rp_window *win)
 }
 		     
 
-char *
-get_window_name (Window w)
+static char *
+get_wmname (Window w)
 {
   char *name;
   XTextProperty text;
@@ -107,19 +107,85 @@ get_window_name (Window w)
   if (list_len > 0)
     {
       name = xmalloc (strlen (name_list[0]) + 1);
-
       strcpy (name, name_list[0]);
-
-      /* Its our responsibility to free this. */ 
-      XFreeStringList (name_list);
-
-      return name;
+    }
+  else
+    {
+      name = NULL;
     }
 
   /* Its our responsibility to free this. */ 
   XFreeStringList (name_list);
 
-  return NULL;
+  return name;
+}
+
+static XClassHint *
+get_class_hints (Window w)
+{
+  XClassHint *class;
+
+  class = XAllocClassHint();
+
+  if (class == NULL)
+    {
+      PRINT_ERROR ("Not enough memory for WM_CLASS structure.\n");
+      exit (EXIT_FAILURE);
+    }
+
+  XGetClassHint (dpy, w, class);
+
+  return class;
+}
+
+static char *
+get_res_name (Window w)
+{
+  XClassHint *class;
+  char *name;
+
+  class = get_class_hints (w);
+
+  if (class->res_name)
+    {
+      name = (char *)xmalloc (strlen (class->res_name) + 1);
+      strcpy (name, class->res_name);
+    }
+  else
+    {
+      name = NULL;
+    }
+
+  XFree (class->res_name);
+  XFree (class->res_class);
+  XFree (class);
+
+  return name;
+}
+
+static char *
+get_res_class (Window w)
+{
+  XClassHint *class;
+  char *name;
+
+  class = get_class_hints (w);
+
+  if (class->res_class)
+    {
+      name = (char *)xmalloc (strlen (class->res_class) + 1);
+      strcpy (name, class->res_class);
+    }
+  else
+    {
+      name = NULL;
+    }
+
+  XFree (class->res_name);
+  XFree (class->res_class);
+  XFree (class);
+
+  return name;
 }
 
 /* Reget the WM_NAME property for the window and update its name. */
@@ -127,24 +193,30 @@ int
 update_window_name (rp_window *win)
 {
   char *newstr;
-  char *loc;
 
   /* Don't overwrite the window name if the user specified one. */
-  if (win->named) return 0;
+/*   if (win->named) return 0; */
+
+  newstr = get_wmname (win->w);
+  if (newstr != NULL)
+    {
+      free (win->wm_name);
+      win->wm_name = newstr;
+    }
 
-  newstr = get_window_name (win->w);
+  newstr = get_res_class (win->w);
   if (newstr != NULL)
     {
-      free (win->name);
-      win->name = newstr;
+      free (win->res_class);
+      win->res_class = newstr;
     }
 
-  /* A bit of a hack. If there's a : in the string, crop the
-     string off there. This is mostly brought on by netscape's
-     disgusting tendency to put its current URL in the WMName!!
-     arg! */
-  loc = strchr (win->name, ':');
-  if (loc) loc[0] = '\0';
+  newstr = get_res_name (win->w);
+  if (newstr != NULL)
+    {
+      free (win->res_name);
+      win->res_name = newstr;
+    }
 
   return 1;
 }
@@ -190,6 +262,8 @@ update_window_information (rp_window *win)
 
   /* Transient status */
   win->transient = XGetTransientForHint (dpy, win->w, &win->transient_for);  
+
+  update_window_position (win);
 }
 
 void
@@ -261,7 +335,7 @@ unmanaged_window (Window w)
 
   for (i = 0; unmanaged_window_list[i]; i++) 
     {
-      wname = get_window_name (w);
+      wname = get_wmname (w);
       if (!wname)
 	return 0;
       if (!strcmp (unmanaged_window_list[i], wname))
@@ -289,6 +363,53 @@ set_state (rp_window *win, int state)
 		   PropModeReplace, (unsigned char *)data, 2);
 }
 
+static void
+move_window (rp_window *win)
+{
+  if (win->frame == NULL) 
+    return;
+
+  /* X coord. */
+  switch (win->position)
+    {
+    case TOP_LEFT:
+    case CENTER_LEFT:
+    case BOTTOM_LEFT:
+      win->x = win->frame->x;
+      break;
+    case TOP_CENTER:
+    case BOTTOM_CENTER:
+    case CENTER_CENTER:
+      win->x = win->frame->x + (win->frame->width - win->border * 2) / 2 - win->width / 2;
+      break;
+    case TOP_RIGHT:
+    case CENTER_RIGHT:
+    case BOTTOM_RIGHT:
+      win->x = win->frame->x + win->frame->width - win->width - win->border;
+      break;
+    }
+
+  /* Y coord. */
+  switch (win->position)
+    {
+    case TOP_LEFT:
+    case TOP_CENTER:
+    case TOP_RIGHT:
+      win->y = win->frame->y;
+      break;
+    case CENTER_LEFT:
+    case CENTER_CENTER:
+    case CENTER_RIGHT:
+      win->y = win->frame->y + (win->frame->height - win->border * 2) / 2 - win->height / 2;
+      break;
+    case BOTTOM_LEFT:
+    case BOTTOM_CENTER:
+    case BOTTOM_RIGHT:
+      win->y = win->frame->y + win->frame->height - win->height - win->border;
+      break;
+    }
+}
+
 /* Set a transient window's x,y,width,height fields to maximize the
    window. */
 static void
@@ -297,8 +418,12 @@ maximize_transient (rp_window *win)
   rp_window_frame *frame;
   int maxx, maxy;
 
+  /* We can't maximize a window if it has no frame. */
+  if (win->frame == NULL)
+    return;
+
   /* Set the window's border */
-  win->border = WINDOW_BORDER_WIDTH;
+  win->border = defaults.window_border_width;
 
   frame = win->frame;
 
@@ -336,22 +461,6 @@ maximize_transient (rp_window *win)
 
   PRINT_DEBUG ("maxsize: %d %d\n", maxx, maxy);
 
-  /* Fit the window inside its frame (if it has one) */
-  if (frame)
-    {
-      win->x = frame->x - win->width / 2 
-	+ (frame->width - win->border * 2) / 2;
-      win->y = frame->y - win->height / 2
-	+ (frame->height - win->border * 2) / 2;
-    }
-  else
-    {
-      win->x = PADDING_LEFT - win->width / 2 
-	+ (win->scr->root_attr.width - PADDING_LEFT - PADDING_RIGHT - win->border * 2) / 2;
-      win->y = PADDING_TOP - win->height / 2 
-	+ (win->scr->root_attr.height - PADDING_TOP - PADDING_BOTTOM - win->border * 2) / 2;
-    }
-
   win->width = maxx;
   win->height = maxy;
 }
@@ -363,11 +472,13 @@ maximize_normal (rp_window *win)
 {
   rp_window_frame *frame;
   int maxx, maxy;
-  int off_x = 0;
-  int off_y = 0;
+
+  /* We can't maximize a window if it has no frame. */
+  if (win->frame == NULL)
+    return;
 
   /* Set the window's border */
-  win->border = WINDOW_BORDER_WIDTH;
+  win->border = defaults.window_border_width;
 
   frame = win->frame;
 
@@ -379,10 +490,8 @@ maximize_normal (rp_window *win)
     }
   else
     {
-      maxx = win->scr->root_attr.width 
-	- PADDING_LEFT - PADDING_RIGHT - win->border * 2;
-      maxy = win->scr->root_attr.height 
-	- PADDING_TOP - PADDING_BOTTOM - win->border * 2;
+      maxx = frame->width - win->border * 2;
+      maxy = frame->height - win->border * 2;
     }
 
   /* Fit the window inside its frame (if it has one) */
@@ -416,26 +525,6 @@ maximize_normal (rp_window *win)
     }
 
   PRINT_DEBUG ("maxsize: %d %d\n", maxx, maxy);
- 
-#ifdef MAXSIZE_WINDOWS_ARE_TRANSIENTS
-  if (win->hints->flags & PMaxSize && frame)
-    {
-      off_x = (frame->width - win->border * 2) / 2 - maxx / 2;
-      off_y = (frame->height - win->border * 2) / 2 - maxy / 2;
-    }
-#endif
-
-  /* Fit the window inside its frame (if it has one) */
-  if (frame)
-    {
-      win->x = frame->x + off_x;
-      win->y = frame->y + off_y;
-    }
-  else
-    {
-      win->x = PADDING_LEFT + off_x;
-      win->y = PADDING_TOP + off_y;
-    }
 
   win->width = maxx;
   win->height = maxy;
@@ -459,6 +548,9 @@ maximize (rp_window *win)
       maximize_normal (win);
     }
 
+  /* Reposition the window. */
+  move_window (win);
+
   /* Actually do the maximizing */
   XMoveResizeWindow (dpy, win->w, win->x, win->y, win->width, win->height);
   XSetWindowBorderWidth (dpy, win->w, win->border);
@@ -475,8 +567,20 @@ force_maximize (rp_window *win)
 
   maximize_normal(win);
 
-  /* Actually do the maximizing */
-  XMoveResizeWindow (dpy, win->w, win->x, win->y, win->width+1, win->height+1);
+  /* Reposition the window. */
+  move_window (win);
+
+  if (win->hints->flags & PResizeInc)
+    {
+      XMoveResizeWindow (dpy, win->w, win->x, win->y,
+			 win->width + win->hints->width_inc, 
+			 win->height + win->hints->height_inc);
+    }
+  else
+    {
+      XResizeWindow (dpy, win->w, win->width + 1, win->height + 1);
+    }
+
   XMoveResizeWindow (dpy, win->w, win->x, win->y, win->width, win->height);
   XSetWindowBorderWidth (dpy, win->w, win->border);
   XSync (dpy, False);
@@ -486,7 +590,7 @@ force_maximize (rp_window *win)
 void
 map_window (rp_window *win)
 {
-  PRINT_DEBUG ("Mapping the unmapped window %s\n", win->name);
+  PRINT_DEBUG ("Mapping the unmapped window %s\n", window_name (win));
 
   /* Fill in the necessary data about the window */
   update_window_information (win);
@@ -512,10 +616,10 @@ map_window (rp_window *win)
     {
       if (win->transient)
 	marked_message_printf (0, 0, MESSAGE_MAP_TRANSIENT, 
-			       win->number, win->name);
+			       win->number, window_name (win));
       else
 	marked_message_printf (0, 0, MESSAGE_MAP_WINDOW,
-			       win->number, win->name);
+			       win->number, window_name (win));
     }
 }
 
@@ -570,7 +674,7 @@ withdraw_window (rp_window *win)
 {
   if (win == NULL) return;
 
-  PRINT_DEBUG ("withdraw_window on '%s'\n", win->name);
+  PRINT_DEBUG ("withdraw_window on '%s'\n", window_name (win));
 
   /* Give back the window number. the window will get another one,
      if it is remapped. */