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

Diff Legend

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