screen/sort_command.patch
Thomas Renninger becfc8a51c - Fix sort command to not stop at window gaps.
That can happen if windows got deleted and the window numbers do not
  increment sequentially anymore.

OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=39
2012-10-25 13:14:47 +00:00

89 lines
2.3 KiB
Diff

---
comm.c | 1 +
doc/screen.1 | 5 +++++
process.c | 43 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+)
Index: comm.c
===================================================================
--- comm.c.orig
+++ comm.c
@@ -297,6 +297,7 @@ struct comm comms[RC_LAST + 1] =
{ "sleep", ARGS_1 },
{ "slowpaste", NEED_FORE|ARGS_01 },
{ "sorendition", ARGS_012 },
+ { "sort", ARGS_0 },
{ "source", ARGS_1 },
{ "split", NEED_DISPLAY|ARGS_01 },
{ "startup_message", ARGS_1 },
Index: doc/screen.1
===================================================================
--- doc/screen.1.orig
+++ doc/screen.1
@@ -3015,6 +3015,11 @@ underlying system exposes flow control p
text.
.sp
.ne 3
+.B sort
+.PP
+Sort the windows in alphabetical order of the window tiles.
+.sp
+.ne 3
.BI "source " file
.PP
Read and execute commands from file \fIfile\fP. Source commands may
Index: process.c
===================================================================
--- process.c.orig
+++ process.c
@@ -3024,6 +3024,49 @@ int key;
}
}
break;
+ case RC_SORT:
+ if (fore)
+ {
+ /* Better do not allow this. Not sure what the utmp stuff in number
+ command above is for (you get four entries in e.g. /var/log/wtmp
+ per number switch). But I don't know enough about this.*/
+ Msg(0, "Sorting inside a window is not allowed. Push CTRL-a \" "
+ "and try again\n");
+ break;
+ }
+ /*
+ * Simple sort algorithm: Look out for the smallest, put it
+ * to the first place, look out for the 2nd smallest, ...
+ */
+ for (i = 0; i < maxwin ; i++)
+ {
+ if (wtab[i] == NULL)
+ continue;
+ n = i;
+ for (nr = i + 1; nr < maxwin; nr++)
+ {
+ if (wtab[nr] == NULL)
+ continue;
+ debug2("Testing window %d and %d.\n", nr, n);
+ if (strcmp(wtab[nr]->w_title,wtab[n]->w_title) < 0)
+ n = nr;
+ }
+ if (n != i)
+ {
+ debug2("Exchange window %d and %d.\n", i, n);
+ p = wtab[n];
+ wtab[n] = wtab[i];
+ wtab[i] = p;
+ wtab[n]->w_number = n;
+ wtab[i]->w_number = i;
+#ifdef MULTIUSER
+ /* exchange the acls for these windows. */
+ AclWinSwap(i, n);
+#endif
+ }
+ }
+ WindowChanged((struct win *)0, 0);
+ break;
case RC_SILENCE:
n = fore->w_silence != 0;
i = fore->w_silencewait;