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

Diff Legend

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