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.197 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

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

Diff Legend

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