Permalink
Browse files

* src/number.c (numset_add_num): add debugging output to print the args.

(numset_release): likewise
(numset_request): add debugging output to print the requested number

* src/manage.c (withdraw_window): Print an error when withdrawing
a window who's number is -1.

* src/main.c (clean_up): free the global frame numset.
(free_screen): don't free the screen's numset, since it's a
pointer to the global numset.

* src/group.c (group_del_window): don't release the window number
here. It's already been done in group_unmap_window.

* src/events.c (configure_request): only change the stack mode for
non withdrawn windows.
  • Loading branch information...
1 parent c9b79a4 commit c2ccd7137f1d77215abc34ceb9bdf0a30d3888a1 sabetts committed Jun 3, 2004
Showing with 44 additions and 6 deletions.
  1. +20 −0 ChangeLog
  2. +7 −1 TODO
  3. +1 −1 src/events.c
  4. +0 −1 src/group.c
  5. +3 −2 src/main.c
  6. +3 −0 src/manage.c
  7. +10 −1 src/number.c
View
20 ChangeLog
@@ -1,3 +1,23 @@
+2004-06-03 Shawn Betts <sabetts@vcn.bc.ca>
+
+ * src/number.c (numset_add_num): add debugging output to print the args.
+ (numset_release): likewise
+ (numset_request): add debugging output to print the requested number
+
+
+ * src/manage.c (withdraw_window): Print an error when withdrawing
+ a window who's number is -1.
+
+ * src/main.c (clean_up): free the global frame numset.
+ (free_screen): don't free the screen's numset, since it's a
+ pointer to the global numset.
+
+ * src/group.c (group_del_window): don't release the window number
+ here. It's already been done in group_unmap_window.
+
+ * src/events.c (configure_request): only change the stack mode for
+ non withdrawn windows.
+
2004-05-19 Shawn Betts <sabetts@vcn.bc.ca>
* src/input.c (rp_mask_to_x11_mask): handle the shift modifier
View
8 TODO
@@ -26,4 +26,10 @@ stuff ???
Fix it.
* window name substring matching.
-Do it.
+Do it.
+
+* allow letters and numbers to be used for frames (in fselect)
+
+* dump all all def* settings
+
+* get a set ... command going and create aliases for the def* stuff
View
2 src/events.c
@@ -232,7 +232,7 @@ configure_request (XConfigureRequestEvent *e)
{
if (e->value_mask & CWStackMode)
{
- if (e->detail == Above)
+ if (e->detail == Above && win->state != WithdrawnState)
{
/* Depending on the rudeness level, actually map the
window. */
View
1 src/group.c
@@ -289,7 +289,6 @@ group_del_window (rp_group *g, rp_window *win)
{
if (cur->win == win)
{
- numset_release (g->numset, cur->number);
list_del (&cur->node);
free (cur);
}
View
5 src/main.c
@@ -681,8 +681,6 @@ free_screen (rp_screen *s)
XFreeGC (dpy, s->normal_gc);
free (s->display_string);
-
- numset_free (s->frames_numset);
}
void
@@ -707,6 +705,9 @@ clean_up ()
}
free (screens);
+ /* Free the global frame numset shared by all screens. */
+ free (rp_frame_numset);
+
free_xinerama();
XFreeFont (dpy, defaults.font);
View
3 src/manage.c
@@ -877,6 +877,9 @@ withdraw_window (rp_window *win)
/* Give back the window number. the window will get another one,
if it is remapped. */
+ if (win->number == -1)
+ PRINT_ERROR(("Attempting to withdraw '%s' with number -1!\n", window_name(win)));
+
numset_release (rp_window_numset, win->number);
win->number = -1;
View
11 src/number.c
@@ -71,6 +71,8 @@ numset_find_empty_cell (struct numset *ns)
int
numset_add_num (struct numset *ns, int n)
{
+ PRINT_DEBUG(("ns=%p add_num %d\n", ns, n));
+
if (numset_num_is_taken (ns, n))
return 0; /* failed. */
@@ -84,12 +86,14 @@ int
numset_request (struct numset *ns)
{
int i;
-
+
/* look for a unique number, and add it to the list of taken
numbers. */
i = 0;
while (!numset_add_num (ns, i)) i++;
+ PRINT_DEBUG(("ns=%p request got %d\n", ns, i));
+
return i;
}
@@ -100,6 +104,11 @@ numset_release (struct numset *ns, int n)
{
int i;
+ PRINT_DEBUG(("ns=%p release %d\n", ns, n));
+
+ if (n < 0)
+ PRINT_ERROR(("ns=%p Attempt to release %d!", ns, n));
+
for (i=0; i<ns->num_taken; i++)
{
if (ns->numbers_taken[i] == n)

0 comments on commit c2ccd71

Please sign in to comment.