ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 144 return;
148 145
149 for (;;) 146 for (;;)
150 { 147 {
151 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
152 149
153 text_t t = l.t[x]; 150 text_t t = l.t[x];
154 151
155 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
156 { 153 {
… …
229# if !UNICODE3 226# if !UNICODE3
230 if (ch >= 0x10000) 227 if (ch >= 0x10000)
231 ch = 0xfffd; 228 ch = 0xfffd;
232# endif 229# endif
233 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
235 } 234 }
236 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
237 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
239 243
240 free (fname); 244 free (fname);
241 245
… …
267 mb[0] = ch[0]; 271 mb[0] = ch[0];
268 len = 1; 272 len = 1;
269 } 273 }
270 274
271 if (len > 0) 275 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
273 else 277 else
274 scr_bell (); 278 scr_bell ();
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 309 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
311 316
312 /* 317 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
315 * 320 *
… …
333 Status status_return; 338 Status status_return;
334 339
335#if 0 340#if 0
336#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
340 else 345 else
341#endif 346#endif
342#endif 347#endif
343 { 348 {
… …
380 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
381 } 386 }
382 else 387 else
383#endif 388#endif
384 { 389 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
387 } 392 }
388 393
389 if (valid_keysym) 394 if (valid_keysym)
390 { 395 {
… …
442 scr_move_to (0, 1); 447 scr_move_to (0, 1);
443 return; 448 return;
444 } 449 }
445 else if (keysym == XK_End) 450 else if (keysym == XK_End)
446 { 451 {
447 scr_move_to (1, 0); 452 scr_move_to (1, 1);
448 return; 453 return;
449 } 454 }
450 } 455 }
451#endif 456#endif
452 } 457 }
… …
463 { 468 {
464 switch (keysym) 469 switch (keysym)
465 { 470 {
466 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
469 return; 474 return;
470#if TODO 475#if TODO
471 /* rxvt extras */ 476 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
492 { 497 {
493 commit_iso14755 (); 498 commit_iso14755 ();
494 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
495# if ISO_14755 500# if ISO_14755
496 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
497# endif 510# endif
498 return; 511 return;
499 } 512 }
500 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
501 { 514 {
… …
506# endif 519# endif
507 return; 520 return;
508 } 521 }
509 else 522 else
510 { 523 {
511# if ENABLE_OVERLAY 524# if ISO_14755
512 scr_overlay_off (); 525 scr_overlay_off ();
513# endif 526# endif
514 iso14755buf = 0; 527 iso14755buf = 0;
515 } 528 }
516 } 529 }
517 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
518 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
519 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
520 { 533 {
521 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
522# if ENABLE_OVERLAY 535# if ISO_14755
523 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
524 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
525# endif 538# endif
526 } 539 }
527#endif 540#endif
528 541
529#ifdef PRINTPIPE 542#ifdef PRINTPIPE
530 if (keysym == XK_Print) 543 if (keysym == XK_Print)
531 { 544 {
532 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
533 return; 546 return;
… …
715 728
716 case XK_Find: 729 case XK_Find:
717 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
718 break; 731 break;
719 732
720#ifdef XK_KP_End 733#ifdef XK_KP_Insert
721 case XK_KP_Insert: 734 case XK_KP_Insert:
722 /* allow shift to override */ 735 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 { 737 {
725 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
854 { 867 {
855#ifdef META8_OPTION 868#ifdef META8_OPTION
856 /* set 8-bit on */ 869 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
858 { 871 {
859 unsigned char *ch; 872 char *ch;
860 873
861 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 875 *ch |= 0x80;
863 876
864 meta = 0; 877 meta = 0;
… …
866#endif 879#endif
867 /* nil */ ; 880 /* nil */ ;
868 } 881 }
869 } 882 }
870 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
897#ifdef META8_OPTION 913#ifdef META8_OPTION
898 && meta_char == C0_ESC 914 && meta_char == C0_ESC
899#endif 915#endif
900 ) 916 )
901 { 917 {
902 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
917} 923}
918/*}}} */
919 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 1003unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 1005{
926 unsigned int n, s; 1006 unsigned int n, s;
927 1007
928 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
955void 1035void
956rxvt_term::flush () 1036rxvt_term::flush ()
957{ 1037{
958 flush_ev.stop (); 1038 flush_ev.stop ();
959 1039
960#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
961 if (want_full_refresh) 1041 if (want_full_refresh)
962 { 1042 {
963 want_full_refresh = 0; 1043 want_full_refresh = 0;
964 scr_clear (); 1044 scr_clear ();
965 scr_touch (false); 1045 scr_touch (false);
966 } 1046 }
967#endif 1047#endif
968 1048
969 if (want_refresh) 1049 if (want_refresh)
970 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
971 scr_refresh (refresh_type); 1089 scr_refresh ();
972 scrollbar_show (1); 1090 scrollbar_show (1);
973#ifdef USE_XIM 1091#ifdef USE_XIM
974 IMSendSpot (); 1092 IMSendSpot ();
975#endif 1093#endif
976 } 1094 }
… …
979} 1097}
980 1098
981void 1099void
982rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
983{ 1101{
984 SET_R (this); 1102 make_current ();
985 SET_LOCALE (locale);
986 1103
987 display->flush (); 1104 display->flush ();
988 1105
989 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1108}
992 1109
993void 1110void
994rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
995{ 1112{
996 SET_R (this); 1113 make_current ();
997 SET_LOCALE (locale);
998 1114
999 refresh_limit = 1;
1000 refresh_count = 0; 1115 refresh_count = 0;
1001 flush (); 1116 flush ();
1002} 1117}
1003 1118
1004#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1122{
1008 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1124 want_refresh = 1;
1010 1125
1011 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1127}
1013#endif 1128#endif
1014 1129
1015#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1016void 1131void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1146{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1149 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1150 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1152 }
1039} 1153}
1040#endif 1154#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1159{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1161 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1163 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1165 }
1053} 1166}
1054#endif 1167#endif
… …
1059{ 1172{
1060 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1176 {
1064 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1067 1179
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1180 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1182 }
1072} 1183}
1073#endif 1184#endif
1074 1185
1075#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1076static struct event_handler 1187static struct event_handler
1077{ 1188{
1078 check_watcher cw_yield; 1189 check_watcher yield_ev;
1079 1190
1080 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1081 { 1192 {
1082 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1083 w.stop (); 1201 w.stop ();
1084 } 1202 }
1085 1203
1086 event_handler () 1204 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1088 { 1206 {
1089 } 1207 }
1090} event_handler; 1208} event_handler;
1091#endif 1209#endif
1092 1210
… …
1095{ 1213{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1215
1098 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1099 { 1217 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1219 n = 0;
1102 } 1220 }
1103 1221
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1107 1225
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1227
1110 if (r > 0) 1228 if (r > 0)
1111 { 1229 {
1112 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1113 return true; 1231 return true;
1114 } 1232 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1234 {
1117#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1118 if (display->is_local) 1236 if (display->is_local)
1119 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1120#endif 1238#endif
1121 } 1239 }
1122 else 1240 else
1123 { 1241 {
1124 pty_ev.stop (); 1242 pty_ev.stop ();
1125 1243
1126 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1127 destroy (); 1245 destroy ();
1128 } 1246 }
1129 1247
1130 return false; 1248 return false;
1131} 1249}
1132 1250
1133void 1251void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1253{
1136 SET_R (this); 1254 make_current ();
1137 SET_LOCALE (locale);
1138 1255
1139 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1258 while (pty_fill ())
1142 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1147} 1264}
1148 1265
1149void 1266void
1150rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1151{ 1268{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1270 recolour_cursor ();
1154 1271
1155#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1273 hidden_pointer = 0;
1157 1274
1158 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1160#endif 1277#endif
1161} 1278}
1162 1279
1163#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1164void 1281void
1165rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1166{ 1283{
1167 if (! OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1168 return; 1285 return;
1169 1286
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1288 XFlush (dpy);
1172 1289
1173 hidden_pointer = 1; 1290 hidden_pointer = 1;
1174} 1291}
1175 1292
1176void 1293void
1177rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1178{ 1295{
1179 SET_R (this); 1296 make_current ();
1180 SET_LOCALE (locale);
1181 1297
1182 pointer_blank (); 1298 pointer_blank ();
1183} 1299}
1184#endif 1300#endif
1185 1301
… …
1250 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1251 (32 + x + 1), 1367 (32 + x + 1),
1252 (32 + y + 1)); 1368 (32 + y + 1));
1253} 1369}
1254 1370
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264
1265/*{{{ process an X event */ 1371/*{{{ process an X event */
1266void 1372void
1267rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1268{ 1374{
1269 dDisp; 1375 make_current ();
1270 1376
1271 SET_R (this); 1377 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1378
1274#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1382 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1383
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1387 unsigned int unused_mask;
1304 1388
1305 switch (ev.type) 1389 switch (ev.type)
1306 { 1390 {
1307 case KeyPress: 1391 case KeyPress:
1308#if ISO_14755 1392 key_press (ev.xkey);
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1311 lookup_key (ev.xkey);
1312
1313 break; 1393 break;
1314 1394
1315 case KeyRelease: 1395 case KeyRelease:
1316 { 1396 key_release (ev.xkey);
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1397 break;
1384 }
1385 1398
1386 case ButtonPress: 1399 case ButtonPress:
1387 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1388 break; 1401 break;
1389 1402
… …
1391 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1392 break; 1405 break;
1393 1406
1394 case ClientMessage: 1407 case ClientMessage:
1395 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1418 destroy ();
1419 }
1400#if ENABLE_EWMH 1420#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1405#endif 1436#endif
1406 } 1437 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break;
1443
1444 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1438 break;
1447 1439
1448 /* 1440 /*
1449 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1450 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1469 break; 1461 break;
1470 } 1462 }
1471 break; 1463 break;
1472 1464
1473 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1474 focus_in (); 1469 focus_in ();
1475 break; 1470 break;
1476 1471
1477 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1478 focus_out (); 1476 focus_out ();
1479 break; 1477 break;
1480 1478
1481 case ConfigureNotify: 1479 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1483 { 1481 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1483 ;
1486 1484
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1486 {
1489 seen_resize = 1; 1487 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1491 } 1496 }
1492 1497
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1494 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1495 check_our_parents (); 1502 check_our_parents ();
1496#endif 1503#endif
1497 } 1504 }
1498 break; 1505 break;
1499 1506
1500 case PropertyNotify: 1507 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1510 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1512
1505 break; 1513 break;
1506 1514
1507 case SelectionClear: 1515 case SelectionClear:
1508 selection_clear (); 1516 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1522 break;
1515 1523
1516 case SelectionRequest: 1524 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1526 break;
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1534 break;
1519 1535
1520 case UnmapNotify: 1536 case UnmapNotify:
1521 mapped = 0; 1537 mapped = 0;
1522#ifdef TEXT_BLINK 1538#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1524#endif 1540#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break; 1542 break;
1526 1543
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break;
1533
1534#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1535 case ReparentNotify: 1545 case ReparentNotify:
1536 rootwin_cb (ev); 1546 rootwin_cb (ev);
1537 break; 1547 break;
1538#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1539 1549
1540 case GraphicsExpose: 1550 case GraphicsExpose:
1541 case Expose: 1551 case Expose:
1542 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1543 { 1553 {
1544 do 1554 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1558
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1560
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1554 1564
1555 scr_refresh (refresh_type); 1565 want_refresh = 1;
1556 } 1566 }
1557 else 1567 else
1558 { 1568 {
1559 XEvent unused_event; 1569 XEvent unused_event;
1560 1570
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1572 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1574 ;
1565 1575
1566 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1567 { 1577 {
1568 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1569 scrollbar_show (0); 1579 scrollbar_show (0);
1570 } 1580 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1581
1576#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1577 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1579#endif 1585#endif
1580 } 1586 }
1581 break; 1587 break;
1582 1588
1583 case MotionNotify: 1589 case MotionNotify:
1584#ifdef POINTER_BLANK 1590#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1591 if (hidden_pointer)
1586 pointer_unblank (); 1592 pointer_unblank ();
1587#endif 1593#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1595 break;
1597 1596
1598 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
1599 { 1598 {
1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1601 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1603 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1605 ;
1604 1606
1605 XQueryPointer (disp, vt, 1607 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1611 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
… …
1674#endif 1676#endif
1675 } 1677 }
1676 } 1678 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1680 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1681 ; 1683 ;
1682 1684
1683 XQueryPointer (disp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1689 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1691 scrollbar_size ());
1690 scr_refresh (refresh_type);
1691 refresh_limit = 0; 1692 want_refresh = 1;
1692 scrollbar_show (1); 1693 scrollbar_show (1);
1693 } 1694 }
1694 break; 1695 break;
1695 } 1696 }
1697
1698#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif
1710
1711#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 {
1714 if (ev.type == MotionNotify
1715 || ev.type == ButtonPress
1716 || ev.type == ButtonRelease)
1717 if (hidden_pointer)
1718 pointer_unblank ();
1719
1720 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank ();
1722 }
1723#endif
1696} 1724}
1697 1725
1698void 1726void
1699rxvt_term::focus_in () 1727rxvt_term::focus_in ()
1700{ 1728{
1701 if (!focus) 1729 if (!focus)
1702 { 1730 {
1703 focus = 1; 1731 focus = 1;
1704 want_refresh = 1; 1732 want_refresh = 1;
1705 1733
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 1735
1708#if USE_XIM 1736#if USE_XIM
1709 if (Input_Context != NULL) 1737 if (Input_Context != NULL)
1710 { 1738 {
1711 IMSetStatusPosition (); 1739 IMSetPosition ();
1712 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1713 } 1741 }
1714#endif 1742#endif
1715#if CURSOR_BLINK 1743#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1744 if (option (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1746#endif
1719#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1721 { 1749 {
1722 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1723 scr_recolour (); 1751 scr_recolour ();
1724 } 1752 }
1725#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1726 } 1767 }
1727} 1768}
1728 1769
1729void 1770void
1730rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1732 if (focus) 1773 if (focus)
1733 { 1774 {
1734 focus = 0; 1775 focus = 0;
1735 want_refresh = 1; 1776 want_refresh = 1;
1736 1777
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1779
1739#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1781 if (iso14755buf)
1741 { 1782 {
1742 iso14755buf = 0; 1783 iso14755buf = 0;
1743# if ENABLE_OVERLAY 1784# if ISO_14755
1744 scr_overlay_off (); 1785 scr_overlay_off ();
1745# endif 1786# endif
1746 } 1787 }
1747#endif 1788#endif
1748#if USE_XIM 1789#if USE_XIM
1749 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1751#endif 1792#endif
1752#if CURSOR_BLINK 1793#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1755 hidden_cursor = 0; 1796 hidden_cursor = 0;
1756#endif 1797#endif
1757#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1762 } 1803 }
1763#endif 1804#endif
1764 } 1805 }
1765} 1806}
1766 1807
1767#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1768void 1822void
1769rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1824{
1771 SET_R (this); 1825 make_current ();
1772 SET_LOCALE (locale);
1773 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1774 switch (ev.type) 1832 switch (ev.type)
1775 { 1833 {
1776 case PropertyNotify: 1834 case PropertyNotify:
1777 /* 1835 /*
1778 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1783 return; 1841 return;
1784 1842
1785 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1786 case ReparentNotify: 1844 case ReparentNotify:
1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1788 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1789 break; 1847 break;
1790 } 1848 }
1849# endif
1791} 1850}
1792#endif 1851#endif
1793 1852
1794void 1853void
1795rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
1796{ 1855{
1797 int reportmode = 0, clickintime; 1856 int reportmode = 0, clickintime;
1798 1857
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1858 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1859
1800 if (!bypass_keystate) 1860 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1861 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1862
1803 /* 1863 /*
1804 * VT window processing of button press 1864 * VT window processing of button press
1805 */ 1865 */
1806 if (ev.window == vt) 1866 if (ev.window == vt)
1807 { 1867 {
1868 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1869 return;
1870
1808#if ISO_14755 1871#if ISO_14755
1809 // 5.4 1872 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1873 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 { 1874 {
1812 iso14755_54 (ev.x, ev.y); 1875 iso14755_54 (ev.x, ev.y);
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1887#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1888 if (ev.button == MEvent.button && clickintime)
1826 { 1889 {
1827 /* same button, within alloted time */ 1890 /* same button, within alloted time */
1828 MEvent.clicks++; 1891 MEvent.clicks++;
1892
1829 if (MEvent.clicks > 1) 1893 if (MEvent.clicks > 1)
1830 { 1894 {
1831 /* only report double clicks */ 1895 /* only report double clicks */
1832 MEvent.clicks = 2; 1896 MEvent.clicks = 2;
1833 mouse_report (ev); 1897 mouse_report (ev);
… …
1865#else 1929#else
1866 selection.rect = false; 1930 selection.rect = false;
1867#endif 1931#endif
1868 1932
1869 /* allow shift+left click to extend selection */ 1933 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1934 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1871 { 1935 {
1872 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1937 selection_rotate (ev.x, ev.y);
1874 else 1938 else
1875 selection_extend (ev.x, ev.y, 1); 1939 selection_extend (ev.x, ev.y, 1);
… …
2040 } 2104 }
2041 2105
2042 break; 2106 break;
2043 } 2107 }
2044 } 2108 }
2109
2045 return; 2110 return;
2046 } 2111 }
2047#if MENUBAR
2048 /*
2049 * Menubar window processing of button press
2050 */
2051 if (isMenuBarWindow (ev.window))
2052 menubar_control (ev);
2053#endif
2054} 2112}
2055 2113
2056void 2114void
2057rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
2058{ 2116{
… …
2064 2122
2065 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
2066 { 2124 {
2067 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
2068 scrollbar_show (0); 2126 scrollbar_show (0);
2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2070 refresh_type &= ~SMOOTH_REFRESH;
2071#endif
2072 } 2127 }
2073 2128
2074#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2075 if (sel_scroll_ev.active) 2130 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2077#endif 2132#endif
2078 2133
2079 if (ev.window == vt) 2134 if (ev.window == vt)
2080 { 2135 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2137 return;
2138
2081#if ISO_14755 2139#if ISO_14755
2082 // 5.4 2140 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return; 2142 return;
2085#endif 2143#endif
2144
2086 if (reportmode) 2145 if (reportmode)
2087 { 2146 {
2088 /* mouse report from vt window */ 2147 /* mouse report from vt window */
2089 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
2090 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
2120 { 2179 {
2121 case Button1: 2180 case Button1:
2122 case Button3: 2181 case Button3:
2123 selection_make (ev.time); 2182 selection_make (ev.time);
2124 break; 2183 break;
2184
2125 case Button2: 2185 case Button2:
2126 selection_request (ev.time, ev.x, ev.y); 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2188 break;
2189
2128#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2129 case Button4: 2191 case Button4:
2130 case Button5: 2192 case Button5:
2131 { 2193 {
2132 int i; 2194 int i;
… …
2134 2196
2135 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2136 2198
2137 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2138 i = 1; 2200 i = 1;
2139 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2140 i = nrow - 1; 2202 i = nrow - 1;
2141 else 2203 else
2142 i = 5; 2204 i = 5;
2143 2205
2144# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2154 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2155 } 2217 }
2156 else 2218 else
2157 { 2219 {
2158# endif 2220# endif
2159# ifdef JUMP_MOUSE_WHEEL
2160 scr_page (v, i); 2221 scr_page (v, i);
2161 scr_refresh (SMOOTH_REFRESH);
2162 scrollbar_show (1); 2222 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2172 } 2224 }
2173#endif 2225# endif
2174 } 2226 }
2175 break; 2227 break;
2176#endif 2228#endif
2177 } 2229 }
2178 } 2230 }
2179#ifdef MENUBAR
2180 else if (isMenuBarWindow (ev.window))
2181 menubar_control (ev);
2182#endif
2183} 2231}
2184
2185#ifdef TRANSPARENT
2186#if TINTING
2187/* taken from aterm-0.4.2 */
2188
2189typedef uint32_t RUINT32T;
2190
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{
2193 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
2199
2200 Visual *visual = display->visual;
2201
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203
2204 /* for convenience */
2205 mask_r = visual->red_mask;
2206 mask_g = visual->green_mask;
2207 mask_b = visual->blue_mask;
2208
2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2282 } else {
2283 if (shade < 0) shade = 0;
2284 if (shade > 100) shade = 100;
2285
2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2287
2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2291 }
2292
2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2295 {
2296 unsigned int tmp;
2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 16:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0xf800)>>11] |
2364 lookup_g[(*p & 0x07e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xff0000)>>16] |
2403 lookup_g[(*p & 0x00ff00)>> 8] |
2404 lookup_b[(*p & 0x0000ff)] |
2405 (*p & ~0xffffff);
2406 }
2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 }
2412
2413 free (lookup);
2414}
2415#endif
2416
2417/*
2418 * Check our parents are still who we think they are.
2419 * Do transparency updates if required
2420 */
2421int
2422rxvt_term::check_our_parents ()
2423{
2424 int i, pchanged, aformat, have_pixmap, rootdepth;
2425 unsigned long nitems, bytes_after;
2426 Atom atype;
2427 unsigned char *prop = NULL;
2428 Window root, oldp, *list;
2429 Pixmap rootpixmap = None;
2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (disp, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (disp, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (disp, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (disp, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
2523 allowedxerror = -1;
2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (disp, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (disp, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2556
2557 ShadeXImage (display, image, shade, rm, gm, bm);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (disp, vt,
2562 szHint.width, szHint.height, image->depth);
2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2565 nx, ny, image->width, image->height);
2566 XFreeGC (disp, gc);
2567 XDestroyImage (image);
2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2569 XClearWindow (disp, parent[0]);
2570
2571 if (!am_transparent || !am_pixmap_trans)
2572 pchanged = 1;
2573
2574 am_transparent = am_pixmap_trans = 1;
2575 }
2576 }
2577
2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2581 {
2582 unsigned int n;
2583 /*
2584 * InheritPixmap transparency
2585 */
2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 {
2588 oldp = parent[i];
2589 XQueryTree (disp, parent[i - 1], &root,
2590 &parent[i], &list, &n);
2591 XFree (list);
2592
2593 if (parent[i] == display->root)
2594 {
2595 if (oldp != None)
2596 pchanged = 1;
2597
2598 break;
2599 }
2600
2601 if (oldp != parent[i])
2602 pchanged = 1;
2603 }
2604
2605 n = 0;
2606
2607 if (pchanged)
2608 {
2609 for (; n < (unsigned int)i; n++)
2610 {
2611 XGetWindowAttributes (disp, parent[n], &wattr);
2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613 {
2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615 break;
2616 }
2617 }
2618 }
2619
2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2621 {
2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2624 am_transparent = 0;
2625 /* XXX: also turn off Opt_transparent? */
2626 }
2627 else
2628 {
2629#if WAIT_FOR_WM
2630 /* wait (an arbitrary period) for the WM to do its thing
2631 * needed for fvwm2.2.2 (and before?) */
2632 sleep (1);
2633#endif
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2232
2666/*}}} */ 2233/*}}} */
2667 2234
2668bool 2235bool
2669rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
2670{ 2237{
2671 bool flag = false; 2238 bool flag = false;
2672 unicode_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2674 2241
2675 for (;;) 2242 for (;;)
2676 { 2243 {
2677 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2678 { 2245 {
2679 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2247 ch = next_char ();
2681 }
2682 2248
2683 if (ch == NOCHAR) // TODO: improve 2249 if (ch == NOCHAR)
2684 break; 2250 break;
2251 }
2685 2252
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 { 2254 {
2688 if (!seen_input) 2255 if (!seen_input)
2689 { 2256 {
… …
2698 if (seen_resize && cmd_pid) 2265 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH); 2266 kill (-cmd_pid, SIGWINCH);
2700 } 2267 }
2701 2268
2702 /* Read a text string from the input buffer */ 2269 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ]; 2270 wchar_t buf[UBUFSIZ];
2704 bool refreshnow = false; 2271 bool refreshnow = false;
2705 int nlines = 0; 2272 int nlines = 0;
2706 unicode_t *str = buf; 2273 wchar_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2275
2709 for (;;) 2276 for (;;)
2710 { 2277 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break; 2279 break;
… …
2718 if (ch == C0_LF) 2285 if (ch == C0_LF)
2719 nlines++; 2286 nlines++;
2720 2287
2721 refresh_count++; 2288 refresh_count++;
2722 2289
2723 if (!OPTION (Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2291 {
2726 refreshnow = true;
2727 refresh_count = 0; 2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2728 ch = NOCHAR; 2297 ch = NOCHAR;
2729 break; 2298 break;
2299 }
2730 } 2300 }
2731 2301
2732 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2734 { 2304 {
2305 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2306 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2735 scr_add_lines (buf, nlines, str - buf); 2307 scr_add_lines (buf, str - buf, nlines);
2308
2736 nlines = 0; 2309 nlines = 0;
2737 str = buf; 2310 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2311 eol = str + min (ncol, UBUFSIZ);
2739 } 2312 }
2740 2313
… …
2753 2326
2754 seq_begin = cmdbuf_ptr; 2327 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2328 ch = next_char ();
2756 } 2329 }
2757 2330
2331 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2758 scr_add_lines (buf, nlines, str - buf); 2333 scr_add_lines (buf, str - buf, nlines);
2759 2334
2760 /* 2335 /*
2761 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2764 * is incremented here because we must be doing flat-out scrolling.
2765 */ 2339 */
2766 if (refreshnow) 2340 if (refreshnow)
2767 { 2341 {
2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2769 refresh_limit++;
2770 else
2771 {
2772 flag = true; 2342 flag = true;
2773 scr_refresh (refresh_type); 2343 scr_refresh ();
2774 flush_ev.stop (); 2344 want_refresh = 1;
2775 }
2776 } 2345 }
2777 2346
2778 } 2347 }
2779 else 2348 else
2780 { 2349 {
… …
2794 } 2363 }
2795 2364
2796 return flag; 2365 return flag;
2797} 2366}
2798 2367
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character 2368// read the next character
2809unicode_t 2369wchar_t
2810rxvt_term::next_char () 2370rxvt_term::next_char () NOTHROW
2811{ 2371{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2372 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2373 {
2814 // assume 7-bit to be ascii ALWAYS 2374 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2376 return *cmdbuf_ptr++;
2817 2377
2818 wchar_t wc; 2378 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2380
2821 if (len == (size_t)-2) 2381 if (len == (size_t)-2)
2822 { 2382 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2383 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2384 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2385 break;
2826 } 2386 }
2827 2387
2828 if (len == (size_t)-1) 2388 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830 2390
2831 // assume wchar == unicode 2391 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2834 } 2394 }
2835 2395
2836 return NOCHAR; 2396 return NOCHAR;
2837} 2397}
2398
2399// read the next octet
2400uint32_t
2401rxvt_term::next_octet () NOTHROW
2402{
2403 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR;
2406}
2407
2408static class out_of_input out_of_input;
2838 2409
2839/* rxvt_cmd_getc () - Return next input character */ 2410/* rxvt_cmd_getc () - Return next input character */
2840/* 2411/*
2841 * Return the next input character after first passing any keyboard input 2412 * Return the next input character after first passing any keyboard input
2842 * to the command. 2413 * to the command.
2843 */ 2414 */
2844unicode_t 2415wchar_t
2845rxvt_term::cmd_getc () 2416rxvt_term::cmd_getc () THROW ((class out_of_input))
2846{ 2417{
2847 unicode_t c = next_char (); 2418 wchar_t c = next_char ();
2848 2419
2849 if (c == NOCHAR) 2420 if (c == NOCHAR)
2850 throw out_of_input; 2421 throw out_of_input;
2851 2422
2852 return c; 2423 return c;
2853} 2424}
2854 2425
2855unicode_t 2426uint32_t
2856rxvt_term::cmd_get8 () 2427rxvt_term::cmd_get8 () THROW ((class out_of_input))
2857{ 2428{
2858 unicode_t c = next_octet (); 2429 uint32_t c = next_octet ();
2859 2430
2860 if (c == NOCHAR) 2431 if (c == NOCHAR)
2861 throw out_of_input; 2432 throw out_of_input;
2862 2433
2863 return c; 2434 return c;
… …
2927 { 2498 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2500 break; /* done = 1 */
2930 } 2501 }
2931 } 2502 }
2932 2503
2933 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2935 { 2506 {
2936 done = 1; 2507 done = 1;
2937 break; 2508 break;
… …
2963 case C0_ESC: 2534 case C0_ESC:
2964 process_escape_seq (); 2535 process_escape_seq ();
2965 break; 2536 break;
2966 case C0_ENQ: /* terminal Status */ 2537 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 2538 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2539 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 2540 else
2971 tt_write ((unsigned char *)VT100_ANS, 2541 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 2542 break;
2974 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2975 scr_bell (); 2544 scr_bell ();
2976 break; 2545 break;
2977 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
3001 process_dcs_seq (); 2570 process_dcs_seq ();
3002 break; 2571 break;
3003 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
3004 process_csi_seq (); 2573 process_csi_seq ();
3005 break; 2574 break;
3006 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
3007 process_osc_seq (); 2576 process_osc_seq ();
3008 break; 2577 break;
3009#endif 2578#endif
3010 } 2579 }
3011} 2580}
… …
3101 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
3102 break; 2671 break;
3103 case '+': 2672 case '+':
3104 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
3105 break; 2674 break;
3106#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3107 case '6': 2676 case '6':
3108 scr_backindex (); 2677 scr_backindex ();
3109 break; 2678 break;
3110#endif 2679#endif
3111 case '7': 2680 case '7':
3112 scr_cursor (SAVE); 2681 scr_cursor (SAVE);
3113 break; 2682 break;
3114 case '8': 2683 case '8':
3115 scr_cursor (RESTORE); 2684 scr_cursor (RESTORE);
3116 break; 2685 break;
3117#if ENABLE_FRILLS 2686#if !ENABLE_MINIMAL
3118 case '9': 2687 case '9':
3119 scr_forwardindex (); 2688 scr_forwardindex ();
3120 break; 2689 break;
3121#endif 2690#endif
3122 case '=': 2691 case '=':
… …
3132 break; 2701 break;
3133 2702
3134 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
3135 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
3136 { 2705 {
3137 unicode_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
3138 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3139 } 2708 }
3140 break; 2709 break;
3141 2710
3142 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
3143 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
… …
3165 process_dcs_seq (); 2734 process_dcs_seq ();
3166 break; 2735 break;
3167 2736
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
3173 2741
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 2744 process_csi_seq ();
… …
3240 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3241 unsigned int nargs, p; 2809 unsigned int nargs, p;
3242 int n, ndef; 2810 int n, ndef;
3243 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3244 2812
3245 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3246 arg[--nargs] = 0; 2814 nargs = 0;
3247 2815
3248 priv = 0; 2816 priv = 0;
3249 ch = cmd_getc (); 2817 ch = cmd_getc ();
3250 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3251 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3285 ndef = get_byte_array_bit (csi_defaults, i); 2853 ndef = get_byte_array_bit (csi_defaults, i);
3286 for (p = 0; p < nargs; p++) 2854 for (p = 0; p < nargs; p++)
3287 if (arg[p] == -1) 2855 if (arg[p] == -1)
3288 arg[p] = ndef; 2856 arg[p] = ndef;
3289 2857
3290#ifdef DEBUG_CMD
3291 fprintf (stderr, "CSI ");
3292 for (p = 0; p < nargs; p++)
3293 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3294 fprintf (stderr, "%c\n", ch);
3295#endif
3296
3297 /* 2858 /*
3298 * private mode handling 2859 * private mode handling
3299 */ 2860 */
3300 if (priv) 2861 if (priv)
3301 { 2862 {
3302 switch (priv) 2863 switch (priv)
3303 { 2864 {
3304 case '>': 2865 case '>':
3305 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2867 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2873 // that we do not support xterm mouse reporting (should be 95 when we do).
2874 //
2875 tt_printf ("\033[>%d;94;0c", 'U');
2876 }
3307 break; 2877 break;
3308 case '?': 2878 case '?':
3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3310 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
3311 break; 2881 break;
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 2992 break;
3423 2993
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 2995 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 2996 break;
3428 2997
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 2999 process_sgr_mode (nargs, arg);
3431 break; 3000 break;
… …
3438 break; 3007 break;
3439 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3440 scr_report_position (); 3009 scr_report_position ();
3441 break; 3010 break;
3442 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3443 if (OPTION (Opt_insecure)) 3012 if (option (Opt_insecure))
3444 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3445 break; 3014 break;
3446 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3448 break; 3017 break;
… …
3515 break; 3084 break;
3516 case CSI_75: 3085 case CSI_75:
3517 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
3518 break; 3087 break;
3519 3088
3520#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3521 case CSI_74: 3090 case CSI_74:
3522 process_window_ops (arg, nargs); 3091 process_window_ops (arg, nargs);
3523 break; 3092 break;
3524#endif 3093#endif
3525 3094
… …
3532 break; 3101 break;
3533 } 3102 }
3534} 3103}
3535/*}}} */ 3104/*}}} */
3536 3105
3537#if ENABLE_FRILLS 3106#if !ENABLE_MINIMAL
3538/* ARGSUSED */ 3107/* ARGSUSED */
3539void 3108void
3540rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3109rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3541{ 3110{
3542 int x, y; 3111 int x, y;
3543 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3544 Window wdummy; 3113 Window wdummy;
3545 dDisp; 3114
3115 dLocal (Display *, dpy);
3546 3116
3547 if (nargs == 0) 3117 if (nargs == 0)
3548 return; 3118 return;
3549 3119
3550 switch (args[0]) 3120 switch (args[0])
3551 { 3121 {
3552 /* 3122 /*
3553 * commands 3123 * commands
3554 */ 3124 */
3555 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3556 XMapWindow (disp, parent[0]); 3126 XMapWindow (dpy, parent[0]);
3557 break; 3127 break;
3558 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3559 XIconifyWindow (disp, parent[0], display->screen); 3129 XIconifyWindow (dpy, parent[0], display->screen);
3560 break; 3130 break;
3561 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3562 XMoveWindow (disp, parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3563 break; 3133 break;
3564 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3566 break; 3136 break;
3567 case 5: /* raise window */ 3137 case 5: /* raise window */
3568 XRaiseWindow (disp, parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3569 break; 3139 break;
3570 case 6: /* lower window */ 3140 case 6: /* lower window */
3571 XLowerWindow (disp, parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3572 break; 3142 break;
3573 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3574 scr_touch (true); 3144 scr_touch (true);
3575 break; 3145 break;
3576 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
… …
3583 if (args[0] >= 24) /* set height (chars) */ 3153 if (args[0] >= 24) /* set height (chars) */
3584 set_widthheight ((unsigned int)width, 3154 set_widthheight ((unsigned int)width,
3585 (unsigned int) (args[1] * fheight)); 3155 (unsigned int) (args[1] * fheight));
3586 break; 3156 break;
3587 3157
3588
3589 /* 3158 /*
3590 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3591 */ 3160 */
3592 case 11: /* report window state */ 3161 case 11: /* report window state */
3593 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3595 break; 3164 break;
3596 case 13: /* report window position */ 3165 case 13: /* report window position */
3597 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 XTranslateCoordinates (disp, parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3599 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3600 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3601 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3602 break; 3171 break;
3603 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3606 break; 3175 break;
3607 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3608 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3609 break; 3178 break;
… …
3611 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3612 break; 3181 break;
3613 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3614 { 3183 {
3615 char *s; 3184 char *s;
3616 XGetIconName (disp, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3617 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3618 XFree (s); 3187 XFree (s);
3619 } 3188 }
3620 break; 3189 break;
3621 case 21: /* report window title */ 3190 case 21: /* report window title */
3622 { 3191 {
3623 char *s; 3192 char *s;
3624 XFetchName (disp, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3625 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3195 XFree (s);
3627 } 3196 }
3628 break; 3197 break;
3629 } 3198 }
3630} 3199}
… …
3633/*----------------------------------------------------------------------*/ 3202/*----------------------------------------------------------------------*/
3634/* 3203/*
3635 * get input up until STRING TERMINATOR (or BEL) 3204 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3205 * ends_how is terminator used. returned input must be free()'d
3637 */ 3206 */
3638unsigned char * 3207char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3208rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3209{
3641 unicode_t ch; 3210 unicode_t ch;
3642 bool seen_esc = false; 3211 bool seen_esc = false;
3643 unsigned int n = 0; 3212 unsigned int n = 0;
… …
3657 seen_esc = true; 3226 seen_esc = true;
3658 continue; 3227 continue;
3659 } 3228 }
3660 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3661 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3662 else if (ch < 0x20) 3233 else if (ch < 0x20)
3663 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3664 3235
3665 seen_esc = false; 3236 seen_esc = false;
3666 3237
3667 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3668 // stop at some sane length 3239 // stop at some sane length
3669 return NULL; 3240 return NULL;
3670 3241
3671 if (ch == C0_SYN)
3672 string[n++] = cmd_get8 ();
3673 else
3674 string[n++] = ch; 3242 string[n++] = ch;
3675 } 3243 }
3676 3244
3677 string[n++] = '\0'; 3245 string[n++] = '\0';
3678 3246
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3248
3681 return (unsigned char *)rxvt_wcstombs (string); 3249 return rxvt_wcstombs (string);
3682} 3250}
3683 3251
3684/*----------------------------------------------------------------------*/ 3252/*----------------------------------------------------------------------*/
3685/* 3253/*
3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3687 */ 3255 */
3688void 3256void
3689rxvt_term::process_dcs_seq () 3257rxvt_term::process_dcs_seq ()
3690{ 3258{
3691 unsigned char *s; 3259 char *s;
3692 unicode_t eh; 3260 unicode_t eh;
3693 3261
3694 /* 3262 /*
3695 * Not handled yet 3263 * Not handled yet
3696 */ 3264 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3283 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3284 arg = arg * 10 + (ch - '0');
3717 3285
3718 if (ch == ';') 3286 if (ch == ';')
3719 { 3287 {
3720 unsigned char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3721 3289
3722 if (s) 3290 if (s)
3723 { 3291 {
3724 process_xterm_seq (arg, (char *)s, eh); 3292 process_xterm_seq (arg, s, eh);
3725 free (s); 3293 free (s);
3726 } 3294 }
3727 } 3295 }
3728} 3296}
3729 3297
3730void 3298void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3299rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3732{ 3300{
3733 if (str[0] == '?' && !str[1]) 3301 if (str[0] == '?' && !str[1])
3734 { 3302 {
3735 unsigned short r, g, b; 3303 rgba c;
3736 pix_colors_focused[color].get (display, r, g, b); 3304 pix_colors_focused[color].get (c);
3305
3306#if XFT
3307 if (c.a != rgba::MAX_CC)
3308 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3309 else
3310#endif
3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3311 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3738 } 3312 }
3739 else 3313 else
3740 set_window_color (color, str); 3314 set_window_color (color, str);
3741} 3315}
3742 3316
3743/* 3317/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3319 */
3746void 3320void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3321rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3322{
3749 int changed = 0;
3750 int color; 3323 int color;
3751 char *buf, *name; 3324 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3753 int saveop = op; 3326 int saveop = op;
3754 dDisp; 3327
3328 dLocal (Display *, dpy);
3755 3329
3756 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3757 switch (op) 3335 switch (op)
3758 { 3336 {
3759 case XTerm_name: 3337 case XTerm_name:
3760 set_title (str); 3338 set_title (str);
3761 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3775 unsigned long bytes_after; 3353 unsigned long bytes_after;
3776 unsigned char *value = 0; 3354 unsigned char *value = 0;
3777 const char *str = ""; 3355 const char *str = "";
3778 3356
3779 if (prop 3357 if (prop
3780 && XGetWindowProperty (disp, parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3362 && actual_type != None
3785 && actual_format == 8) 3363 && actual_format == 8)
3786 str = (const char *)(value); 3364 str = (const char *)(value);
3787 3365
3788 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3366 tt_printf ("\033]%d;%s%c", op, str, resp);
3789 3367
3790 XFree (value); 3368 XFree (value);
3791 } 3369 }
3792 else 3370 else
3793 { 3371 {
… …
3797 { 3375 {
3798 *eq = 0; 3376 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3800 } 3378 }
3801 else 3379 else
3802 XDeleteProperty (disp, parent[0], 3380 XDeleteProperty (dpy, parent[0],
3803 display->atom (str)); 3381 display->atom (str));
3804 } 3382 }
3805 break; 3383 break;
3806 3384
3807 case XTerm_Color: 3385 case XTerm_Color:
… …
3809 { 3387 {
3810 if ((name = strchr (buf, ';')) == NULL) 3388 if ((name = strchr (buf, ';')) == NULL)
3811 break; 3389 break;
3812 3390
3813 *name++ = '\0'; 3391 *name++ = '\0';
3814 color = atoi (buf); 3392 color = atoi (buf) + minCOLOR;
3815 3393
3816 if (color < 0 || color >= TOTAL_COLORS) 3394 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3817 break; 3395 break;
3818 3396
3819 if ((buf = strchr (name, ';')) != NULL) 3397 if ((buf = strchr (name, ';')) != NULL)
3820 *buf++ = '\0'; 3398 *buf++ = '\0';
3821 3399
3822 if (name[0] == '?' && !name[1]) 3400 process_color_seq (op, color, name, resp);
3823 {
3824 unsigned short r, g, b;
3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3827 }
3828 else
3829 set_window_color (color + minCOLOR, name);
3830 } 3401 }
3831 break; 3402 break;
3832 case XTerm_Color00: 3403 case XTerm_Color00:
3833 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3404 process_color_seq (op, Color_fg, str, resp);
3834 break; 3405 break;
3835 case XTerm_Color01: 3406 case XTerm_Color01:
3836 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3837 break; 3408 break;
3838#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3839 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
3840 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3411 process_color_seq (op, Color_cursor, str, resp);
3841 break; 3412 break;
3842#endif 3413#endif
3843 case XTerm_Color_pointer_fg: 3414 case XTerm_Color_pointer_fg:
3844 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3845 break; 3416 break;
3846 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3847 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3848 break; 3419 break;
3849#ifndef NO_BOLD_UNDERLINE_REVERSE 3420#ifndef NO_BOLD_UNDERLINE_REVERSE
3850 case XTerm_Color_BD:
3851 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3852 break;
3853 case XTerm_Color_UL:
3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3855 break;
3856 case XTerm_Color_RV: 3421 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp);
3427 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp);
3858 break; 3431 break;
3859 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3860 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3861 break; 3434 break;
3862#endif 3435#endif
3863#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3864 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3865 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3439
3866 check_our_parents (); 3440 check_our_parents ();
3441
3867 if (am_transparent) 3442 if (am_transparent)
3868 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3869 break;
3870#endif
3871 3444
3872 case XTerm_Pixmap: 3445 break;
3873 if (*str != ';') 3446#endif
3874 { 3447
3875#if XPM_BACKGROUND 3448#if XPM_BACKGROUND
3449 case Rxvt_Pixmap:
3450 {
3451 if (*str != ';')
3452 {
3876 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3877 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3878#endif
3879 scr_touch (true); 3455 scr_touch (true);
3880 } 3456 }
3457
3458 int changed = 0;
3459
3881 while ((str = strchr (str, ';')) != NULL) 3460 while ((str = strchr (str, ';')) != NULL)
3882 { 3461 {
3883 str++; 3462 str++;
3884#if XPM_BACKGROUND
3885 changed += scale_pixmap (str); 3463 changed += scale_pixmap (str);
3886#endif
3887 } 3464 }
3888 3465
3889 if (changed) 3466 if (changed)
3890 { 3467 {
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap (); 3468 resize_pixmap ();
3893#endif
3894 scr_touch (true); 3469 scr_touch (true);
3895 } 3470 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 }
3896 break; 3476 break;
3477#endif
3897 3478
3898 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3899 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3900 break; 3481 break;
3901 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3902 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3903 break; 3484 break;
3904 3485
3905 case XTerm_logfile: 3486 case XTerm_logfile:
3906 // TODO, when secure mode? 3487 // TODO, when secure mode?
3907 break; 3488 break;
3908 3489
3909#ifdef MENUBAR
3910 case URxvt_Menu:
3911 if (OPTION (Opt_insecure))
3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3913 break;
3914#endif
3915#if 0 3490#if 0
3916 case XTerm_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3917 { 3492 {
3918 int fd; 3493 int fd;
3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3920 { 3495 {
3921 scr_dump (fd); 3496 scr_dump (fd);
… …
3932 case URxvt_italicFont: 3507 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3934#endif 3509#endif
3935 if (query) 3510 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3514 resp);
3940 else 3515 else
3941 { 3516 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3945 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3946 set_fonts (); 3521 set_fonts ();
3947 } 3522 }
3948 break; 3523 break;
3949 3524
3950#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3951 case URxvt_locale: 3534 case URxvt_locale:
3952 if (query) 3535 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3954 else 3537 else
3955 { 3538 {
3956 set_locale (str); 3539 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3958 init_xlocale (); 3541 init_xlocale ();
3959 } 3542 }
3960 break; 3543 break;
3961 3544
3962 case URxvt_view_up: 3545 case URxvt_view_up:
3963 case URxvt_view_down: 3546 case URxvt_view_down:
3547 {
3964 int lines = atoi (str); 3548 int lines = atoi (str);
3965 3549
3966 if (lines) 3550 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 3551 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 3552 else
3969 {
3970 scr_erase_savelines (); 3553 scr_erase_savelines ();
3971 } 3554 }
3972 3555
3556 break;
3557#endif
3558
3559#if ENABLE_PERL
3560 case URxvt_perl:
3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3562 ; // no responses yet
3973 break; 3563 break;
3974#endif 3564#endif
3975 } 3565 }
3976} 3566}
3977/*----------------------------------------------------------------------*/ 3567/*----------------------------------------------------------------------*/
… …
4008 return state; 3598 return state;
4009} 3599}
4010 3600
4011/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4012void 3602void
4013rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4014{ 3604{
4015 unsigned int i, j; 3605 unsigned int i, j;
4016 int state; 3606 int state;
4017 3607
4018 static const struct 3608 static const struct
… …
4029 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo },
4030 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin },
4031 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode 3622 // 8, bi-directional support mode
4033 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
4034#ifdef menuBar_esc
4035 { menuBar_esc, PrivMode_menuBar },
4036#endif
4037 // 18, 19 printing-related 3624 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor }, 3625 { 25, PrivMode_VisibleCursor },
4039#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
4040 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
4041#endif 3628#endif
… …
4088 /* extra handling for values with state unkept */ 3675 /* extra handling for values with state unkept */
4089 switch (arg[i]) 3676 switch (arg[i])
4090 { 3677 {
4091#if ENABLE_STYLES 3678#if ENABLE_STYLES
4092 case 1021: 3679 case 1021:
4093 if (mode) 3680 set_option (Opt_intensityStyles, mode);
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097 3681
4098 scr_touch (true); 3682 scr_touch (true);
4099 break; 3683 break;
4100#endif 3684#endif
4101 case 1048: /* alternative cursor save */ 3685 case 1048: /* alternative cursor save */
4102 case 1049: 3686 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3688 if (mode == 0)
4105 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4106 else if (mode == 1) 3690 else if (mode == 1)
4107 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4108 break; 3692 break;
… …
4123 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3709 set_widthheight (((state ? 132 : 80) * fwidth), height);
4126 break; 3710 break;
4127 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
4128 if (!state) 3712 set_option (Opt_jumpScroll, !state);
4129 SET_OPTION (Opt_jumpScroll);
4130 else
4131 CLR_OPTION (Opt_jumpScroll);
4132 break; 3713 break;
4133 case 5: /* reverse video */ 3714 case 5: /* reverse video */
4134 scr_rvideo_mode (state); 3715 scr_rvideo_mode (state);
4135 break; 3716 break;
4136 case 6: /* relative/absolute origins */ 3717 case 6: /* relative/absolute origins */
… …
4142 /* case 8: - auto repeat, can't do on a per window basis */ 3723 /* case 8: - auto repeat, can't do on a per window basis */
4143 case 9: /* X10 mouse reporting */ 3724 case 9: /* X10 mouse reporting */
4144 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
4145 priv_modes &= ~PrivMode_MouseX11; 3726 priv_modes &= ~PrivMode_MouseX11;
4146 break; 3727 break;
4147#ifdef menuBar_esc
4148 case menuBar_esc:
4149#ifdef MENUBAR
4150 map_menuBar (state);
4151#endif
4152 break;
4153#endif
4154#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
4155 case scrollBar_esc: 3729 case scrollBar_esc:
4156 if (scrollbar_mapping (state)) 3730 if (scrollbar_mapping (state))
4157 { 3731 {
4158 resize_all_windows (0, 0, 0); 3732 resize_all_windows (0, 0, 0);
… …
4177#if 0 3751#if 0
4178 case 1001: 3752 case 1001:
4179 break; /* X11 mouse highlighting */ 3753 break; /* X11 mouse highlighting */
4180#endif 3754#endif
4181 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
4182 if (!state) 3756 set_option (Opt_scrollTtyOutput, !state);
4183 SET_OPTION (Opt_scrollTtyOutput);
4184 else
4185 CLR_OPTION (Opt_scrollTtyOutput);
4186 break; 3757 break;
4187 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4188 if (state) 3759 set_option (Opt_scrollTtyKeypress, state);
4189 SET_OPTION (Opt_scrollTtyKeypress);
4190 else
4191 CLR_OPTION (Opt_scrollTtyKeypress);
4192 break; 3760 break;
4193 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3764 scr_erase_screen (2);
4197 scr_change_screen (state); 3765 scr_change_screen (state);
4198 break; 3766 break;
4199 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state); 3768 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3771 scr_erase_screen (2);
4204 break; 3772 break;
4205 default: 3773 default:
4206 break; 3774 break;
… …
4334 scr_color (Color_bg, Color_bg); 3902 scr_color (Color_bg, Color_bg);
4335 break; 3903 break;
4336 3904
4337 //case 50: // not variable spacing 3905 //case 50: // not variable spacing
4338 3906
4339#ifndef NO_BRIGHTCOLOR 3907#if !ENABLE_MINIMAL
4340 case 90: 3908 case 90:
4341 case 91: /* set bright fg color */ 3909 case 91: /* set bright fg color */
4342 case 92: 3910 case 92:
4343 case 93: 3911 case 93:
4344 case 94: 3912 case 94:
… …
4389 */ 3957 */
4390void 3958void
4391rxvt_term::tt_printf (const char *fmt,...) 3959rxvt_term::tt_printf (const char *fmt,...)
4392{ 3960{
4393 va_list arg_ptr; 3961 va_list arg_ptr;
4394 unsigned char buf[256]; 3962 char buf[256];
4395 3963
4396 va_start (arg_ptr, fmt); 3964 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3965 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 3966 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 3967 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 3972 * or generated by us in response to a query ESC sequence.
4405 */ 3973 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 3975
4408void 3976void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 3978{
3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3980 return;
3981
3982 if (pty->pty < 0)
3983 return;
3984
4411 if (v_buflen == 0) 3985 if (v_buflen == 0)
4412 { 3986 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4414 3988
4415 if ((unsigned int)written == len) 3989 if ((unsigned int)written == len)
4416 return; 3990 return;
4417 3991
4418 data += written; 3992 data += written;
4419 len -= written; 3993 len -= written;
4420 } 3994 }
4421 3995
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3996 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 3997
4424 memcpy (v_buffer + v_buflen, data, len); 3998 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 3999 v_buflen += len;
4426 4000
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4428} 4002}
4429 4003
4430void rxvt_term::pty_write () 4004void rxvt_term::pty_write ()
4431{ 4005{
4432 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4006 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4433 4007
4434 if (written > 0) 4008 if (written > 0)
4435 { 4009 {
4436 v_buflen -= written; 4010 v_buflen -= written;
4437 4011

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines