Changeset 4082 for libcaca/trunk/caca/driver/slang.cTweet

Timestamp:

Dec 3, 2009, 2:13:15 AM (13 years ago)

Author:

Sam Hocevar

Message:

Pass Ctrl-C as a keypress to the calling application in the SLang driver.
Original patch courtesy of Romain Bignon.

File:

• libcaca/trunk/caca/driver/slang.c (modified) (8 diffs)

libcaca/trunk/caca/driver/slang.c

@@ -116 +116 @@
 {
     char *term;
+    unsigned int sigint_event;
 };
 
 static void default_sigint (int sig)
 {
-    /* Do nothing */
-    return;
+    /* Warn the caller that we got SIGINT. */
+    sigwinch_d->drv.p->sigint_event++;
 }
 
@@ -127 +128 @@
 {
     dp->drv.p = malloc(sizeof(struct driver_private));
+    dp->drv.p->sigint_event = 0;
 
 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV)
@@ -188 +190 @@
     dp->resize.allow = 0;
 
+    SLsig_unblock_signals();
+
     return 0;
 }
@@ -197 +201 @@
     SLtt_set_cursor_visibility(1);
     SLang_reset_tty();
+    SLsig_block_signals();
     SLsmg_reset_smg();
     SLsig_unblock_signals();
@@ -232 +237 @@
     int x, y, i;
 
+    SLsig_block_signals();
     for(i = 0; i < caca_get_dirty_rect_count(dp->cv); i++)
     {
@@ -298 +304 @@
     SLsmg_gotorc(caca_wherey(dp->cv), caca_wherex(dp->cv));
     SLsmg_refresh();
+    SLsig_unblock_signals();
 }
 
@@ -306 +313 @@
     dp->resize.h = SLtt_Screen_Rows;
 
+    SLsig_block_signals();
     if(dp->resize.w != caca_get_canvas_width(dp->cv)
         || dp->resize.h != caca_get_canvas_height(dp->cv))
         SLsmg_reinit_smg();
+    SLsig_unblock_signals();
 }
 
@@ -314 +323 @@
 {
     int intkey;
+
+    /* If SIGINT was caught, we pass it to the application as Ctrl-C. */
+    if(dp->drv.p->sigint_event > 0)
+    {
+        ev->type = CACA_EVENT_KEY_PRESS;
+        ev->data.key.ch = CACA_KEY_CTRL_C;
+        ev->data.key.utf32 = 0x03;
+        ev->data.key.utf8[0] = 0x03;
+        ev->data.key.utf8[1] = 0;
+        dp->drv.p->sigint_event--;
+        return 1;
+    }
 
     if(!SLang_input_pending(0))