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.208 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.340 by sasha, Fri Aug 3 22:40:10 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = save[y + saveLines - view_start]; 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159
160} 161}
161#endif
162 162
163#if ENABLE_OVERLAY
164void 163void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 169 int len;
171 170
172 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
173 172
174#if ENABLE_COMBINING 173# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
176 { 175 {
177 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
180 } 179 }
181 else 180 else
182#endif 181# endif
183 { 182 {
184 ch2 = ch; 183 ch2 = ch;
185 184
186 alloc = 0; 185 alloc = 0;
187 chr = &ch2; 186 chr = &ch2;
188 len = 1; 187 len = 1;
189 } 188 }
190 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
191 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
192 203
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
194 214
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 216
197 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
198 { 218 {
… …
201 ch = *chr++; 221 ch = *chr++;
202 222
203 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
206#if !UNICODE3 226# if !UNICODE3
207 if (ch >= 0x10000) 227 if (ch >= 0x10000)
208 ch = 0xfffd; 228 ch = 0xfffd;
209#endif 229# endif
210 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
211 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
212 } 234 }
213 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// }
241 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
215 243
216 free (fname); 244 free (fname);
217 245
218#if ENABLE_COMBINING 246# if ENABLE_COMBINING
219 if (alloc) 247 if (alloc)
220 delete [] alloc; 248 delete [] alloc;
221#endif 249# endif
222} 250}
223#endif 251#endif
224 252
225void 253void
226rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
243 mb[0] = ch[0]; 271 mb[0] = ch[0];
244 len = 1; 272 len = 1;
245 } 273 }
246 274
247 if (len > 0) 275 if (len > 0)
248 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
249 else 277 else
250 scr_bell (); 278 scr_bell ();
251 } 279 }
252 280
253 iso14755buf = 0; 281 iso14755buf = 0;
… …
270 298
271 return -1; 299 return -1;
272} 300}
273#endif 301#endif
274 302
275/*{{{ Convert the keypress event into a string */
276void 303void
277rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
278{ 305{
279 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
280 unsigned int newlen; 307 unsigned int newlen;
281 KeySym keysym; 308 KeySym keysym;
282#ifdef DEBUG_CMD
283 static int debug_key = 1; /* accessible by a debugger only */
284#endif
285 int valid_keysym; 309 int valid_keysym;
286 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
287 316
288 /* 317 /*
289 * 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
290 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
291 * 320 *
… …
309 Status status_return; 338 Status status_return;
310 339
311#if 0 340#if 0
312#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
313 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
314 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
315 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
316 else 345 else
317#endif 346#endif
318#endif 347#endif
319 { 348 {
… …
356 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
357 } 386 }
358 else 387 else
359#endif 388#endif
360 { 389 {
361 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
362 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
363 } 392 }
364 393
365 if (valid_keysym) 394 if (valid_keysym)
366 { 395 {
… …
418 scr_move_to (0, 1); 447 scr_move_to (0, 1);
419 return; 448 return;
420 } 449 }
421 else if (keysym == XK_End) 450 else if (keysym == XK_End)
422 { 451 {
423 scr_move_to (1, 0); 452 scr_move_to (1, 1);
424 return; 453 return;
425 } 454 }
426 } 455 }
427#endif 456#endif
428 } 457 }
… …
439 { 468 {
440 switch (keysym) 469 switch (keysym)
441 { 470 {
442 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
443 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
444 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
445 return; 474 return;
446#if TODO 475#if TODO
447 /* rxvt extras */ 476 /* rxvt extras */
448 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
449 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
468 { 497 {
469 commit_iso14755 (); 498 commit_iso14755 ();
470 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
471# if ISO_14755 500# if ISO_14755
472 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);
473# endif 510# endif
474 return; 511 return;
475 } 512 }
476 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
477 { 514 {
… …
482# endif 519# endif
483 return; 520 return;
484 } 521 }
485 else 522 else
486 { 523 {
487# if ENABLE_OVERLAY 524# if ISO_14755
488 scr_overlay_off (); 525 scr_overlay_off ();
489# endif 526# endif
490 iso14755buf = 0; 527 iso14755buf = 0;
491 } 528 }
492 } 529 }
493 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
494 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
495 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
496 { 533 {
497 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
498# if ENABLE_OVERLAY 535# if ISO_14755
499 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
500 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
501# endif 538# endif
502 } 539 }
503#endif 540#endif
504 541
505#ifdef PRINTPIPE 542#ifdef PRINTPIPE
506 if (keysym == XK_Print) 543 if (keysym == XK_Print)
507 { 544 {
508 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
509 return; 546 return;
… …
691 728
692 case XK_Find: 729 case XK_Find:
693 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
694 break; 731 break;
695 732
696#ifdef XK_KP_End 733#ifdef XK_KP_Insert
697 case XK_KP_Insert: 734 case XK_KP_Insert:
698 /* allow shift to override */ 735 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 { 737 {
701 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
830 { 867 {
831#ifdef META8_OPTION 868#ifdef META8_OPTION
832 /* set 8-bit on */ 869 /* set 8-bit on */
833 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
834 { 871 {
835 unsigned char *ch; 872 char *ch;
836 873
837 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
838 *ch |= 0x80; 875 *ch |= 0x80;
839 876
840 meta = 0; 877 meta = 0;
… …
842#endif 879#endif
843 /* nil */ ; 880 /* nil */ ;
844 } 881 }
845 } 882 }
846 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
847 if (len <= 0) 887 if (len <= 0)
848 return; /* not mapped */ 888 return; /* not mapped */
849 889
850 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
851 if (view_start) 891 if (view_start)
852 { 892 {
853 view_start = 0; 893 view_start = 0;
854 want_refresh = 1; 894 want_refresh = 1;
855 } 895 }
… …
873#ifdef META8_OPTION 913#ifdef META8_OPTION
874 && meta_char == C0_ESC 914 && meta_char == C0_ESC
875#endif 915#endif
876 ) 916 )
877 { 917 {
878 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
879 tt_write (&ch, 1); 919 tt_write (&ch, 1);
880 } 920 }
881 921
882#if defined(DEBUG_CMD)
883 /* Display keyboard buffer contents */
884 unsigned char *p;
885 int i;
886
887 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
888 for (i = 0, p = kbuf; i < len; i++, p++)
889 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
890 fprintf (stderr, "'\n");
891#endif /* DEBUG_CMD */
892 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
893} 923}
894/*}}} */
895 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
896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
898/* attempt to `write' count to the input buffer */
899unsigned int 1003unsigned int
900rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
901{ 1005{
902 unsigned int n, s; 1006 unsigned int n, s;
903 1007
904 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
931void 1035void
932rxvt_term::flush () 1036rxvt_term::flush ()
933{ 1037{
934 flush_ev.stop (); 1038 flush_ev.stop ();
935 1039
936#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
937 if (want_full_refresh) 1041 if (want_full_refresh)
938 { 1042 {
939 want_full_refresh = 0; 1043 want_full_refresh = 0;
940 scr_clear (); 1044 scr_clear ();
941 scr_touch (false); 1045 scr_touch (false);
942 } 1046 }
943#endif 1047#endif
944 1048
945 if (want_refresh) 1049 if (want_refresh)
946 { 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
947 scr_refresh (refresh_type); 1089 scr_refresh ();
948 scrollbar_show (1); 1090 scrollbar_show (1);
949#ifdef USE_XIM 1091#ifdef USE_XIM
950 IMSendSpot (); 1092 IMSendSpot ();
951#endif 1093#endif
952 } 1094 }
… …
955} 1097}
956 1098
957void 1099void
958rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
959{ 1101{
960 SET_R (this); 1102 make_current ();
961 SET_LOCALE (locale);
962 1103
963 display->flush (); 1104 display->flush ();
964 1105
965 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
966 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
967} 1108}
968 1109
969void 1110void
970rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
971{ 1112{
972 SET_R (this); 1113 make_current ();
973 SET_LOCALE (locale);
974 1114
975 refresh_limit = 1;
976 refresh_count = 0; 1115 refresh_count = 0;
977 flush (); 1116 flush ();
978} 1117}
979 1118
980#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
982rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
983{ 1122{
984 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
985 want_refresh = 1; 1124 want_refresh = 1;
986 1125
987 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
988} 1127}
989#endif 1128#endif
990 1129
991#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
992void 1131void
… …
1006rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1007{ 1146{
1008 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1009 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1010 { 1149 {
1011 refresh_type |= SMOOTH_REFRESH;
1012 want_refresh = 1; 1150 want_refresh = 1;
1013 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1014 } 1152 }
1015} 1153}
1016#endif 1154#endif
… …
1020rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1021{ 1159{
1022 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1023 { 1161 {
1024 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1025 refresh_type |= SMOOTH_REFRESH;
1026 want_refresh = 1; 1163 want_refresh = 1;
1027 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1028 } 1165 }
1029} 1166}
1030#endif 1167#endif
… …
1035{ 1172{
1036 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1037 || 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)
1038 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1176 {
1040 if (view_start == nscrolled || 1177 if (view_start == top_row || view_start == 0)
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1043 1179
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1180 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1182 }
1048} 1183}
1049#endif 1184#endif
1050 1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
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
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
1051bool 1211bool
1052rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
1053{ 1213{
1054 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1055 1215
1056 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1057 { 1217 {
1058 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");
1059 n = 0; 1219 n = 0;
1060 } 1220 }
1061 1221
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1065 1225
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1067 1227
1068 if (n > 0) 1228 if (r > 0)
1069 { 1229 {
1070 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
1071 return true; 1231 return true;
1072 } 1232 }
1073 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
1074 destroy (); 1245 destroy ();
1075 1246 }
1247
1076 return false; 1248 return false;
1077} 1249}
1078 1250
1079void 1251void
1080rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1081{ 1253{
1082 SET_R (this); 1254 make_current ();
1083 SET_LOCALE (locale);
1084 1255
1085 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1086 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1087 while (pty_fill ()) 1258 while (pty_fill ())
1088 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1093} 1264}
1094 1265
1095void 1266void
1096rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1097{ 1268{
1098 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1099 recolour_cursor (); 1270 recolour_cursor ();
1100 1271
1101#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1273 hidden_pointer = 0;
1103 1274
1104 if (options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1277#endif
1107} 1278}
1108 1279
1109#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1110void 1281void
1111rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1112{ 1283{
1113 if (! (options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1114 return; 1285 return;
1115 1286
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1117 XFlush (display->display); 1288 XFlush (dpy);
1118 1289
1119 hidden_pointer = 1; 1290 hidden_pointer = 1;
1120} 1291}
1121 1292
1122void 1293void
1123rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1124{ 1295{
1125 SET_R (this); 1296 make_current ();
1126 SET_LOCALE (locale);
1127 1297
1128 pointer_blank (); 1298 pointer_blank ();
1129} 1299}
1130#endif 1300#endif
1131 1301
… …
1196 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1197 (32 + x + 1), 1367 (32 + x + 1),
1198 (32 + y + 1)); 1368 (32 + y + 1));
1199} 1369}
1200 1370
1201#ifdef USING_W11LIB
1202void
1203rxvt_W11_process_x_event (XEvent *ev)
1204{
1205 rxvt_t *r = rxvt_get_r ();
1206
1207 x_cb (*ev);
1208}
1209#endif
1210
1211/*{{{ process an X event */ 1371/*{{{ process an X event */
1212void 1372void
1213rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1214{ 1374{
1215 dDisp; 1375 make_current ();
1216 1376
1217 SET_R (this); 1377 dLocal (Display *, dpy);
1218 SET_LOCALE (locale);
1219 1378
1220#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1222 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1223 if (hidden_cursor) 1382 return;
1224 {
1225 hidden_cursor = 0;
1226 want_refresh = 1;
1227 }
1228 1383
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1230 }
1231#endif
1232
1233#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1235 {
1236 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease)
1239 if (hidden_pointer)
1240 pointer_unblank ();
1241
1242 if (ev.type == KeyPress && hidden_pointer == 0)
1243 pointer_blank ();
1244 }
1245#endif
1246
1247 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1248 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1249 unsigned int unused_mask; 1387 unsigned int unused_mask;
1250 1388
1251 switch (ev.type) 1389 switch (ev.type)
1252 { 1390 {
1253 case KeyPress: 1391 case KeyPress:
1254#if ISO_14755 1392 key_press (ev.xkey);
1255 if (!(iso14755buf & ISO_14755_52))
1256#endif
1257 lookup_key (ev.xkey);
1258
1259 break; 1393 break;
1260 1394
1261 case KeyRelease: 1395 case KeyRelease:
1262 { 1396 key_release (ev.xkey);
1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1264 KeySym ks;
1265
1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1267#endif
1268
1269#if ENABLE_FRILLS || ISO_14755
1270 // ISO 14755 support
1271 if (iso14755buf)
1272 if (iso14755buf & ISO_14755_52)
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277# if ISO_14755
1278 // iso14755 part 5.2 handling: release time
1279 // first: controls
1280 if ((ev.xkey.state & ControlMask)
1281 && ((ks >= 0x40 && ks <= 0x5f)
1282 || (ks >= 0x61 && ks <= 0x7f)))
1283 {
1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1290 if (i[0] == ks)
1291 {
1292 iso14755buf = ISO_14755_51 | i[1];
1293 commit_iso14755 ();
1294 return; // case-break;
1295 }
1296
1297 scr_bell ();
1298# endif
1299 iso14755buf = 0;
1300 break;
1301 }
1302 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1303 {
1304# if ENABLE_OVERLAY
1305 scr_overlay_off ();
1306# endif
1307 if (iso14755buf & ISO_14755_51)
1308 commit_iso14755 ();
1309#if ISO_14755
1310 else if (iso14755buf & ISO_14755_STARTED)
1311 {
1312 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1313
1314 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1315 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1316 }
1317# endif
1318 else
1319 iso14755buf = 0;
1320 }
1321#endif
1322
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R)
1327 mouse_slip_wheel_speed = 0;
1328#endif
1329 break; 1397 break;
1330 }
1331 1398
1332 case ButtonPress: 1399 case ButtonPress:
1333 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1334 break; 1401 break;
1335 1402
… …
1337 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1338 break; 1405 break;
1339 1406
1340 case ClientMessage: 1407 case ClientMessage:
1341 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1343 { 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 {
1344 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)))
1345 destroy (); 1418 destroy ();
1419 }
1346#if ENABLE_EWMH 1420#if ENABLE_EWMH
1347 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])
1348 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &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 }
1351#endif 1436#endif
1352 } 1437 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1362#ifdef OFFIX_DND
1363 /* OffiX Dnd (drag 'n' drop) protocol */
1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1365 && (ev.xclient.data.l[0] == DndFile
1366 || ev.xclient.data.l[0] == DndDir
1367 || ev.xclient.data.l[0] == DndLink))
1368 {
1369 /* Get Dnd data */
1370 Atom ActualType;
1371 int ActualFormat;
1372 unsigned char *data;
1373 unsigned long Size, RemainingBytes;
1374
1375 XGetWindowProperty (disp, display->root,
1376 xa[XA_DNDSELECTION],
1377 0L, 1000000L,
1378 False, AnyPropertyType,
1379 &ActualType, &ActualFormat,
1380 &Size, &RemainingBytes,
1381 &data);
1382 set_string_property (XA_CUT_BUFFER0, data);
1383 XFree (data);
1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1386 }
1387#endif /* OFFIX_DND */
1388 break;
1389
1390 case MappingNotify:
1391 XRefreshKeyboardMapping (&ev.xmapping);
1392 break; 1438 break;
1393 1439
1394 /* 1440 /*
1395 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1396 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1415 break; 1461 break;
1416 } 1462 }
1417 break; 1463 break;
1418 1464
1419 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1420 focus_in (); 1469 focus_in ();
1421 break; 1470 break;
1422 1471
1423 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1476 focus_out ();
1425 break; 1477 break;
1426 1478
1427 case ConfigureNotify: 1479 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1429 { 1481 {
1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1483 ;
1432 1484
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1486 {
1435 seen_resize = 1; 1487 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef HAVE_BG_PIXMAP
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1437 } 1497 }
1438 1498
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1440 if (options & Opt_transparent) 1502 if (option (Opt_transparent))
1441 check_our_parents (); 1503 check_our_parents ();
1442#endif 1504#endif
1443 } 1505 }
1444 break; 1506 break;
1445 1507
1446 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450 1513
1451 break; 1514 break;
1452 1515
1453 case SelectionClear: 1516 case SelectionClear:
1454 selection_clear (); 1517 selection_clear ();
… …
1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1460 break; 1523 break;
1461 1524
1462 case SelectionRequest: 1525 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1527 break;
1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1535 break;
1465 1536
1466 case UnmapNotify: 1537 case UnmapNotify:
1467 mapped = 0; 1538 mapped = 0;
1468#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1470#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1471 break; 1543 break;
1472 1544
1473 case MapNotify:
1474 mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break;
1479
1480#ifdef TRANSPARENT 1545#ifdef ENABLE_TRANSPARENCY
1481 case ReparentNotify: 1546 case ReparentNotify:
1482 rootwin_cb (ev); 1547 rootwin_cb (ev);
1483 break; 1548 break;
1484#endif /* TRANSPARENT */ 1549#endif /* ENABLE_TRANSPARENCY */
1485 1550
1486 case GraphicsExpose: 1551 case GraphicsExpose:
1487 case Expose: 1552 case Expose:
1488 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1489 { 1554 {
1490 do 1555 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1494 1559
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1561
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1500 1565
1501 scr_refresh (refresh_type); 1566 want_refresh = 1;
1502 } 1567 }
1503 else 1568 else
1504 { 1569 {
1505 XEvent unused_event; 1570 XEvent unused_event;
1506 1571
1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1508 ; 1573 ;
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1510 ; 1575 ;
1511 1576
1512 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1513 { 1578 {
1514 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1515 scrollbar_show (0); 1580 scrollbar_show (0);
1516 } 1581 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1582
1522#ifdef TRANSPARENT 1583#ifdef ENABLE_TRANSPARENCY
1523 if (am_transparent && ev.xany.window == parent[0]) 1584 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1585 XClearWindow (dpy, ev.xany.window);
1525#endif 1586#endif
1526 } 1587 }
1527 break; 1588 break;
1528 1589
1529 case MotionNotify: 1590 case MotionNotify:
1530#ifdef POINTER_BLANK 1591#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1592 if (hidden_pointer)
1532 pointer_unblank (); 1593 pointer_unblank ();
1533#endif 1594#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1596 break;
1543 1597
1544 if (ev.xany.window == vt) 1598 if (ev.xany.window == vt)
1545 { 1599 {
1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1602 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1604 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1549 ; 1606 ;
1550 1607
1551 XQueryPointer (disp, vt, 1608 XQueryPointer (dpy, vt,
1552 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1611 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1612 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
… …
1601 } 1658 }
1602 1659
1603 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1662 + 1;
1606 MIN_IT (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1608 } 1665 }
1609 else 1666 else
1610 { 1667 {
1611 /* we are within the text window, so we 1668 /* we are within the text window, so we
… …
1620#endif 1677#endif
1621 } 1678 }
1622 } 1679 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1624 { 1681 {
1625 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1627 ; 1684 ;
1628 1685
1629 XQueryPointer (disp, scrollBar.win, 1686 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1690 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1692 scrollbar_size ());
1636 scr_refresh (refresh_type);
1637 refresh_limit = 0; 1693 want_refresh = 1;
1638 scrollbar_show (1); 1694 scrollbar_show (1);
1639 } 1695 }
1640 break; 1696 break;
1641 } 1697 }
1698
1699#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1709 }
1710#endif
1711
1712#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 {
1715 if (ev.type == MotionNotify
1716 || ev.type == ButtonPress
1717 || ev.type == ButtonRelease)
1718 if (hidden_pointer)
1719 pointer_unblank ();
1720
1721 if (ev.type == KeyPress && hidden_pointer == 0)
1722 pointer_blank ();
1723 }
1724#endif
1642} 1725}
1643 1726
1644void 1727void
1645rxvt_term::focus_in () 1728rxvt_term::focus_in ()
1646{ 1729{
1647 if (!focus) 1730 if (!focus)
1648 { 1731 {
1649 focus = 1; 1732 focus = 1;
1650 want_refresh = 1; 1733 want_refresh = 1;
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1736
1651#if USE_XIM 1737#if USE_XIM
1652 if (Input_Context != NULL) 1738 if (Input_Context != NULL)
1653 { 1739 {
1654 IMSetStatusPosition (); 1740 IMSetPosition ();
1655 XSetICFocus (Input_Context); 1741 XSetICFocus (Input_Context);
1656 } 1742 }
1657#endif 1743#endif
1658#if CURSOR_BLINK 1744#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1745 if (option (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1746 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661#endif 1747#endif
1662#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1664 { 1750 {
1665 pix_colors = pix_colors_focused; 1751 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1752 scr_recolour ();
1667 } 1753 }
1668#endif 1754#endif
1755#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell))
1757 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]);
1761 if (h != NULL)
1762 {
1763 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h);
1765 }
1766 }
1767#endif
1669 } 1768 }
1670} 1769}
1671 1770
1672void 1771void
1673rxvt_term::focus_out () 1772rxvt_term::focus_out ()
… …
1675 if (focus) 1774 if (focus)
1676 { 1775 {
1677 focus = 0; 1776 focus = 0;
1678 want_refresh = 1; 1777 want_refresh = 1;
1679 1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1780
1680#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1782 if (iso14755buf)
1783 {
1681 iso14755buf = 0; 1784 iso14755buf = 0;
1682#endif 1785# if ISO_14755
1683#if ENABLE_OVERLAY
1684 scr_overlay_off (); 1786 scr_overlay_off ();
1787# endif
1788 }
1685#endif 1789#endif
1686#if USE_XIM 1790#if USE_XIM
1687 if (Input_Context != NULL) 1791 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1792 XUnsetICFocus (Input_Context);
1689#endif 1793#endif
1690#if CURSOR_BLINK 1794#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1795 if (option (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1796 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1797 hidden_cursor = 0;
1694#endif 1798#endif
1695#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
… …
1700 } 1804 }
1701#endif 1805#endif
1702 } 1806 }
1703} 1807}
1704 1808
1705#if TRANSPARENT 1809void
1810rxvt_term::update_fade_color (unsigned int idx)
1811{
1812#if OFF_FOCUS_FADING
1813 if (rs[Rs_fade])
1814 {
1815 rgba c;
1816 pix_colors [Color_fade].get (c);
1817 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1818 }
1819#endif
1820}
1821
1822#if ENABLE_TRANSPARENCY || ENABLE_PERL
1706void 1823void
1707rxvt_term::rootwin_cb (XEvent &ev) 1824rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1825{
1709 SET_R (this); 1826 make_current ();
1710 SET_LOCALE (locale);
1711 1827
1828 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1829 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1832# if ENABLE_TRANSPARENCY
1712 switch (ev.type) 1833 switch (ev.type)
1713 { 1834 {
1714 case PropertyNotify: 1835 case PropertyNotify:
1715 /* 1836 /*
1716 * if user used some Esetroot compatible prog to set the root bg, 1837 * if user used some Esetroot compatible prog to set the root bg,
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1842 return;
1722 1843
1723 /* FALLTHROUGH */ 1844 /* FALLTHROUGH */
1724 case ReparentNotify: 1845 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1846 if (option (Opt_transparent))
1726 want_refresh = want_full_refresh = 1; 1847 check_our_parents ();
1727 break; 1848 break;
1728 } 1849 }
1850# endif
1729} 1851}
1730#endif 1852#endif
1731 1853
1732void 1854void
1733rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
1734{ 1856{
1735 int reportmode = 0, clickintime; 1857 int reportmode = 0, clickintime;
1736 1858
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1859 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1860
1738 if (!bypass_keystate) 1861 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1862 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1863
1741 /* 1864 /*
1742 * VT window processing of button press 1865 * VT window processing of button press
1743 */ 1866 */
1744 if (ev.window == vt) 1867 if (ev.window == vt)
1745 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1746#if ISO_14755 1872#if ISO_14755
1747 // 5.4 1873 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1875 {
1750 iso14755_54 (ev.x, ev.y); 1876 iso14755_54 (ev.x, ev.y);
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1764 { 1890 {
1765 /* same button, within alloted time */ 1891 /* same button, within alloted time */
1766 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1767 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1768 { 1895 {
1769 /* only report double clicks */ 1896 /* only report double clicks */
1770 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1771 mouse_report (ev); 1898 mouse_report (ev);
… …
1803#else 1930#else
1804 selection.rect = false; 1931 selection.rect = false;
1805#endif 1932#endif
1806 1933
1807 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1936 {
1810 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1812 else 1939 else
1813 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
… …
1978 } 2105 }
1979 2106
1980 break; 2107 break;
1981 } 2108 }
1982 } 2109 }
2110
1983 return; 2111 return;
1984 } 2112 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2113}
1993 2114
1994void 2115void
1995rxvt_term::button_release (XButtonEvent &ev) 2116rxvt_term::button_release (XButtonEvent &ev)
1996{ 2117{
… …
2002 2123
2003 if (scrollbar_isUpDn ()) 2124 if (scrollbar_isUpDn ())
2004 { 2125 {
2005 scrollBar.setIdle (); 2126 scrollBar.setIdle ();
2006 scrollbar_show (0); 2127 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2128 }
2011 2129
2012#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
2015#endif 2133#endif
2016 2134
2017 if (ev.window == vt) 2135 if (ev.window == vt)
2018 { 2136 {
2137 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2138 return;
2139
2019#if ISO_14755 2140#if ISO_14755
2020 // 5.4 2141 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2143 return;
2023#endif 2144#endif
2145
2024 if (reportmode) 2146 if (reportmode)
2025 { 2147 {
2026 /* mouse report from vt window */ 2148 /* mouse report from vt window */
2027 /* don't report release of wheel "buttons" */ 2149 /* don't report release of wheel "buttons" */
2028 if (ev.button >= 4) 2150 if (ev.button >= 4)
… …
2058 { 2180 {
2059 case Button1: 2181 case Button1:
2060 case Button3: 2182 case Button3:
2061 selection_make (ev.time); 2183 selection_make (ev.time);
2062 break; 2184 break;
2185
2063 case Button2: 2186 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2187 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2188 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2065 break; 2189 break;
2190
2066#ifdef MOUSE_WHEEL 2191#ifdef MOUSE_WHEEL
2067 case Button4: 2192 case Button4:
2068 case Button5: 2193 case Button5:
2069 { 2194 {
2070 int i; 2195 int i;
… …
2072 2197
2073 v = ev.button == Button4 ? UP : DN; 2198 v = ev.button == Button4 ? UP : DN;
2074 2199
2075 if (ev.state & ShiftMask) 2200 if (ev.state & ShiftMask)
2076 i = 1; 2201 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2202 else if (option (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2203 i = nrow - 1;
2079 else 2204 else
2080 i = 5; 2205 i = 5;
2081 2206
2082# ifdef MOUSE_SLIP_WHEELING 2207# ifdef MOUSE_SLIP_WHEELING
… …
2092 slip_wheel_ev.start (); 2217 slip_wheel_ev.start ();
2093 } 2218 }
2094 else 2219 else
2095 { 2220 {
2096# endif 2221# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2222 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2223 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2224# ifdef MOUSE_SLIP_WHEELING
2110 } 2225 }
2111#endif 2226# endif
2112 } 2227 }
2113 break; 2228 break;
2114#endif 2229#endif
2115 } 2230 }
2116 } 2231 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2232}
2122
2123#ifdef TRANSPARENT
2124#if TINTING
2125/* taken from aterm-0.4.2 */
2126
2127typedef uint32_t RUINT32T;
2128
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{
2131 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i;
2137
2138 Visual *visual = display->visual;
2139
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141
2142 /* for convenience */
2143 mask_r = visual->red_mask;
2144 mask_g = visual->green_mask;
2145 mask_b = visual->blue_mask;
2146
2147 /* boring lookup table pre-initialization */
2148 switch (srcImage->bits_per_pixel) {
2149 case 15:
2150 if ((mask_r != 0x7c00) ||
2151 (mask_g != 0x03e0) ||
2152 (mask_b != 0x001f))
2153 return;
2154 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2155 lookup_r = lookup;
2156 lookup_g = lookup+32;
2157 lookup_b = lookup+32+32;
2158 sh_r = 10;
2159 sh_g = 5;
2160 sh_b = 0;
2161 break;
2162 case 16:
2163 if ((mask_r != 0xf800) ||
2164 (mask_g != 0x07e0) ||
2165 (mask_b != 0x001f))
2166 return;
2167 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2168 lookup_r = lookup;
2169 lookup_g = lookup+32;
2170 lookup_b = lookup+32+64;
2171 sh_r = 11;
2172 sh_g = 5;
2173 sh_b = 0;
2174 break;
2175 case 24:
2176 if ((mask_r != 0xff0000) ||
2177 (mask_g != 0x00ff00) ||
2178 (mask_b != 0x0000ff))
2179 return;
2180 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2181 lookup_r = lookup;
2182 lookup_g = lookup+256;
2183 lookup_b = lookup+256+256;
2184 sh_r = 16;
2185 sh_g = 8;
2186 sh_b = 0;
2187 break;
2188 case 32:
2189 if ((mask_r != 0xff0000) ||
2190 (mask_g != 0x00ff00) ||
2191 (mask_b != 0x0000ff))
2192 return;
2193 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2194 lookup_r = lookup;
2195 lookup_g = lookup+256;
2196 lookup_b = lookup+256+256;
2197 sh_r = 16;
2198 sh_g = 8;
2199 sh_b = 0;
2200 break;
2201 default:
2202 return; /* we do not support this color depth */
2203 }
2204
2205 /* prepare limits for color transformation (each channel is handled separately) */
2206 if (shade < 0) {
2207 shade = -shade;
2208 if (shade < 0) shade = 0;
2209 if (shade > 100) shade = 100;
2210
2211 lower_lim_r = 65535-rm;
2212 lower_lim_g = 65535-gm;
2213 lower_lim_b = 65535-bm;
2214
2215 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2216 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2217 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2218
2219 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2220 } else {
2221 if (shade < 0) shade = 0;
2222 if (shade > 100) shade = 100;
2223
2224 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2225
2226 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2227 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2228 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2229 }
2230
2231 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2232 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2233 {
2234 unsigned int tmp;
2235
2236 tmp = lower_lim_r;
2237 lower_lim_r = lower_lim_b;
2238 lower_lim_b = tmp;
2239
2240 tmp = upper_lim_r;
2241 upper_lim_r = upper_lim_b;
2242 upper_lim_b = tmp;
2243 }
2244
2245 /* fill our lookup tables */
2246 for (i = 0; i <= mask_r>>sh_r; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2250 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2251 lookup_r[i] = (tmp/65535)<<sh_r;
2252 }
2253 for (i = 0; i <= mask_g>>sh_g; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2257 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2258 lookup_g[i] = (tmp/65535)<<sh_g;
2259 }
2260 for (i = 0; i <= mask_b>>sh_b; i++)
2261 {
2262 RUINT32T tmp;
2263 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2264 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2265 lookup_b[i] = (tmp/65535)<<sh_b;
2266 }
2267
2268 /* apply table to input image (replacing colors by newly calculated ones) */
2269 switch (srcImage->bits_per_pixel)
2270 {
2271 case 15:
2272 {
2273 unsigned short *p1, *pf, *p, *pl;
2274 p1 = (unsigned short *) srcImage->data;
2275 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width;
2280 for (; p < pl; p++)
2281 {
2282 *p = lookup_r[(*p & 0x7c00)>>10] |
2283 lookup_g[(*p & 0x03e0)>> 5] |
2284 lookup_b[(*p & 0x001f)];
2285 }
2286 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2287 }
2288 break;
2289 }
2290 case 16:
2291 {
2292 unsigned short *p1, *pf, *p, *pl;
2293 p1 = (unsigned short *) srcImage->data;
2294 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2295 while (p1 < pf)
2296 {
2297 p = p1;
2298 pl = p1 + srcImage->width;
2299 for (; p < pl; p++)
2300 {
2301 *p = lookup_r[(*p & 0xf800)>>11] |
2302 lookup_g[(*p & 0x07e0)>> 5] |
2303 lookup_b[(*p & 0x001f)];
2304 }
2305 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2306 }
2307 break;
2308 }
2309 case 24:
2310 {
2311 unsigned char *p1, *pf, *p, *pl;
2312 p1 = (unsigned char *) srcImage->data;
2313 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2314 while (p1 < pf)
2315 {
2316 p = p1;
2317 pl = p1 + srcImage->width * 3;
2318 for (; p < pl; p += 3)
2319 {
2320 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2321 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2322 p[2] = lookup_r[(p[2] & 0x0000ff)];
2323 }
2324 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2325 }
2326 break;
2327 }
2328 case 32:
2329 {
2330 RUINT32T *p1, *pf, *p, *pl;
2331 p1 = (RUINT32T *) srcImage->data;
2332 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333
2334 while (p1 < pf)
2335 {
2336 p = p1;
2337 pl = p1 + srcImage->width;
2338 for (; p < pl; p++)
2339 {
2340 *p = lookup_r[(*p & 0xff0000)>>16] |
2341 lookup_g[(*p & 0x00ff00)>> 8] |
2342 lookup_b[(*p & 0x0000ff)] |
2343 (*p & ~0xffffff);
2344 }
2345 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 }
2350
2351 free (lookup);
2352}
2353#endif
2354
2355/*
2356 * Check our parents are still who we think they are.
2357 * Do transparency updates if required
2358 */
2359int
2360rxvt_term::check_our_parents ()
2361{
2362 int i, pchanged, aformat, have_pixmap, rootdepth;
2363 unsigned long nitems, bytes_after;
2364 Atom atype;
2365 unsigned char *prop = NULL;
2366 Window root, oldp, *list;
2367 Pixmap rootpixmap = None;
2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2370
2371 pchanged = 0;
2372
2373 if (!(options & Opt_transparent))
2374 return pchanged; /* Don't try any more */
2375
2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth;
2378
2379 XGetWindowAttributes (disp, parent[0], &wattr);
2380
2381 if (rootdepth != wattr.depth)
2382 {
2383 if (am_transparent)
2384 {
2385 pchanged = 1;
2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0;
2388 }
2389
2390 return pchanged; /* Don't try any more */
2391 }
2392
2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2394 XSync (disp, False);
2395
2396 /*
2397 * Make the frame window set by the window manager have
2398 * the root background. Some window managers put multiple nested frame
2399 * windows for each client, so we have to take care about that.
2400 */
2401 i = (xa[XA_XROOTPMAP_ID]
2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2404 &nitems, &bytes_after, &prop) == Success);
2405
2406 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success);
2411
2412 if (!i || prop == NULL
2413#if TINTING
2414 || !rs[Rs_color + Color_tint]
2415#endif
2416 )
2417 have_pixmap = 0;
2418 else
2419 {
2420 have_pixmap = 1;
2421 rootpixmap = *(Pixmap *)prop;
2422 XFree (prop);
2423 }
2424
2425 if (have_pixmap)
2426 {
2427 /*
2428 * Copy display->root pixmap transparency
2429 */
2430 int sx, sy, nx, ny;
2431 unsigned int nw, nh;
2432 Window cr;
2433 XImage *image;
2434 GC gc;
2435 XGCValues gcvalue;
2436
2437 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height;
2441 nx = ny = 0;
2442
2443 if (sx < 0)
2444 {
2445 nw += sx;
2446 nx = -sx;
2447 sx = 0;
2448 }
2449
2450 if (sy < 0)
2451 {
2452 nh += sy;
2453 ny = -sy;
2454 sy = 0;
2455 }
2456
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2461 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463
2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2465 /* XXX: may need a delay here? */
2466 allowedxerror = 0;
2467
2468 if (image == NULL)
2469 {
2470 if (am_transparent && am_pixmap_trans)
2471 {
2472 pchanged = 1;
2473 if (pixmap != None)
2474 {
2475 XFreePixmap (disp, pixmap);
2476 pixmap = None;
2477 }
2478 }
2479
2480 am_pixmap_trans = 0;
2481 }
2482 else
2483 {
2484 if (pixmap != None)
2485 XFreePixmap (disp, pixmap);
2486
2487#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint))
2489 {
2490 unsigned short rm, gm, bm;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2494
2495 ShadeXImage (display, image, shade, rm, gm, bm);
2496 }
2497#endif
2498
2499 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc);
2505 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, parent[0]);
2508
2509 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1;
2511
2512 am_transparent = am_pixmap_trans = 1;
2513 }
2514 }
2515
2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else
2519 {
2520 unsigned int n;
2521 /*
2522 * InheritPixmap transparency
2523 */
2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 {
2526 oldp = parent[i];
2527 XQueryTree (disp, parent[i - 1], &root,
2528 &parent[i], &list, &n);
2529 XFree (list);
2530
2531 if (parent[i] == display->root)
2532 {
2533 if (oldp != None)
2534 pchanged = 1;
2535
2536 break;
2537 }
2538
2539 if (oldp != parent[i])
2540 pchanged = 1;
2541 }
2542
2543 n = 0;
2544
2545 if (pchanged)
2546 {
2547 for (; n < (unsigned int)i; n++)
2548 {
2549 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 {
2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break;
2554 }
2555 }
2556 }
2557
2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 {
2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */
2564 }
2565 else
2566 {
2567#if WAIT_FOR_WM
2568 /* wait (an arbitrary period) for the WM to do its thing
2569 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1);
2571#endif
2572 for (n = 0; n < (unsigned int)i; n++)
2573 {
2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, parent[n]);
2576 }
2577
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1;
2580 }
2581
2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 parent[i] = None;
2584 }
2585
2586 if (scrollBar.win)
2587 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle ();
2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2598 }
2599
2600 return pchanged;
2601}
2602#endif
2603 2233
2604/*}}} */ 2234/*}}} */
2605 2235
2606bool 2236bool
2607rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2608{ 2238{
2609 bool flag = false; 2239 bool flag = false;
2610 unicode_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2612 2242
2613 for (;;) 2243 for (;;)
2614 { 2244 {
2615 if (ch == NOCHAR) 2245 if (ch == NOCHAR)
2616 { 2246 {
2617 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2248 ch = next_char ();
2619 }
2620 2249
2621 if (ch == NOCHAR) // TODO: improve 2250 if (ch == NOCHAR)
2622 break; 2251 break;
2252 }
2623 2253
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2255 {
2626 if (!seen_input) 2256 if (!seen_input)
2627 { 2257 {
… …
2636 if (seen_resize && cmd_pid) 2266 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2267 kill (-cmd_pid, SIGWINCH);
2638 } 2268 }
2639 2269
2640 /* Read a text string from the input buffer */ 2270 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2271 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2272 bool refreshnow = false;
2643 int nlines = 0; 2273 int nlines = 0;
2644 unicode_t *str = buf; 2274 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2276
2647 for (;;) 2277 for (;;)
2648 { 2278 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2650 break; 2280 break;
… …
2656 if (ch == C0_LF) 2286 if (ch == C0_LF)
2657 nlines++; 2287 nlines++;
2658 2288
2659 refresh_count++; 2289 refresh_count++;
2660 2290
2661 if (!(options & Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2292 {
2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2296 {
2664 refreshnow = true; 2297 refreshnow = true;
2665 ch = NOCHAR; 2298 ch = NOCHAR;
2666 break; 2299 break;
2300 }
2667 } 2301 }
2668 2302
2669 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2671 { 2305 {
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2672 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2309
2673 nlines = 0; 2310 nlines = 0;
2674 str = buf; 2311 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2312 eol = str + min (ncol, UBUFSIZ);
2676 } 2313 }
2677 2314
… …
2690 2327
2691 seq_begin = cmdbuf_ptr; 2328 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2329 ch = next_char ();
2693 } 2330 }
2694 2331
2332 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2695 scr_add_lines (buf, nlines, str - buf); 2334 scr_add_lines (buf, str - buf, nlines);
2696 2335
2697 /* 2336 /*
2698 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2699 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2700 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2701 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2340 */
2703 if (refreshnow) 2341 if (refreshnow)
2704 { 2342 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++;
2707 else
2708 {
2709 flag = true; 2343 flag = true;
2710 scr_refresh (refresh_type); 2344 scr_refresh ();
2711 } 2345 want_refresh = 1;
2712 } 2346 }
2713 2347
2714 } 2348 }
2715 else 2349 else
2716 { 2350 {
… …
2730 } 2364 }
2731 2365
2732 return flag; 2366 return flag;
2733} 2367}
2734 2368
2735// read the next octet
2736unicode_t
2737rxvt_term::next_octet ()
2738{
2739 return cmdbuf_ptr < cmdbuf_endp
2740 ? *cmdbuf_ptr++
2741 : NOCHAR;
2742}
2743
2744// read the next character 2369// read the next character
2745unicode_t 2370wchar_t
2746rxvt_term::next_char () 2371rxvt_term::next_char () NOTHROW
2747{ 2372{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2374 {
2750 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2752 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2753 2378
2754 wchar_t wc; 2379 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2381
2757 if (len == (size_t)-2) 2382 if (len == (size_t)-2)
2758 { 2383 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2384 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2386 break;
2762 } 2387 }
2763 2388
2764 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2766 2391
2767 // assume wchar == unicode 2392 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2394 return wc & UNICODE_MASK;
2770 } 2395 }
2771 2396
2772 return NOCHAR; 2397 return NOCHAR;
2773} 2398}
2399
2400// read the next octet
2401uint32_t
2402rxvt_term::next_octet () NOTHROW
2403{
2404 return cmdbuf_ptr < cmdbuf_endp
2405 ? (unsigned char)*cmdbuf_ptr++
2406 : NOCHAR;
2407}
2408
2409static class out_of_input out_of_input;
2774 2410
2775/* rxvt_cmd_getc () - Return next input character */ 2411/* rxvt_cmd_getc () - Return next input character */
2776/* 2412/*
2777 * Return the next input character after first passing any keyboard input 2413 * Return the next input character after first passing any keyboard input
2778 * to the command. 2414 * to the command.
2779 */ 2415 */
2780unicode_t 2416wchar_t
2781rxvt_term::cmd_getc () 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2782{ 2418{
2783 unicode_t c = next_char (); 2419 wchar_t c = next_char ();
2784 2420
2785 if (c == NOCHAR) 2421 if (c == NOCHAR)
2786 throw out_of_input; 2422 throw out_of_input;
2787 2423
2788 return c; 2424 return c;
2789} 2425}
2790 2426
2791unicode_t 2427uint32_t
2792rxvt_term::cmd_get8 () 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2793{ 2429{
2794 unicode_t c = next_octet (); 2430 uint32_t c = next_octet ();
2795 2431
2796 if (c == NOCHAR) 2432 if (c == NOCHAR)
2797 throw out_of_input; 2433 throw out_of_input;
2798 2434
2799 return c; 2435 return c;
… …
2863 { 2499 {
2864 if ((buf[len++] = cmd_getc ()) == 'i') 2500 if ((buf[len++] = cmd_getc ()) == 'i')
2865 break; /* done = 1 */ 2501 break; /* done = 1 */
2866 } 2502 }
2867 } 2503 }
2868 2504
2869 for (i = 0; i < len; i++) 2505 for (i = 0; i < len; i++)
2870 if (putc (buf[i], fd) == EOF) 2506 if (putc (buf[i], fd) == EOF)
2871 { 2507 {
2872 done = 1; 2508 done = 1;
2873 break; 2509 break;
… …
2899 case C0_ESC: 2535 case C0_ESC:
2900 process_escape_seq (); 2536 process_escape_seq ();
2901 break; 2537 break;
2902 case C0_ENQ: /* terminal Status */ 2538 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 2539 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2540 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 2541 else
2907 tt_write ((unsigned char *)VT100_ANS, 2542 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 2543 break;
2910 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2911 scr_bell (); 2545 scr_bell ();
2912 break; 2546 break;
2913 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
… …
2937 process_dcs_seq (); 2571 process_dcs_seq ();
2938 break; 2572 break;
2939 case 0x9b: /* CSI */ 2573 case 0x9b: /* CSI */
2940 process_csi_seq (); 2574 process_csi_seq ();
2941 break; 2575 break;
2942 case 0x9d: /* CSI */ 2576 case 0x9d: /* OSC */
2943 process_osc_seq (); 2577 process_osc_seq ();
2944 break; 2578 break;
2945#endif 2579#endif
2946 } 2580 }
2947} 2581}
… …
3037 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
3038 break; 2672 break;
3039 case '+': 2673 case '+':
3040 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
3041 break; 2675 break;
3042#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3043 case '6': 2677 case '6':
3044 scr_backindex (); 2678 scr_backindex ();
3045 break; 2679 break;
3046#endif 2680#endif
3047 case '7': 2681 case '7':
3048 scr_cursor (SAVE); 2682 scr_cursor (SAVE);
3049 break; 2683 break;
3050 case '8': 2684 case '8':
3051 scr_cursor (RESTORE); 2685 scr_cursor (RESTORE);
3052 break; 2686 break;
3053#if ENABLE_FRILLS 2687#if !ENABLE_MINIMAL
3054 case '9': 2688 case '9':
3055 scr_forwardindex (); 2689 scr_forwardindex ();
3056 break; 2690 break;
3057#endif 2691#endif
3058 case '=': 2692 case '=':
… …
3068 break; 2702 break;
3069 2703
3070 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
3072 { 2706 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 2707 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 2709 }
3076 break; 2710 break;
3077 2711
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 2713 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 2735 process_dcs_seq ();
3102 break; 2736 break;
3103 2737
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 2739 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 2740 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 2741 break; /* steal obsolete ESC [ c */
3109 2742
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3111 case C1_CSI: /* ESC [ */ 2744 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 2745 process_csi_seq ();
… …
3176 unicode_t ch, priv, i; 2809 unicode_t ch, priv, i;
3177 unsigned int nargs, p; 2810 unsigned int nargs, p;
3178 int n, ndef; 2811 int n, ndef;
3179 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
3180 2813
3181 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
3182 arg[--nargs] = 0; 2815 nargs = 0;
3183 2816
3184 priv = 0; 2817 priv = 0;
3185 ch = cmd_getc (); 2818 ch = cmd_getc ();
3186 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
3187 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
… …
3221 ndef = get_byte_array_bit (csi_defaults, i); 2854 ndef = get_byte_array_bit (csi_defaults, i);
3222 for (p = 0; p < nargs; p++) 2855 for (p = 0; p < nargs; p++)
3223 if (arg[p] == -1) 2856 if (arg[p] == -1)
3224 arg[p] = ndef; 2857 arg[p] = ndef;
3225 2858
3226#ifdef DEBUG_CMD
3227 fprintf (stderr, "CSI ");
3228 for (p = 0; p < nargs; p++)
3229 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3230 fprintf (stderr, "%c\n", ch);
3231#endif
3232
3233 /* 2859 /*
3234 * private mode handling 2860 * private mode handling
3235 */ 2861 */
3236 if (priv) 2862 if (priv)
3237 { 2863 {
3238 switch (priv) 2864 switch (priv)
3239 { 2865 {
3240 case '>': 2866 case '>':
3241 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2868 {
2869 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2871 //
2872 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2873 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2874 // that we do not support xterm mouse reporting (should be 95 when we do).
2875 //
2876 tt_printf ("\033[>%d;94;0c", 'U');
2877 }
3243 break; 2878 break;
3244 case '?': 2879 case '?':
3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3246 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
3247 break; 2882 break;
… …
3352 2987
3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2988 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3354 arg[0] = -arg[0]; 2989 arg[0] = -arg[0];
3355 /* FALLTHROUGH */ 2990 /* FALLTHROUGH */
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2991 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2992 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 2993 break;
3359 2994
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2995 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 2996 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 2997 break;
3364 2998
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 3000 process_sgr_mode (nargs, arg);
3367 break; 3001 break;
… …
3374 break; 3008 break;
3375 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
3376 scr_report_position (); 3010 scr_report_position ();
3377 break; 3011 break;
3378 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3013 if (option (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3015 break;
3382 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3018 break;
… …
3451 break; 3085 break;
3452 case CSI_75: 3086 case CSI_75:
3453 scr_cursor (RESTORE); 3087 scr_cursor (RESTORE);
3454 break; 3088 break;
3455 3089
3456#if ENABLE_FRILLS 3090#if !ENABLE_MINIMAL
3457 case CSI_74: 3091 case CSI_74:
3458 process_window_ops (arg, nargs); 3092 process_window_ops (arg, nargs);
3459 break; 3093 break;
3460#endif 3094#endif
3461 3095
… …
3468 break; 3102 break;
3469 } 3103 }
3470} 3104}
3471/*}}} */ 3105/*}}} */
3472 3106
3473#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
3474/* ARGSUSED */ 3108/* ARGSUSED */
3475void 3109void
3476rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3110rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3477{ 3111{
3478 int x, y; 3112 int x, y;
3479 XWindowAttributes wattr; 3113 XWindowAttributes wattr;
3480 Window wdummy; 3114 Window wdummy;
3481 dDisp; 3115
3116 dLocal (Display *, dpy);
3482 3117
3483 if (nargs == 0) 3118 if (nargs == 0)
3484 return; 3119 return;
3485 3120
3486 switch (args[0]) 3121 switch (args[0])
3487 { 3122 {
3488 /* 3123 /*
3489 * commands 3124 * commands
3490 */ 3125 */
3491 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3492 XMapWindow (disp, parent[0]); 3127 XMapWindow (dpy, parent[0]);
3493 break; 3128 break;
3494 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3495 XIconifyWindow (disp, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent[0], display->screen);
3496 break; 3131 break;
3497 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3498 XMoveWindow (disp, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent[0], args[1], args[2]);
3499 break; 3134 break;
3500 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3502 break; 3137 break;
3503 case 5: /* raise window */ 3138 case 5: /* raise window */
3504 XRaiseWindow (disp, parent[0]); 3139 XRaiseWindow (dpy, parent[0]);
3505 break; 3140 break;
3506 case 6: /* lower window */ 3141 case 6: /* lower window */
3507 XLowerWindow (disp, parent[0]); 3142 XLowerWindow (dpy, parent[0]);
3508 break; 3143 break;
3509 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3510 scr_touch (true); 3145 scr_touch (true);
3511 break; 3146 break;
3512 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3519 if (args[0] >= 24) /* set height (chars) */ 3154 if (args[0] >= 24) /* set height (chars) */
3520 set_widthheight ((unsigned int)width, 3155 set_widthheight ((unsigned int)width,
3521 (unsigned int) (args[1] * fheight)); 3156 (unsigned int) (args[1] * fheight));
3522 break; 3157 break;
3523 3158
3524
3525 /* 3159 /*
3526 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3527 */ 3161 */
3528 case 11: /* report window state */ 3162 case 11: /* report window state */
3529 XGetWindowAttributes (disp, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent[0], &wattr);
3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3531 break; 3165 break;
3532 case 13: /* report window position */ 3166 case 13: /* report window position */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 XTranslateCoordinates (disp, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent[0], wattr.root,
3535 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3536 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3537 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3538 break; 3172 break;
3539 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3540 XGetWindowAttributes (disp, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent[0], &wattr);
3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3542 break; 3176 break;
3543 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3544 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3545 break; 3179 break;
… …
3547 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3548 break; 3182 break;
3549 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3550 { 3184 {
3551 char *s; 3185 char *s;
3552 XGetIconName (disp, parent[0], &s); 3186 XGetIconName (dpy, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3188 XFree (s);
3555 } 3189 }
3556 break; 3190 break;
3557 case 21: /* report window title */ 3191 case 21: /* report window title */
3558 { 3192 {
3559 char *s; 3193 char *s;
3560 XFetchName (disp, parent[0], &s); 3194 XFetchName (dpy, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3196 XFree (s);
3563 } 3197 }
3564 break; 3198 break;
3565 } 3199 }
3566} 3200}
… …
3569/*----------------------------------------------------------------------*/ 3203/*----------------------------------------------------------------------*/
3570/* 3204/*
3571 * get input up until STRING TERMINATOR (or BEL) 3205 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3206 * ends_how is terminator used. returned input must be free()'d
3573 */ 3207 */
3574unsigned char * 3208char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3209rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3210{
3577 unicode_t ch; 3211 unicode_t ch;
3578 bool seen_esc = false; 3212 bool seen_esc = false;
3579 unsigned int n = 0; 3213 unsigned int n = 0;
… …
3593 seen_esc = true; 3227 seen_esc = true;
3594 continue; 3228 continue;
3595 } 3229 }
3596 else if (ch == C0_BEL || ch == CHAR_ST) 3230 else if (ch == C0_BEL || ch == CHAR_ST)
3597 break; 3231 break;
3232 else if (ch == C0_SYN)
3233 ch = cmd_get8 ();
3598 else if (ch < 0x20) 3234 else if (ch < 0x20)
3599 return NULL; /* other control character - exit */ 3235 return NULL; /* other control character - exit */
3600 3236
3601 seen_esc = false; 3237 seen_esc = false;
3602 3238
3603 if (n >= STRING_MAX - 1) 3239 if (n >= STRING_MAX - 1)
3604 // stop at some sane length 3240 // stop at some sane length
3605 return NULL; 3241 return NULL;
3606 3242
3607 if (ch == C0_SYN)
3608 string[n++] = cmd_get8 ();
3609 else
3610 string[n++] = ch; 3243 string[n++] = ch;
3611 } 3244 }
3612 3245
3613 string[n++] = '\0'; 3246 string[n++] = '\0';
3614 3247
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3248 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3249
3617 return (unsigned char *)rxvt_wcstombs (string); 3250 return rxvt_wcstombs (string);
3618} 3251}
3619 3252
3620/*----------------------------------------------------------------------*/ 3253/*----------------------------------------------------------------------*/
3621/* 3254/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3256 */
3624void 3257void
3625rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
3626{ 3259{
3627 unsigned char *s; 3260 char *s;
3628 unicode_t eh; 3261 unicode_t eh;
3629 3262
3630 /* 3263 /*
3631 * Not handled yet 3264 * Not handled yet
3632 */ 3265 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3284 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3285 arg = arg * 10 + (ch - '0');
3653 3286
3654 if (ch == ';') 3287 if (ch == ';')
3655 { 3288 {
3656 unsigned char *s = get_to_st (eh); 3289 char *s = get_to_st (eh);
3657 3290
3658 if (s) 3291 if (s)
3659 { 3292 {
3660 process_xterm_seq (arg, (char *)s, eh); 3293 process_xterm_seq (arg, s, eh);
3661 free (s); 3294 free (s);
3662 } 3295 }
3663 } 3296 }
3664} 3297}
3665 3298
3666void 3299void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3300rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3301{
3669 if (str[0] == '?' && !str[1]) 3302 if (str[0] == '?' && !str[1])
3670 { 3303 {
3671 unsigned short r, g, b; 3304 rgba c;
3672 pix_colors_focused[color].get (display, r, g, b); 3305 pix_colors_focused[color].get (c);
3306
3307#if XFT
3308 if (c.a != rgba::MAX_CC)
3309 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3310 else
3311#endif
3673 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3312 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3674 } 3313 }
3675 else 3314 else
3676 set_window_color (color, str); 3315 set_window_color (color, str);
3677} 3316}
3678 3317
3679/* 3318/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3319 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3320 */
3682void 3321void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3322rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3323{
3685 int changed = 0;
3686 int color; 3324 int color;
3687 char *buf, *name; 3325 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3326 bool query = str[0] == '?' && !str[1];
3689 int saveop = op; 3327 int saveop = op;
3690 dDisp; 3328
3329 dLocal (Display *, dpy);
3691 3330
3692 assert (str != NULL); 3331 assert (str != NULL);
3332
3333 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3334 return;
3335
3693 switch (op) 3336 switch (op)
3694 { 3337 {
3695 case XTerm_name: 3338 case XTerm_name:
3696 set_title (str); 3339 set_title (str);
3697 /* FALLTHROUGH */ 3340 /* FALLTHROUGH */
… …
3711 unsigned long bytes_after; 3354 unsigned long bytes_after;
3712 unsigned char *value = 0; 3355 unsigned char *value = 0;
3713 const char *str = ""; 3356 const char *str = "";
3714 3357
3715 if (prop 3358 if (prop
3716 && XGetWindowProperty (disp, parent[0], 3359 && XGetWindowProperty (dpy, parent[0],
3717 prop, 0, 1<<16, 0, AnyPropertyType, 3360 prop, 0, 1<<16, 0, AnyPropertyType,
3718 &actual_type, &actual_format, 3361 &actual_type, &actual_format,
3719 &nitems, &bytes_after, &value) == Success 3362 &nitems, &bytes_after, &value) == Success
3720 && actual_type != None 3363 && actual_type != None
3721 && actual_format == 8) 3364 && actual_format == 8)
3722 str = (const char *)(value); 3365 str = (const char *)(value);
3723 3366
3724 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3367 tt_printf ("\033]%d;%s%c", op, str, resp);
3725 3368
3726 XFree (value); 3369 XFree (value);
3727 } 3370 }
3728 else 3371 else
3729 { 3372 {
… …
3733 { 3376 {
3734 *eq = 0; 3377 *eq = 0;
3735 set_utf8_property (display->atom (str), eq + 1); 3378 set_utf8_property (display->atom (str), eq + 1);
3736 } 3379 }
3737 else 3380 else
3738 XDeleteProperty (disp, parent[0], 3381 XDeleteProperty (dpy, parent[0],
3739 display->atom (str)); 3382 display->atom (str));
3740 } 3383 }
3741 break; 3384 break;
3742 3385
3743 case XTerm_Color: 3386 case XTerm_Color:
… …
3745 { 3388 {
3746 if ((name = strchr (buf, ';')) == NULL) 3389 if ((name = strchr (buf, ';')) == NULL)
3747 break; 3390 break;
3748 3391
3749 *name++ = '\0'; 3392 *name++ = '\0';
3750 color = atoi (buf); 3393 color = atoi (buf) + minCOLOR;
3751 3394
3752 if (color < 0 || color >= TOTAL_COLORS) 3395 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3753 break; 3396 break;
3754 3397
3755 if ((buf = strchr (name, ';')) != NULL) 3398 if ((buf = strchr (name, ';')) != NULL)
3756 *buf++ = '\0'; 3399 *buf++ = '\0';
3757 3400
3758 if (name[0] == '?' && !name[1]) 3401 process_color_seq (op, color, name, resp);
3759 {
3760 unsigned short r, g, b;
3761 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3762 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3763 }
3764 else
3765 set_window_color (color + minCOLOR, name);
3766 } 3402 }
3767 break; 3403 break;
3768 case XTerm_Color00: 3404 case XTerm_Color00:
3769 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3405 process_color_seq (op, Color_fg, str, resp);
3770 break; 3406 break;
3771 case XTerm_Color01: 3407 case XTerm_Color01:
3772 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3408 process_color_seq (op, Color_bg, str, resp);
3773 break; 3409 break;
3774#ifndef NO_CURSORCOLOR 3410#ifndef NO_CURSORCOLOR
3775 case XTerm_Color_cursor: 3411 case XTerm_Color_cursor:
3776 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3412 process_color_seq (op, Color_cursor, str, resp);
3777 break; 3413 break;
3778#endif 3414#endif
3779 case XTerm_Color_pointer_fg: 3415 case XTerm_Color_pointer_fg:
3780 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3416 process_color_seq (op, Color_pointer_fg, str, resp);
3781 break; 3417 break;
3782 case XTerm_Color_pointer_bg: 3418 case XTerm_Color_pointer_bg:
3783 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3419 process_color_seq (op, Color_pointer_bg, str, resp);
3784 break; 3420 break;
3785#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3786 case XTerm_Color_BD:
3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3788 break;
3789 case XTerm_Color_UL:
3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3791 break;
3792 case XTerm_Color_RV: 3422 case XTerm_Color_RV:
3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3423 process_color_seq (op, Color_RV, str, resp);
3424 break;
3425 case Rxvt_Color_BD:
3426 case URxvt_Color_BD:
3427 process_color_seq (op, Color_BD, str, resp);
3428 break;
3429 case Rxvt_Color_UL:
3430 case URxvt_Color_UL:
3431 process_color_seq (op, Color_UL, str, resp);
3794 break; 3432 break;
3795 case URxvt_Color_IT: 3433 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3434 process_color_seq (op, Color_IT, str, resp);
3797 break; 3435 break;
3798#endif 3436#endif
3799#if TRANSPARENT && TINTING 3437#if ENABLE_TRANSPARENCY && TINTING
3800 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3440
3802 check_our_parents (); 3441 check_our_parents ();
3442
3803 if (am_transparent) 3443 if (am_transparent)
3804 want_full_refresh = want_refresh = 1; 3444 want_full_refresh = want_refresh = 1;
3805 break;
3806#endif
3807 3445
3808 case XTerm_Pixmap: 3446 break;
3809 if (*str != ';') 3447#endif
3810 { 3448
3811#if XPM_BACKGROUND 3449#if XPM_BACKGROUND
3450 case Rxvt_Pixmap:
3451 {
3452 if (*str != ';')
3453 {
3812 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3813 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3814#endif
3815 scr_touch (true); 3456 scr_touch (true);
3816 } 3457 }
3458
3459 int changed = 0;
3460
3817 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3818 { 3462 {
3819 str++; 3463 str++;
3820#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3821 changed += scale_pixmap (str);
3822#endif
3823 } 3465 }
3824 3466
3825 if (changed) 3467 if (changed)
3826 { 3468 {
3827#ifdef XPM_BACKGROUND
3828 resize_pixmap (); 3469 resize_pixmap ();
3829#endif
3830 scr_touch (true); 3470 scr_touch (true);
3831 } 3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3476 }
3832 break; 3477 break;
3478#endif
3833 3479
3834 case XTerm_restoreFG: 3480 case Rxvt_restoreFG:
3835 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3836 break; 3482 break;
3837 case XTerm_restoreBG: 3483 case Rxvt_restoreBG:
3838 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3839 break; 3485 break;
3840 3486
3841 case XTerm_logfile: 3487 case XTerm_logfile:
3842 // TODO, when secure mode? 3488 // TODO, when secure mode?
3843 break; 3489 break;
3844 3490
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0 3491#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3492 case Rxvt_dumpscreen: /* no error notices */
3853 { 3493 {
3854 int fd; 3494 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3495 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3496 {
3857 scr_dump (fd); 3497 scr_dump (fd);
… …
3868 case URxvt_italicFont: 3508 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3509 case URxvt_boldItalicFont:
3870#endif 3510#endif
3871 if (query) 3511 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3512 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3513 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3514 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3515 resp);
3876 else 3516 else
3877 { 3517 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3518 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3881 allocated.push_back ((void *)res); 3521 allocated.push_back ((void *)res);
3882 set_fonts (); 3522 set_fonts ();
3883 } 3523 }
3884 break; 3524 break;
3885 3525
3886#if ENABLE_FRILLS 3526 case URxvt_version:
3527 if (query)
3528 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3529 op,
3530 rs[Rs_name], VERSION[0], VERSION[2],
3531 resp);
3532 break;
3533
3534#if !ENABLE_MINIMAL
3887 case URxvt_locale: 3535 case URxvt_locale:
3888 if (query) 3536 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3537 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3890 else 3538 else
3891 { 3539 {
3892 set_locale (str); 3540 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3541 pty->set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3542 init_xlocale ();
3895 } 3543 }
3896 break; 3544 break;
3897 3545
3898 case URxvt_view_up: 3546 case URxvt_view_up:
3899 case URxvt_view_down: 3547 case URxvt_view_down:
3548 {
3900 int lines = atoi (str); 3549 int lines = atoi (str);
3901 3550
3902 if (lines) 3551 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 3552 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 3553 else
3905 {
3906 scr_erase_savelines (); 3554 scr_erase_savelines ();
3907 } 3555 }
3908 3556
3557 break;
3558#endif
3559
3560#if ENABLE_PERL
3561 case URxvt_perl:
3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3563 ; // no responses yet
3909 break; 3564 break;
3910#endif 3565#endif
3911 } 3566 }
3912} 3567}
3913/*----------------------------------------------------------------------*/ 3568/*----------------------------------------------------------------------*/
… …
3944 return state; 3599 return state;
3945} 3600}
3946 3601
3947/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3948void 3603void
3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3950{ 3605{
3951 unsigned int i, j; 3606 unsigned int i, j;
3952 int state; 3607 int state;
3953 3608
3954 static const struct 3609 static const struct
… …
3965 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
3966 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
3967 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode 3623 // 8, bi-directional support mode
3969 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc
3971 { menuBar_esc, PrivMode_menuBar },
3972#endif
3973 // 18, 19 printing-related 3625 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor },
3975#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 3629#endif
… …
4022 } 3674 }
4023 3675
4024 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
4025 switch (arg[i]) 3677 switch (arg[i])
4026 { 3678 {
3679#if ENABLE_STYLES
3680 case 1021:
3681 set_option (Opt_intensityStyles, mode);
3682
3683 scr_touch (true);
3684 break;
3685#endif
4027 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4028 case 1049: 3687 case 1049:
4029 if (options & Opt_secondaryScreen) 3688 if (option (Opt_secondaryScreen))
4030 if (mode == 0) 3689 if (mode == 0)
4031 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4032 else if (mode == 1) 3691 else if (mode == 1)
4033 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4034 break; 3693 break;
… …
4049 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 3711 break;
4053 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 3713 set_option (Opt_jumpScroll, !state);
4058 break; 3714 break;
4059 case 5: /* reverse video */ 3715 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
4061 break; 3717 break;
4062 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
… …
4068 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~PrivMode_MouseX11;
4072 break; 3728 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4081 case scrollBar_esc: 3730 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4083 { 3732 {
4084 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
… …
4103#if 0 3752#if 0
4104 case 1001: 3753 case 1001:
4105 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4106#endif 3755#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 3756 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 3757 set_option (Opt_scrollTtyOutput, !state);
4112 break; 3758 break;
4113 case 1011: /* scroll to bottom on key press */ 3759 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 3760 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 3761 break;
4119 case 1047: /* secondary screen w/ clearing last */ 3762 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 3763 if (option (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 3764 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 3765 scr_erase_screen (2);
4123 scr_change_screen (state); 3766 scr_change_screen (state);
4124 break; 3767 break;
4125 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 3769 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 3770 if (option (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 3772 scr_erase_screen (2);
4130 break; 3773 break;
4131 default: 3774 default:
4132 break; 3775 break;
… …
4260 scr_color (Color_bg, Color_bg); 3903 scr_color (Color_bg, Color_bg);
4261 break; 3904 break;
4262 3905
4263 //case 50: // not variable spacing 3906 //case 50: // not variable spacing
4264 3907
4265#ifndef NO_BRIGHTCOLOR 3908#if !ENABLE_MINIMAL
4266 case 90: 3909 case 90:
4267 case 91: /* set bright fg color */ 3910 case 91: /* set bright fg color */
4268 case 92: 3911 case 92:
4269 case 93: 3912 case 93:
4270 case 94: 3913 case 94:
… …
4282 case 106: 3925 case 106:
4283 case 107: 3926 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3927 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 3928 break;
4286#endif 3929#endif
4287
4288 } 3930 }
4289 } 3931 }
4290} 3932}
4291/*}}} */ 3933/*}}} */
4292 3934
… …
4316 */ 3958 */
4317void 3959void
4318rxvt_term::tt_printf (const char *fmt,...) 3960rxvt_term::tt_printf (const char *fmt,...)
4319{ 3961{
4320 va_list arg_ptr; 3962 va_list arg_ptr;
4321 unsigned char buf[256]; 3963 char buf[256];
4322 3964
4323 va_start (arg_ptr, fmt); 3965 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3966 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 3967 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 3968 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 3973 * or generated by us in response to a query ESC sequence.
4332 */ 3974 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 3976
4335void 3977void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3978rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 3979{
3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3981 return;
3982
3983 if (pty->pty < 0)
3984 return;
3985
4338 if (v_buflen == 0) 3986 if (v_buflen == 0)
4339 { 3987 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 3989
4342 if ((unsigned int)written == len) 3990 if ((unsigned int)written == len)
4343 return; 3991 return;
4344 3992
4345 data += written; 3993 data += written;
4346 len -= written; 3994 len -= written;
4347 } 3995 }
4348 3996
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 3998
4351 memcpy (v_buffer + v_buflen, data, len); 3999 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4000 v_buflen += len;
4353 4001
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4002 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355} 4003}
4356 4004
4357void rxvt_term::pty_write () 4005void rxvt_term::pty_write ()
4358{ 4006{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4008
4361 if (written > 0) 4009 if (written > 0)
4362 { 4010 {
4363 v_buflen -= written; 4011 v_buflen -= written;
4364 4012
… …
4373 } 4021 }
4374 4022
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4023 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4024 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4025 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4026 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4027}
4381 4028
4382/*----------------------- end-of-file (C source) -----------------------*/ 4029/*----------------------- end-of-file (C source) -----------------------*/
4383 4030

Diff Legend

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