Changeset b752f1e

Timestamp:

Dec 19, 2009, 10:19:04 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1247aaa

Parents:

99c1f46

git-author:

Nelson Elhage <nelhage@mit.edu> (12/16/09 17:50:34)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/19/09 22:19:04)

Message:

Allow ^Z to be rebound.

Rather than catching SIGTSTP and doing things with it, disable VSUSP,
which causes ^Z to get passed through to us as a normal keystroke. In
addition, change the binding so that it prints the warning SIGTSTP
used to.

Files:

• global.c (modified) (2 diffs)
• keys.c (modified) (1 diff)
• owl.c (modified) (3 diffs)
• owl.h (modified) (1 diff)
• select.c (modified) (4 diffs)

global.c

@@ -117 +117 @@
   g->timerlist = NULL;
   g->interrupted = FALSE;
-  g->got_sigtstp = FALSE;
 }
 
@@ -963 +962 @@
   g->interrupted = 0;
 }
-
-int owl_global_is_sigstp(const owl_global *g) {
-  return g->got_sigtstp;
-}
-
-void owl_global_set_got_sigstp(owl_global *g) {
-  g->got_sigtstp = 1;
-}
-
-void owl_global_unset_got_sigstp(owl_global *g) {
-  g->got_sigtstp = 0;
-}

keys.c

@@ -21 +21 @@
        "System-wide default key bindings", 
        owl_keys_default_invalid, NULL, NULL);
-  BIND_CMD("C-z",      "suspend",            "Suspend owl");
+  BIND_CMD("C-z",      "message Use :suspend to suspend.", "");
 
   /****************************************************************/

owl.c

@@ -135 +135 @@
   tcgetattr(0, owl_global_get_startup_tio(&g));
 
-  /* turn ISTRIP off */
   tcgetattr(0, &tio);
   tio.c_iflag &= ~(ISTRIP|IEXTEN);
   tio.c_cc[VQUIT] = 0;
+  tio.c_cc[VSUSP] = 0;
   tcsetattr(0, TCSAFLUSH, &tio);
 
@@ -396 +396 @@
 }
 
-void sigtstp_handler(int sig, siginfo_t *si, void *data)
-{
-  owl_global_set_got_sigstp(&g);
-}
-
 void owl_register_signal_handlers(void) {
   struct sigaction sigact;
@@ -417 +412 @@
   sigact.sa_sigaction=sigint_handler;
   sigaction(SIGINT, &sigact, NULL);
-
-  sigact.sa_sigaction=sigtstp_handler;
-  sigaction(SIGTSTP, &sigact, NULL);
 }
 

owl.h

@@ -610 +610 @@
   int load_initial_subs;
   int interrupted;
-  int got_sigtstp;
 } owl_global;
 

select.c

@@ -303 +303 @@
   sigemptyset(&set);
   sigaddset(&set, SIGINT);
-  sigaddset(&set, SIGTSTP);
   sigprocmask(SIG_BLOCK, &set, oldmask);
 }
@@ -317 +316 @@
   in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
   owl_process_input_char(in);
-}
-
-void owl_select_check_tstp(void) {
-  if(owl_global_is_sigstp(&g)) {
-    owl_function_makemsg("Use :suspend to suspend.");
-    owl_global_unset_got_sigstp(&g);
-  }
 }
 
@@ -398 +390 @@
   owl_select_mask_signals(&mask);
 
-  owl_select_check_tstp();
   if(owl_global_is_interrupted(&g)) {
     owl_select_handle_intr(&mask);
@@ -447 +438 @@
 
   if(ret < 0 && errno == EINTR) {
-    owl_select_check_tstp();
     if(owl_global_is_interrupted(&g)) {
       owl_select_handle_intr(NULL);