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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
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-2004 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#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
54 59
55/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
56 61
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61 63
62#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
63 65
64#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
113 XK_Escape, 0x238b, 115 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 116 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 117 XK_Print, 0x2399,
116 118
117 XK_space, 0x2423, 119 XK_space, 0x2423,
120
121#ifdef XK_KP_Begin
122 XK_KP_Prior, 0x21de,
123 XK_KP_Next, 0x21df,
124 XK_KP_Begin, 0x2320,
125 XK_KP_Insert, 0x2380,
126 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 127 XK_KP_Space, 0x2422,
128#endif
119 0, 129 0,
120}; 130};
121 131
122void 132void
123rxvt_term::iso14755_54 (int x, int y) 133rxvt_term::iso14755_54 (int x, int y)
124{ 134{
125 x = Pixel2Col (x); 135 x = Pixel2Col (x);
126 y = Pixel2Row (y); 136 y = Pixel2Row (y);
127 137
128 if (x < 0 || x >= TermWin.ncol 138 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 139 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 140 return;
131 141
132 for (;;) 142 for (;;)
133 { 143 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 144 const line_t &l = ROW(y + view_start);
145
146 text_t t = l.t[x];
135 147
136 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
137 { 149 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 150 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 151 iso14755buf = ISO_14755_54;
140 break; 152 break;
141 } 153 }
142 154
143 x--; 155 x--;
144 } 156 }
145
146} 157}
147#endif
148 158
149#if ENABLE_OVERLAY
150void 159void
151rxvt_term::iso14755_51 (wchar_t ch) 160rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 161{
162 rxvt_fontset *fs = FONTSET (r);
163 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 164 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 165 int len;
155 166
167 fname = rxvt_utf8towcs (f->name);
168
156#if ENABLE_COMBINING 169# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 170 if (IS_COMPOSE (ch))
158 { 171 {
159 len = rxvt_composite.expand (ch, 0); 172 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 173 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 174 rxvt_composite.expand (ch, chr);
162 } 175 }
163 else 176 else
164#endif 177# endif
165 { 178 {
179 ch2 = ch;
180
166 alloc = 0; 181 alloc = 0;
167 chr = &ch; 182 chr = &ch2;
168 len = 1; 183 len = 1;
169 } 184 }
170 185
186 char attr[80]; // plenty
187
188 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
189 (int)r,
190 fgcolor_of (r), bgcolor_of (r),
191 r & RS_Bold ? " bold" : "",
192 r & RS_Italic ? " italic" : "",
193 r & RS_Blink ? " blink" : "",
194 r & RS_RVid ? " rvid" : "",
195 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : "");
197
198 int width = wcswidth (fname, wcslen (fname));
199
200 max_it (width, 8+5); // for char + hey
201 max_it (width, strlen (attr));
202
203 if (y >= 0)
204 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
206 x = 0;
207 }
208
171 scr_overlay_new (0, -1, 8 + 5, len); 209 scr_overlay_new (x, y, width, len + 2);
210
211 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 212
173 for (int y = 0; y < len; y++) 213 for (int y = 0; y < len; y++)
174 { 214 {
175 char buf[9]; 215 char buf[9];
176 216
177 ch = *chr++; 217 ch = *chr++;
178 218
179 sprintf (buf, "%8x", ch); 219 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 220 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 221 scr_overlay_set (9, y, '=');
182#if !UNICODE3 222# if !UNICODE3
183 if (ch >= 0x10000) 223 if (ch >= 0x10000)
184 ch = 0xfffd; 224 ch = 0xfffd;
185#endif 225# endif
186 scr_overlay_set (11, y, ch); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
187 scr_overlay_set (12, y, NOCHAR); 229 scr_overlay_set (12, y, NOCHAR, r);
188 } 230 }
189 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname);
239
240 free (fname);
241
190#if ENABLE_COMBINING 242# if ENABLE_COMBINING
191 if (alloc) 243 if (alloc)
192 delete [] alloc; 244 delete [] alloc;
193#endif 245# endif
194} 246}
195#endif 247#endif
196 248
197void 249void
198rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
215 mb[0] = ch[0]; 267 mb[0] = ch[0];
216 len = 1; 268 len = 1;
217 } 269 }
218 270
219 if (len > 0) 271 if (len > 0)
220 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
221 else 273 else
222 scr_bell (); 274 scr_bell ();
223 } 275 }
224 276
225 iso14755buf = 0; 277 iso14755buf = 0;
… …
249rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
250{ 302{
251 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
252 unsigned int newlen; 304 unsigned int newlen;
253 KeySym keysym; 305 KeySym keysym;
254#ifdef DEBUG_CMD
255 static int debug_key = 1; /* accessible by a debugger only */
256#endif
257 int valid_keysym; 306 int valid_keysym;
258 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
259 308
260 /* 309 /*
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
263 * 312 *
264 * Always permit `shift' to override the current setting 313 * Always permit `shift' to override the current setting
265 */ 314 */
266 shft = (ev.state & ShiftMask); 315 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 316 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 317 meta = ev.state & ModMetaMask;
269 318
270 if (numlock_state || (ev.state & ModNumLockMask)) 319 if (numlock_state || (ev.state & ModNumLockMask))
271 { 320 {
272 numlock_state = (ev.state & ModNumLockMask); 321 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 322 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
281 Status status_return; 330 Status status_return;
282 331
283#if 0 332#if 0
284#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
285 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
287 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
288 else 337 else
289#endif 338#endif
290#endif 339#endif
291 { 340 {
… …
293 342
294 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
298 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
301 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 353 SET_LOCALE (locale);
303 354
304 if (status_return == XLookupChars 355 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
… …
326 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
327 } 378 }
328 else 379 else
329#endif 380#endif
330 { 381 {
331 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
332 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
333 } 384 }
334 385
335 if (valid_keysym) 386 if (valid_keysym)
336 { 387 {
388#ifdef KEYSYM_RESOURCE
389 if (keyboard->dispatch (this, keysym, ev.state))
390 return;
391#endif
392
337 if (TermWin.saveLines) 393 if (saveLines)
338 { 394 {
339#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 396 if (!ctrl && !meta)
341#else 397#else
342 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
343#endif 399#endif
344 { 400 {
345 int lnsppg; 401 int lnsppg;
346 402
347#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 405#else
350 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
351#endif 407#endif
352 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
353 { 409 {
354 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
355 return; 411 return;
… …
383 scr_move_to (0, 1); 439 scr_move_to (0, 1);
384 return; 440 return;
385 } 441 }
386 else if (keysym == XK_End) 442 else if (keysym == XK_End)
387 { 443 {
388 scr_move_to (1, 0); 444 scr_move_to (1, 1);
389 return; 445 return;
390 } 446 }
391 } 447 }
392#endif 448#endif
393 } 449 }
… …
404 { 460 {
405 switch (keysym) 461 switch (keysym)
406 { 462 {
407 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
410 return; 466 return;
411#if TODO // TODO 467#if TODO
412 /* rxvt extras */ 468 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 470 change_font (FONT_UP);
415 return; 471 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 472 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 531 }
476#endif 532#endif
477 533
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 534 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 535 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 536 {
506 newlen = 1; 537 newlen = 1;
507 switch (keysym) 538 switch (keysym)
508 { 539 {
509#ifndef NO_BACKSPACE_KEY 540#ifndef NO_BACKSPACE_KEY
… …
517 else 548 else
518 strcpy (kbuf, key_backspace); 549 strcpy (kbuf, key_backspace);
519 break; 550 break;
520#endif 551#endif
521#ifndef NO_DELETE_KEY 552#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
522 case XK_Delete: 563 case XK_Delete:
523 strcpy (kbuf, key_delete); 564 strcpy (kbuf, key_delete);
524 break; 565 break;
525#endif 566#endif
526 case XK_Tab: 567 case XK_Tab:
… …
629#ifdef XK_KP_Begin 670#ifdef XK_KP_Begin
630 case XK_KP_Begin: 671 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 672 strcpy (kbuf, "\033Ou");
632 break; 673 break;
633 674
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 675#endif
642 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
… …
677 break; 711 break;
678 712
679 case XK_Find: 713 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
681 break; 715 break;
716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
682 case XK_Insert: 727 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 728 strcpy (kbuf, "\033[2~");
684 break; 729 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 730#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 731 case DXK_Remove:
… …
776#undef FKEY 821#undef FKEY
777 default: 822 default:
778 newlen = 0; 823 newlen = 0;
779 break; 824 break;
780 } 825 }
826
781 if (newlen) 827 if (newlen)
782 len = strlen (kbuf); 828 len = strlen (kbuf);
783 } 829 }
784 830
785 /* 831 /*
… …
794 else if (ctrl && keysym == XK_minus) 840 else if (ctrl && keysym == XK_minus)
795 { 841 {
796 len = 1; 842 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 843 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 844 }
845 else if (keysym == XK_ISO_Left_Tab)
846 {
847 strcpy (kbuf, "\033[Z");
848 len = 3;
849 }
799 else 850 else
800 { 851 {
801#ifdef META8_OPTION 852#ifdef META8_OPTION
802 /* set 8-bit on */ 853 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
804 { 855 {
805 unsigned char *ch; 856 char *ch;
806 857
807 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
808 *ch |= 0x80; 859 *ch |= 0x80;
809 860
810 meta = 0; 861 meta = 0;
… …
812#endif 863#endif
813 /* nil */ ; 864 /* nil */ ;
814 } 865 }
815 } 866 }
816 867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
817 if (len <= 0) 871 if (len <= 0)
818 return; /* not mapped */ 872 return; /* not mapped */
819 873
820 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 875 if (view_start)
822 { 876 {
823 TermWin.view_start = 0; 877 view_start = 0;
824 want_refresh = 1; 878 want_refresh = 1;
825 } 879 }
826 880
827 /* 881 /*
828 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
843#ifdef META8_OPTION 897#ifdef META8_OPTION
844 && meta_char == C0_ESC 898 && meta_char == C0_ESC
845#endif 899#endif
846 ) 900 )
847 { 901 {
848 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
849 tt_write (&ch, 1); 903 tt_write (&ch, 1);
850 } 904 }
851 905
852#if defined(DEBUG_CMD)
853 /* Display keyboard buffer contents */
854 unsigned char *p;
855 int i;
856
857 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
858 for (i = 0, p = kbuf; i < len; i++, p++)
859 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
860 fprintf (stderr, "'\n");
861#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
863} 907}
864/*}}} */ 908/*}}} */
865 909
866#if (MENUBAR_MAX) 910#if defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */
869unsigned int 911unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
871{ 913{
872 unsigned int n, s; 914 unsigned int n, s;
873 915
874 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
894 936
895 cmd_parse (); 937 cmd_parse ();
896 938
897 return 0; 939 return 0;
898} 940}
899#endif /* MENUBAR_MAX */ 941#endif
900 942
901void 943void
902rxvt_term::flush () 944rxvt_term::flush ()
903{ 945{
946 flush_ev.stop ();
947
904#ifdef TRANSPARENT 948#ifdef TRANSPARENT
905 if (want_full_refresh) 949 if (want_full_refresh)
906 { 950 {
907 want_full_refresh = 0; 951 want_full_refresh = 0;
908 scr_clear (); 952 scr_clear ();
… …
910 } 954 }
911#endif 955#endif
912 956
913 if (want_refresh) 957 if (want_refresh)
914 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
915 scr_refresh (refresh_type); 997 scr_refresh ();
916 scrollbar_show (1); 998 scrollbar_show (1);
917#ifdef USE_XIM 999#ifdef USE_XIM
918 IMSendSpot (); 1000 IMSendSpot ();
919#endif 1001#endif
920 } 1002 }
921 1003
922 display->flush (); 1004 display->flush ();
923
924 flush_ev.stop ();
925} 1005}
926 1006
927void 1007void
928rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
929{ 1009{
930 SET_R (this); 1010 make_current ();
931 SET_LOCALE (locale);
932 1011
933 display->flush (); 1012 display->flush ();
934 1013
935 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
937} 1016}
938 1017
939void 1018void
940rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
941{ 1020{
942 SET_R (this); 1021 make_current ();
943 SET_LOCALE (locale);
944 1022
945 refresh_limit = 1; 1023 refresh_limit = 1;
946 refresh_count = 0; 1024 refresh_count = 0;
947 flush (); 1025 flush ();
948} 1026}
… …
952rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
953{ 1031{
954 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
955 want_refresh = 1; 1033 want_refresh = 1;
956 1034
957 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
958} 1036}
959#endif 1037#endif
960 1038
961#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
962void 1040void
… …
976rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
977{ 1055{
978 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
979 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
980 { 1058 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1; 1059 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
984 } 1061 }
985} 1062}
986#endif 1063#endif
… …
990rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
991{ 1068{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 { 1070 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1; 1072 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
998 } 1074 }
999} 1075}
1000#endif 1076#endif
… …
1005{ 1081{
1006 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1085 {
1010 refresh_type |= SMOOTH_REFRESH; 1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1011 want_refresh = 1; 1089 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1091 }
1014} 1092}
1015#endif 1093#endif
… …
1019{ 1097{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1099
1022 if (CBUFSIZ == n) 1100 if (CBUFSIZ == n)
1023 { 1101 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1103 n = 0;
1026 } 1104 }
1027 1105
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
1031 1109
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1033 1111
1034 if (n > 0) 1112 if (r > 0)
1035 { 1113 {
1036 cmdbuf_endp += n; 1114 cmdbuf_endp += r;
1037 return true; 1115 return true;
1038 } 1116 }
1039 else if (n < 0 && errno != EAGAIN) 1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 {
1119#if HAVE_SCHED_YIELD
1120 if (display->is_local)
1121 event_handler.cw_yield.start ();
1122#endif
1123 }
1124 else
1125 {
1126 pty_ev.stop ();
1127
1128 if (!OPTION (Opt_hold))
1040 destroy (); 1129 destroy ();
1130 }
1041 1131
1042 return false; 1132 return false;
1043} 1133}
1044 1134
1045void 1135void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1137{
1048 SET_R (this); 1138 make_current ();
1049 SET_LOCALE (locale);
1050 1139
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1142 while (pty_fill ())
1056 if (cmd_parse ()) 1143 if (cmd_parse ())
1057 break; 1144 break;
1145
1146 if (revents & EVENT_WRITE)
1147 pty_write ();
1058} 1148}
1059 1149
1060void 1150void
1061rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1062{ 1152{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1064 recolour_cursor (); 1154 recolour_cursor ();
1065 1155
1066#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1157 hidden_pointer = 0;
1068 1158
1069 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif 1161#endif
1072} 1162}
1073 1163
1074#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1075void 1165void
1076rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1077{ 1167{
1078 if (! (options & Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1079 return; 1169 return;
1080 1170
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1082 XFlush (display->display); 1172 XFlush (xdisp);
1083 1173
1084 hidden_pointer = 1; 1174 hidden_pointer = 1;
1085} 1175}
1086 1176
1087void 1177void
1088rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
1089{ 1179{
1090 SET_R (this); 1180 make_current ();
1091 SET_LOCALE (locale);
1092 1181
1093 pointer_blank (); 1182 pointer_blank ();
1094} 1183}
1095#endif 1184#endif
1096 1185
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1230#endif
1142
1143 } 1231 }
1144 1232
1145#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1235 if (key_state & 16)
1148 fputc ('C', stderr); 1236 fputc ('C', stderr);
1149 if (key_state & 4) 1237 if (key_state & 4)
1150 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1242 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1244 button_number,
1157 x + 1, 1245 x + 1,
1158 y + 1); 1246 y + 1);
1159#else 1247#endif
1248
1160 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1162 (32 + x + 1), 1251 (32 + x + 1),
1163 (32 + y + 1)); 1252 (32 + y + 1));
1164#endif
1165} 1253}
1166
1167#ifdef USING_W11LIB
1168void
1169rxvt_W11_process_x_event (XEvent *ev)
1170{
1171 rxvt_t *r = rxvt_get_r ();
1172
1173 x_cb (*ev);
1174}
1175#endif
1176 1254
1177/*{{{ process an X event */ 1255/*{{{ process an X event */
1178void 1256void
1179rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1180{ 1258{
1181 SET_R (this); 1259 make_current ();
1182 SET_LOCALE (locale);
1183 1260
1184#if defined(CURSOR_BLINK) 1261 dLocal (Display *, xdisp);
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1186 {
1187 if (hidden_cursor)
1188 {
1189 hidden_cursor = 0;
1190 want_refresh = 1;
1191 }
1192 1262
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 if (ev.xany.window == vt
1194 } 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1195#endif 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1196
1197#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1199 {
1200 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease)
1203 if (hidden_pointer)
1204 pointer_unblank ();
1205
1206 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank ();
1208 }
1209#endif
1210
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return; 1266 return;
1214#endif
1215 1267
1268 // for XQueryPointer
1216 Window unused_root, unused_child; 1269 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1271 unsigned int unused_mask;
1219 1272
1220 switch (ev.type) 1273 switch (ev.type)
1221 { 1274 {
1222 case KeyPress: 1275 case KeyPress:
1223#if ISO_14755 1276#if ISO_14755
… …
1227 1280
1228 break; 1281 break;
1229 1282
1230 case KeyRelease: 1283 case KeyRelease:
1231 { 1284 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1233 KeySym ks; 1286 KeySym keysym;
1234 1287
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1289#endif
1237 1290
1238#if ENABLE_FRILLS || ISO_14755 1291#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support 1292 // ISO 14755 support
1240 if (iso14755buf) 1293 if (iso14755buf)
… …
1245# endif 1298# endif
1246# if ISO_14755 1299# if ISO_14755
1247 // iso14755 part 5.2 handling: release time 1300 // iso14755 part 5.2 handling: release time
1248 // first: controls 1301 // first: controls
1249 if ((ev.xkey.state & ControlMask) 1302 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f) 1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f))) 1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1252 { 1305 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1254 commit_iso14755 (); 1307 commit_iso14755 ();
1255 return; // case-break; 1308 goto skip_switch;
1256 } 1309 }
1257 1310
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks) 1312 if (i[0] == keysym)
1260 { 1313 {
1261 iso14755buf = ISO_14755_51 | i[1]; 1314 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 (); 1315 commit_iso14755 ();
1263 return; // case-break; 1316 goto skip_switch;
1264 } 1317 }
1265 1318
1266 scr_bell (); 1319 scr_bell ();
1267# endif 1320# endif
1268 iso14755buf = 0; 1321 iso14755buf = 0;
… …
1287 else 1340 else
1288 iso14755buf = 0; 1341 iso14755buf = 0;
1289 } 1342 }
1290#endif 1343#endif
1291 1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1293 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop (); 1351 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R) 1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1296 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1297#endif 1354#endif
1298 break; 1355 break;
1299 } 1356 }
1300 1357
… …
1306 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1307 break; 1364 break;
1308 1365
1309 case ClientMessage: 1366 case ClientMessage:
1310 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1312 destroy ();
1313#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink))
1319 { 1369 {
1320 /* Get Dnd data */ 1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1321 Atom ActualType; 1371 {
1322 int ActualFormat; 1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1323 unsigned char *data; 1373 {
1324 unsigned long Size, RemainingBytes; 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1325 1375 {
1326 XGetWindowProperty (display->display, display->root, 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1327 xa[XA_DNDSELECTION], 1377 destroy ();
1328 0L, 1000000L, 1378 }
1329 False, AnyPropertyType, 1379#if ENABLE_EWMH
1330 &ActualType, &ActualFormat, 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1331 &Size, &RemainingBytes, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1332 &data); 1383 &ev);
1333 XChangeProperty (display->display, display->root, 1384#endif
1334 XA_CUT_BUFFER0, XA_STRING, 1385 }
1335 8, PropModeReplace, 1386 }
1336 data, strlen (data)); 1387#if ENABLE_XEMBED
1337 XFree (data); 1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1389 {
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1340 } 1396 }
1341#endif /* OFFIX_DND */
1342 break; 1397 break;
1343 1398
1344 case MappingNotify: 1399 case MappingNotify:
1345 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1346 break; 1401 break;
… …
1369 break; 1424 break;
1370 } 1425 }
1371 break; 1426 break;
1372 1427
1373 case FocusIn: 1428 case FocusIn:
1374 if (!TermWin.focus) 1429 focus_in ();
1430 break;
1431
1432 case FocusOut:
1433 focus_out ();
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0])
1375 { 1438 {
1376 TermWin.focus = 1; 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1440 ;
1378#ifdef USE_XIM 1441
1379 if (Input_Context != NULL) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1443 {
1381 IMSetStatusPosition (); 1444 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1446 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398 1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1399 } 1454 }
1400 break; 1455 break;
1401 1456
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent)
1447 {
1448 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif
1453 }
1454 break;
1455
1456 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1462
1461 break; 1463 break;
1462 1464
1463 case SelectionClear: 1465 case SelectionClear:
1464 selection_clear (); 1466 selection_clear ();
1465 break; 1467 break;
1466 1468
1467 case SelectionNotify: 1469 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1472 break;
1472 1473
1473 case SelectionRequest: 1474 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1475 break; 1476 break;
1476 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1477 case UnmapNotify: 1486 case UnmapNotify:
1478 TermWin.mapped = 0; 1487 mapped = 0;
1479#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1481#endif 1490#endif
1482 break; 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484 case MapNotify:
1485 TermWin.mapped = 1;
1486#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif
1489 break; 1492 break;
1490 1493
1491#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1492 case ReparentNotify: 1495 case ReparentNotify:
1493 rootwin_cb (ev); 1496 rootwin_cb (ev);
1494 break; 1497 break;
1495#endif /* TRANSPARENT */ 1498#endif /* TRANSPARENT */
1496 1499
1497 case GraphicsExpose: 1500 case GraphicsExpose:
1498 case Expose: 1501 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == vt)
1500 { 1503 {
1501 do 1504 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1505 1508
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1510
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1511 1514
1512 scr_refresh (refresh_type); 1515 want_refresh = 1;
1513 } 1516 }
1514 else 1517 else
1515 { 1518 {
1516 XEvent unused_event; 1519 XEvent unused_event;
1517 1520
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1519 ; 1522 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1524 ;
1522 1525
1523 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1524 { 1527 {
1525 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1526 scrollbar_show (0); 1529 scrollbar_show (0);
1527 } 1530 }
1528#ifdef MENUBAR
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose ();
1531#endif
1532 1531
1533#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1536#endif 1535#endif
1537 } 1536 }
1538 break; 1537 break;
1539 1538
1540 case MotionNotify: 1539 case MotionNotify:
1541#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1542 if (hidden_pointer) 1541 if (hidden_pointer)
1543 pointer_unblank (); 1542 pointer_unblank ();
1544#endif 1543#endif
1545#if MENUBAR 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 if (isMenuBarWindow (ev.xany.window)) 1545 break;
1546
1547 if (ev.xany.window == vt)
1547 { 1548 {
1548 menubar_control (ev.xbutton); 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1549 break; 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1550 } 1551 ; // nop
1551#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1553 break;
1554
1555 if (ev.xany.window == TermWin.vt)
1556 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1553 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1560 ; 1555 ;
1561 1556
1562 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (xdisp, vt,
1563 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1560 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1561 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1563 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1564 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1565 {
1571#endif 1566#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1571 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1572 break;
1578 } 1573 }
1579#endif 1574#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1575 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1576 ev.xbutton.state & Button3Mask ? 2 : 0);
1577
1582#ifdef SELECTION_SCROLLING 1578#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1579 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1580 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1581 {
1586 int dist; 1582 int dist;
1587 1583
1588 /* don't clobber the current delay if we are 1584 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1585 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1593 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1594 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1596
1601 /* calc number of lines to scroll */ 1597 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1598 if (ev.xbutton.y < int_bwidth)
1603 { 1599 {
1604 scroll_selection_dir = UP; 1600 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1601 dist = int_bwidth - ev.xbutton.y;
1606 } 1602 }
1607 else 1603 else
1608 { 1604 {
1609 scroll_selection_dir = DN; 1605 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1606 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1607 }
1612 1608
1613 scroll_selection_lines = Pixel2Height (dist) 1609 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1610 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1611 + 1;
1616 MIN_IT (scroll_selection_lines, 1612 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1613 SELECTION_SCROLL_MAX_LINES);
1618 } 1614 }
1619 else 1615 else
1620 { 1616 {
1621 /* we are within the text window, so we 1617 /* we are within the text window, so we
… …
1630#endif 1626#endif
1631 } 1627 }
1632 } 1628 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1630 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1632 MotionNotify, &ev))
1633 ;
1634
1637 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1638 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1638 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1639 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1641 scrollbar_size ());
1644 scr_refresh (refresh_type); 1642 want_refresh = 1;
1645 refresh_limit = 0; 1643 refresh_limit = 0;
1646 scrollbar_show (1); 1644 scrollbar_show (1);
1647 } 1645 }
1648 break; 1646 break;
1649 } 1647 }
1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1677}
1678
1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1689#if USE_XIM
1690 if (Input_Context != NULL)
1691 {
1692 IMSetStatusPosition ();
1693 XSetICFocus (Input_Context);
1694 }
1695#endif
1696#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif
1700#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade])
1702 {
1703 pix_colors = pix_colors_focused;
1704 scr_recolour ();
1705 }
1706#endif
1707 }
1708}
1709
1710void
1711rxvt_term::focus_out ()
1712{
1713 if (focus)
1714 {
1715 focus = 0;
1716 want_refresh = 1;
1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1723 iso14755buf = 0;
1724# if ENABLE_OVERLAY
1725 scr_overlay_off ();
1726# endif
1727 }
1728#endif
1729#if USE_XIM
1730 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context);
1732#endif
1733#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink))
1735 cursor_blink_ev.stop ();
1736 hidden_cursor = 0;
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_unfocused;
1742 scr_recolour ();
1743 }
1744#endif
1745 }
1650} 1746}
1651 1747
1652#if TRANSPARENT 1748#if TRANSPARENT
1653void 1749void
1654rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1751{
1656 SET_R (this); 1752 make_current ();
1657 SET_LOCALE (locale);
1658 1753
1659 switch (ev.type) 1754 switch (ev.type)
1660 { 1755 {
1661 case PropertyNotify: 1756 case PropertyNotify:
1662 /* 1757 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1758 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1759 * use the property to determine the pixmap. We use it later on.
1665 */ 1760 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1763 return;
1671 1764
1672 /* FALLTHROUGH */ 1765 /* FALLTHROUGH */
1673 case ReparentNotify: 1766 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1768 want_refresh = want_full_refresh = 1;
1676 break; 1769 break;
1677 } 1770 }
1678} 1771}
1679#endif 1772#endif
… …
1682rxvt_term::button_press (XButtonEvent &ev) 1775rxvt_term::button_press (XButtonEvent &ev)
1683{ 1776{
1684 int reportmode = 0, clickintime; 1777 int reportmode = 0, clickintime;
1685 1778
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1779 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1780
1687 if (!bypass_keystate) 1781 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1782 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1783
1690 /* 1784 /*
1691 * VT window processing of button press 1785 * VT window processing of button press
1692 */ 1786 */
1693 if (ev.window == TermWin.vt) 1787 if (ev.window == vt)
1694 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1695#if ISO_14755 1792#if ISO_14755
1696 // 5.4 1793 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1795 {
1699 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
1700 return; 1797 return;
1701 } 1798 }
1702#endif 1799#endif
1703 1800
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1801 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1802
1705 if (reportmode) 1803 if (reportmode)
1706 { 1804 {
1707 /* mouse report from vt window */ 1805 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1806 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1807 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1712 { 1810 {
1713 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1714 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1715 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1716 { 1815 {
1717 /* only report double clicks */ 1816 /* only report double clicks */
1718 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1719 mouse_report (ev); 1818 mouse_report (ev);
… …
1738 } 1837 }
1739 else 1838 else
1740 { 1839 {
1741 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1842
1743 switch (ev.button) 1843 switch (ev.button)
1744 { 1844 {
1745 case Button1: 1845 case Button1:
1846 /* allow meta + click to select rectangular areas */
1847 /* should be done in screen.C */
1848#if ENABLE_FRILLS
1849 selection.rect = !!(ev.state & ModMetaMask);
1850#else
1851 selection.rect = false;
1852#endif
1853
1746 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1748 { 1856 {
1749 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1751 else 1859 else
1752 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
… …
1893 case Button3: 2001 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2002 if (scrollBar.style != R_SB_XTERM)
1895 { 2003 {
1896 if (scrollbar_above_slider (ev.y)) 2004 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2005# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2006 scr_page (UP, nrow - 1);
1899# else 2007# else
1900 scr_page (UP, TermWin.nrow / 4); 2008 scr_page (UP, nrow / 4);
1901# endif 2009# endif
1902 else if (scrollbar_below_slider (ev.y)) 2010 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2011# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2012 scr_page (DN, nrow - 1);
1905# else 2013# else
1906 scr_page (DN, TermWin.nrow / 4); 2014 scr_page (DN, nrow / 4);
1907# endif 2015# endif
1908 else 2016 else
1909 scrollBar.setMotion (); 2017 scrollBar.setMotion ();
1910 } 2018 }
1911 else 2019 else
1912 { 2020 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2021 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2022 (nrow
1915 * scrollbar_position (ev.y) 2023 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2024 / scrollbar_size ()));
1917 } 2025 }
1918 2026
1919 break; 2027 break;
1920 } 2028 }
1921 } 2029 }
2030
1922 return; 2031 return;
1923 } 2032 }
1924#if MENUBAR
1925 /*
1926 * Menubar window processing of button press
1927 */
1928 if (isMenuBarWindow (ev.window))
1929 menubar_control (ev);
1930#endif
1931} 2033}
1932 2034
1933void 2035void
1934rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
1935{ 2037{
… …
1941 2043
1942 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
1943 { 2045 {
1944 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
1945 scrollbar_show (0); 2047 scrollbar_show (0);
1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1947 refresh_type &= ~SMOOTH_REFRESH;
1948#endif
1949 } 2048 }
1950 2049
1951#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2051 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
1954#endif 2053#endif
1955 2054
1956 if (ev.window == TermWin.vt) 2055 if (ev.window == vt)
1957 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
1958#if ISO_14755 2060#if ISO_14755
1959 // 5.4 2061 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2063 return;
1962#endif 2064#endif
2065
1963 if (reportmode) 2066 if (reportmode)
1964 { 2067 {
1965 /* mouse report from vt window */ 2068 /* mouse report from vt window */
1966 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
1967 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
1997 { 2100 {
1998 case Button1: 2101 case Button1:
1999 case Button3: 2102 case Button3:
2000 selection_make (ev.time); 2103 selection_make (ev.time);
2001 break; 2104 break;
2105
2002 case Button2: 2106 case Button2:
2003 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2004 break; 2109 break;
2110
2005#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2006 case Button4: 2112 case Button4:
2007 case Button5: 2113 case Button5:
2008 { 2114 {
2009 int i; 2115 int i;
… …
2011 2117
2012 v = ev.button == Button4 ? UP : DN; 2118 v = ev.button == Button4 ? UP : DN;
2013 2119
2014 if (ev.state & ShiftMask) 2120 if (ev.state & ShiftMask)
2015 i = 1; 2121 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2122 else if (OPTION (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2123 i = nrow - 1;
2018 else 2124 else
2019 i = 5; 2125 i = 5;
2020 2126
2021# ifdef MOUSE_SLIP_WHEELING 2127# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2128 if (ev.state & ControlMask)
2023 { 2129 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2130 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2133
2028 if (slip_wheel_ev.at < NOW) 2134 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2136
2031 slip_wheel_ev.start (); 2137 slip_wheel_ev.start ();
2032 } 2138 }
2033 else 2139 else
2034 { 2140 {
2035# endif 2141# endif
2036# ifdef JUMP_MOUSE_WHEEL
2037 scr_page (v, i); 2142 scr_page (v, i);
2038 scr_refresh (SMOOTH_REFRESH);
2039 scrollbar_show (1); 2143 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
2049 } 2145 }
2050#endif 2146# endif
2051 } 2147 }
2052 break; 2148 break;
2053#endif 2149#endif
2054 } 2150 }
2055 } 2151 }
2056#ifdef MENUBAR
2057 else if (isMenuBarWindow (ev.window))
2058 menubar_control (ev);
2059#endif
2060} 2152}
2061 2153
2062#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
2063#if TINTING 2155#if TINTING
2064/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2065 2157
2066typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2067 2159
2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2069{ 2161{
2070 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2071 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2167 int i;
2076 2168
2077 Visual* visual = display->visual; 2169 Visual *visual = term->visual;
2078 2170
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2172
2081 /* for convenience */ 2173 /* for convenience */
2082 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2306 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2308 2400
2309 pchanged = 0; 2401 pchanged = 0;
2310 2402
2311 if (!(options & Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2313 2405
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2316 2408
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2318 2410
2319 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2320 { 2412 {
2321 if (am_transparent) 2413 if (am_transparent)
2322 { 2414 {
2323 pchanged = 1; 2415 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2326 } 2418 }
2327 2419
2328 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2329 } 2421 }
2330 2422
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2424 XSync (xdisp, False);
2333 2425
2334 /* 2426 /*
2335 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2338 */ 2430 */
2339 i = (xa[XA_XROOTPMAPID] 2431 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2343 2435
2344 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2349 2441
2350 if (!i || prop == NULL 2442 if (!i || prop == NULL
2351#if TINTING 2443#if TINTING
2352 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2353#endif 2445#endif
2354 ) 2446 )
2355 have_pixmap = 0; 2447 have_pixmap = 0;
2356 else 2448 else
2357 { 2449 {
… …
2370 Window cr; 2462 Window cr;
2371 XImage *image; 2463 XImage *image;
2372 GC gc; 2464 GC gc;
2373 XGCValues gcvalue; 2465 XGCValues gcvalue;
2374 2466
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2471 nx = ny = 0;
2380 2472
… …
2390 nh += sy; 2482 nh += sy;
2391 ny = -sy; 2483 ny = -sy;
2392 sy = 0; 2484 sy = 0;
2393 } 2485 }
2394 2486
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2397 allowedxerror = -1; 2491 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2493
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2496 allowedxerror = 0;
2403 2497
2404 if (image == NULL) 2498 if (image == NULL)
2405 { 2499 {
2406 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2407 { 2501 {
2408 pchanged = 1; 2502 pchanged = 1;
2409 if (TermWin.pixmap != None) 2503 if (pixmap != None)
2410 { 2504 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (xdisp, pixmap);
2412 TermWin.pixmap = None; 2506 pixmap = None;
2413 } 2507 }
2414 } 2508 }
2415 2509
2416 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2417 } 2511 }
2418 else 2512 else
2419 { 2513 {
2420 if (TermWin.pixmap != None) 2514 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2515 XFreePixmap (xdisp, pixmap);
2422 2516
2423#if TINTING 2517#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2519 {
2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2428 2521
2522 rgba c;
2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2430 2524
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2432 } 2526 }
2433#endif 2527#endif
2434 2528
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2436 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2533 XFreeGC (xdisp, gc);
2441 XDestroyImage (image); 2534 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2444 2537
2445 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2539 pchanged = 1;
2447 2540
2448 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2449 } 2542 }
2450 } 2543 }
2451 2544
2452 if (!am_pixmap_trans) 2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2453 { 2548 {
2454 unsigned int n; 2549 unsigned int n;
2455 /* 2550 /*
2456 * InheritPixmap transparency 2551 * InheritPixmap transparency
2457 */ 2552 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2554 {
2460 oldp = TermWin.parent[i]; 2555 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2462 &TermWin.parent[i], &list, &n);
2463 XFree (list); 2557 XFree (list);
2464 2558
2465 if (TermWin.parent[i] == display->root) 2559 if (parent[i] == display->root)
2466 { 2560 {
2467 if (oldp != None) 2561 if (oldp != None)
2468 pchanged = 1; 2562 pchanged = 1;
2469 2563
2470 break; 2564 break;
2471 } 2565 }
2472 2566
2473 if (oldp != TermWin.parent[i]) 2567 if (oldp != parent[i])
2474 pchanged = 1; 2568 pchanged = 1;
2475 } 2569 }
2476 2570
2477 n = 0; 2571 n = 0;
2478 2572
2479 if (pchanged) 2573 if (pchanged)
2480 {
2481 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2482 { 2575 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2579 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2581 break;
2488 } 2582 }
2489 } 2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2490 } 2586 {
2491
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2493 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2589 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2498 } 2591 }
2499 else 2592 else
2500 { 2593 {
2501#if WAIT_FOR_WM
2502 /* wait (an arbitrary period) for the WM to do its thing
2503 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1);
2505#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2507 { 2595 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2510 } 2598 }
2511 2599
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2513 am_transparent = 1; 2601 am_transparent = 1;
2514 } 2602 }
2515 2603
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2605 parent[i] = None;
2518 } 2606 }
2519 2607
2520 // this is experimental
2521 if (scrollBar.win) 2608 if (scrollBar.win)
2522 { 2609 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2526 scrollbar_show (0); 2612 scrollbar_show (0);
2527 } 2613 }
2528 2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2529 return pchanged; 2622 return pchanged;
2530} 2623}
2531#endif 2624#endif
2532 2625
2533/*}}} */ 2626/*}}} */
2534 2627
2535bool 2628bool
2536rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2537{ 2630{
2538 bool flag = false; 2631 bool flag = false;
2539 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2541 2634
2542 for (;;) 2635 for (;;)
2543 { 2636 {
2544 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2545 { 2638 {
2546 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2547 ch = next_char (); 2640 ch = next_char ();
2548 }
2549 2641
2550 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2551 break; 2643 break;
2644 }
2552 2645
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 { 2647 {
2555 if (!seen_input) 2648 if (!seen_input)
2556 { 2649 {
2557 seen_input = 1; 2650 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2651 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2652 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2653 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2654 // then sometimes get the size wrong.
2655 // unfortunately other programs are even more buggy and dislike
2656 // being sent SIGWINCH, so only do it when we were in fact being
2657 // resized.
2658 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2659 kill (-cmd_pid, SIGWINCH);
2563 } 2660 }
2564 2661
2565 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2664 bool refreshnow = false;
2568 int nlines = 0; 2665 int nlines = 0;
2569 unicode_t *str = buf; 2666 wchar_t *str = buf;
2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2570 2668
2571 for (;;) 2669 for (;;)
2572 { 2670 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2672 break;
2575 2673
2576 *str++ = ch; 2674 *str++ = ch;
2577 2675
2578 if (ch == C0_LF) 2676 if (ch == C0_LF || str >= eol)
2579 { 2677 {
2678 if (ch == C0_LF)
2580 nlines++; 2679 nlines++;
2680
2581 refresh_count++; 2681 refresh_count++;
2582 2682
2583 if (!(options & Opt_jumpScroll) 2683 if (!OPTION (Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2685 {
2586 refreshnow = true; 2686 refreshnow = true;
2687 refresh_count = 0;
2587 ch = NOCHAR; 2688 ch = NOCHAR;
2588 break; 2689 break;
2589 } 2690 }
2590 2691
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2693 if (nlines >= nrow - 1)
2593 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2594 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2595 nlines = 0; 2699 nlines = 0;
2596 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2597 } 2702 }
2598 }
2599 2703
2600 if (str >= buf + UBUFSIZ) 2704 if (str >= eol)
2601 { 2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2602 ch = NOCHAR; 2708 ch = NOCHAR;
2603 break; 2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2604 } 2715 }
2605 2716
2606 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2718 ch = next_char ();
2608 } 2719 }
2609 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2610 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2611 2724
2612 /* 2725 /*
2613 * If there have been a lot of new lines, then update the screen 2726 * If there have been a lot of new lines, then update the screen
2614 * What the heck I'll cheat and only refresh less than every page-full. 2727 * What the heck I'll cheat and only refresh less than every page-full.
2615 * the number of pages between refreshes is refresh_limit, which 2728 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling. 2729 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2730 */
2618 if (refreshnow) 2731 if (refreshnow)
2619 { 2732 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++; 2734 refresh_limit++;
2622 else 2735 else
2623 { 2736 {
2624 flag = true; 2737 flag = true;
2625 scr_refresh (refresh_type); 2738 scr_refresh ();
2739 want_refresh = 1;
2626 } 2740 }
2627 } 2741 }
2628 2742
2629 } 2743 }
2630 else 2744 else
… …
2645 } 2759 }
2646 2760
2647 return flag; 2761 return flag;
2648} 2762}
2649 2763
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2659// read the next character 2764// read the next character
2660unicode_t 2765wchar_t
2661rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2662{ 2767{
2663 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2664 { 2769 {
2665 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2667 return *cmdbuf_ptr++; 2772 return *cmdbuf_ptr++;
2668 2773
2669 wchar_t wc; 2774 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671 2776
2672 if (len == (size_t)-2) 2777 if (len == (size_t)-2)
2673 { 2778 {
2674 // the mbstate stores incomplete sequences. didn't know this :/ 2779 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2676 break; 2781 break;
2677 } 2782 }
2678 2783
2679 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2786
2682 // assume wchar == unicode 2787 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2684 return wc; 2789 return wc & UNICODE_MASK;
2685 } 2790 }
2686 2791
2687 return NOCHAR; 2792 return NOCHAR;
2688} 2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2689 2805
2690/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2691/* 2807/*
2692 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2693 * to the command. 2809 * to the command.
2694 */ 2810 */
2695unicode_t 2811wchar_t
2696rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2697{ 2813{
2698 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2699 2815
2700 if (c == NOCHAR) 2816 if (c == NOCHAR)
2701 throw out_of_input; 2817 throw out_of_input;
2702 2818
2703 return c; 2819 return c;
2704} 2820}
2705 2821
2706unicode_t 2822uint32_t
2707rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2708{ 2824{
2709 unicode_t c = next_octet (); 2825 uint32_t c = next_octet ();
2710 2826
2711 if (c == NOCHAR) 2827 if (c == NOCHAR)
2712 throw out_of_input; 2828 throw out_of_input;
2713 2829
2714 return c; 2830 return c;
… …
2814 case C0_ESC: 2930 case C0_ESC:
2815 process_escape_seq (); 2931 process_escape_seq ();
2816 break; 2932 break;
2817 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2818 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2821 else 2936 else
2822 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2823 (unsigned int)strlen (VT100_ANS));
2824 break; 2938 break;
2825 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2826 scr_bell (); 2940 scr_bell ();
2827 break; 2941 break;
2828 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
2952 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
2953 break; 3067 break;
2954 case '+': 3068 case '+':
2955 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
2956 break; 3070 break;
2957#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
2958 case '6': 3072 case '6':
2959 scr_backindex (); 3073 scr_backindex ();
2960 break; 3074 break;
2961#endif 3075#endif
2962 case '7': 3076 case '7':
2963 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
2964 break; 3078 break;
2965 case '8': 3079 case '8':
2966 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
2967 break; 3081 break;
2968#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
2969 case '9': 3083 case '9':
2970 scr_forwardindex (); 3084 scr_forwardindex ();
2971 break; 3085 break;
2972#endif 3086#endif
2973 case '=': 3087 case '=':
… …
2983 break; 3097 break;
2984 3098
2985 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
2986 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
2987 { 3101 {
2988 unicode_t nlcr[] = { C0_LF, C0_CR }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
2989 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2990 } 3104 }
2991 break; 3105 break;
2992 3106
2993 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
2994 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
3016 process_dcs_seq (); 3130 process_dcs_seq ();
3017 break; 3131 break;
3018 3132
3019 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3020 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
3021 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3022 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3023 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
3024 3137
3025 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3026 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
3027 process_csi_seq (); 3140 process_csi_seq ();
… …
3136 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3137 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3138 if (arg[p] == -1) 3251 if (arg[p] == -1)
3139 arg[p] = ndef; 3252 arg[p] = ndef;
3140 3253
3141#ifdef DEBUG_CMD
3142 fprintf (stderr, "CSI ");
3143 for (p = 0; p < nargs; p++)
3144 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3145 fprintf (stderr, "%c\n", ch);
3146#endif
3147
3148 /* 3254 /*
3149 * private mode handling 3255 * private mode handling
3150 */ 3256 */
3151 if (priv) 3257 if (priv)
3152 { 3258 {
3153 switch (priv) 3259 switch (priv)
3154 { 3260 {
3155 case '>': 3261 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3158 break; 3273 break;
3159 case '?': 3274 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3277 break;
… …
3267 3382
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3383 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3384 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3385 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3388 break;
3274 3389
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3277 (unsigned int) (sizeof (VT100_ANS) - 1));
3278 break; 3392 break;
3279 3393
3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3281 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
3282 break; 3396 break;
… …
3289 break; 3403 break;
3290 case 6: /* CPR requested */ 3404 case 6: /* CPR requested */
3291 scr_report_position (); 3405 scr_report_position ();
3292 break; 3406 break;
3293 case 7: /* unofficial extension */ 3407 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 3408 if (OPTION (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3409 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 3410 break;
3297 case 8: /* unofficial extension */ 3411 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 3413 break;
… …
3366 break; 3480 break;
3367 case CSI_75: 3481 case CSI_75:
3368 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3369 break; 3483 break;
3370 3484
3371#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3372 case CSI_74: 3486 case CSI_74:
3373 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3374 break; 3488 break;
3375#endif 3489#endif
3376 3490
… …
3383 break; 3497 break;
3384 } 3498 }
3385} 3499}
3386/*}}} */ 3500/*}}} */
3387 3501
3388#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3389/* ARGSUSED */ 3503/* ARGSUSED */
3390void 3504void
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3506{
3393 int x, y; 3507 int x, y;
3394 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3395 Window wdummy; 3509 Window wdummy;
3510
3511 dLocal (Display *, xdisp);
3396 3512
3397 if (nargs == 0) 3513 if (nargs == 0)
3398 return; 3514 return;
3399 3515
3400 switch (args[0]) 3516 switch (args[0])
3401 { 3517 {
3402 /* 3518 /*
3403 * commands 3519 * commands
3404 */ 3520 */
3405 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3407 break; 3523 break;
3408 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3526 break;
3412 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3414 break; 3529 break;
3415 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3532 break;
3418 case 5: /* raise window */ 3533 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3420 break; 3535 break;
3421 case 6: /* lower window */ 3536 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3423 break; 3538 break;
3424 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3425 scr_touch (true); 3540 scr_touch (true);
3426 break; 3541 break;
3427 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3543 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3544 (unsigned int) (args[1] * fheight));
3430 break; 3545 break;
3431 3546
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3547 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3548 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3550 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3551 (unsigned int) (args[1] * fheight));
3437 break; 3552 break;
3438
3439 3553
3440 /* 3554 /*
3441 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3442 */ 3556 */
3443 case 11: /* report window state */ 3557 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3560 break;
3447 case 13: /* report window position */ 3561 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3567 break;
3454 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3571 break;
3458 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3574 break;
3461 case 19: /* report window size (chars) */ 3575 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3577 break;
3464 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3465 { 3579 {
3466 char *s; 3580 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3583 XFree (s);
3470 } 3584 }
3471 break; 3585 break;
3472 case 21: /* report window title */ 3586 case 21: /* report window title */
3473 { 3587 {
3474 char *s; 3588 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3591 XFree (s);
3478 } 3592 }
3479 break; 3593 break;
3480 } 3594 }
3481} 3595}
… …
3484/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3485/* 3599/*
3486 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
3487 * ends_how is terminator used. returned input must be free()'d 3601 * ends_how is terminator used. returned input must be free()'d
3488 */ 3602 */
3489unsigned char * 3603char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3605{
3492 unicode_t prev = 0, ch; 3606 unicode_t ch;
3607 bool seen_esc = false;
3493 unsigned int n = 0; 3608 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3609 wchar_t string[STRING_MAX];
3496 3610
3497 while ((ch = cmd_getc ()) != NOCHAR) 3611 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3612 {
3499 if (prev == C0_ESC) 3613 if (seen_esc)
3500 { 3614 {
3501 if (ch == 0x5c) /* 7bit ST */ 3615 if (ch == 0x5c) /* 7bit ST */
3502 break; 3616 break;
3503 else 3617 else
3504 return NULL; 3618 return NULL;
3505 } 3619 }
3620 else if (ch == C0_ESC)
3621 {
3622 seen_esc = true;
3623 continue;
3624 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3625 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3626 break;
3508 else if (ch < 0x20) 3627 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3628 return NULL; /* other control character - exit */
3510 3629
3511 if (n >= sizeof (string) - 1) 3630 seen_esc = false;
3631
3632 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3633 // stop at some sane length
3513 return NULL; 3634 return NULL;
3514 3635
3515 if (ch == C0_SYN) 3636 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3637 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3638 else
3521 string[n++] = prev = ch; 3639 string[n++] = ch;
3522 } 3640 }
3523 3641
3524 string[n++] = '\0'; 3642 string[n++] = '\0';
3525 3643
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3645
3531 return s; 3646 return rxvt_wcstombs (string);
3532} 3647}
3533 3648
3534/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
3535/* 3650/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3537 */ 3652 */
3538void 3653void
3539rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
3540{ 3655{
3541 unsigned char *s; 3656 char *s;
3542 unicode_t eh; 3657 unicode_t eh;
3543 3658
3544 /* 3659 /*
3545 * Not handled yet 3660 * Not handled yet
3546 */ 3661 */
… …
3565 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3566 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
3567 3682
3568 if (ch == ';') 3683 if (ch == ';')
3569 { 3684 {
3570 unsigned char *s = get_to_st (eh); 3685 char *s = get_to_st (eh);
3571 3686
3572 if (s) 3687 if (s)
3573 { 3688 {
3574 process_xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
3575 free (s); 3690 free (s);
3576 } 3691 }
3577 } 3692 }
3578} 3693}
3579 3694
3580void 3695void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3582{ 3697{
3583 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3584 { 3699 {
3585 unsigned short r, g, b; 3700 rgba c;
3586 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3588 } 3709 }
3589 else 3710 else
3590 set_window_color (color, str); 3711 set_window_color (color, str);
3591} 3712}
3592 3713
3593/* 3714/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3716 */
3618void 3717void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3620{ 3719{
3621 int changed = 0;
3622 int color; 3720 int color;
3623 char *buf, *name; 3721 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724
3725 dLocal (Display *, xdisp);
3625 3726
3626 assert (str != NULL); 3727 assert (str != NULL);
3627 switch (op) 3728 switch (op)
3628 { 3729 {
3629 case XTerm_name: 3730 case XTerm_name:
… …
3636 set_title (str); 3737 set_title (str);
3637 break; 3738 break;
3638 case XTerm_property: 3739 case XTerm_property:
3639 if (str[0] == '?') 3740 if (str[0] == '?')
3640 { 3741 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3742 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3743 Atom actual_type;
3643 int actual_format; 3744 int actual_format;
3644 unsigned long nitems; 3745 unsigned long nitems;
3645 unsigned long bytes_after; 3746 unsigned long bytes_after;
3646 unsigned char *value = 0; 3747 unsigned char *value = 0;
3647 const char *str = ""; 3748 const char *str = "";
3648 3749
3649 if (prop 3750 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3755 && actual_type != None
3655 && actual_format == 8) 3756 && actual_format == 8)
3656 str = (const char *)(value); 3757 str = (const char *)(value);
3657 3758
3658 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3659 3760
3660 XFree (value); 3761 XFree (value);
3661 } 3762 }
3662 else 3763 else
3663 { 3764 {
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3766
3666 if (eq) 3767 if (eq)
3667 { 3768 {
3668 *eq = 0; 3769 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3770 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3771 }
3674 else 3772 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3676 display->atom (str)); 3774 display->atom (str));
3677 } 3775 }
3678 break; 3776 break;
3679 3777
3680 case XTerm_Color: 3778 case XTerm_Color:
… …
3682 { 3780 {
3683 if ((name = strchr (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3684 break; 3782 break;
3685 3783
3686 *name++ = '\0'; 3784 *name++ = '\0';
3687 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3688 3786
3689 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3690 break; 3788 break;
3691 3789
3692 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3693 *buf++ = '\0'; 3791 *buf++ = '\0';
3694 3792
3695 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3696 {
3697 unsigned short r, g, b;
3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3700 }
3701 else
3702 set_window_color (color + minCOLOR, name);
3703 } 3794 }
3704 break; 3795 break;
3705 case XTerm_Color00: 3796 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3707 break; 3798 break;
3708 case XTerm_Color01: 3799 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3710 break; 3801 break;
3711#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3712 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3714 break; 3805 break;
3715#endif 3806#endif
3716 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3717 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3718 break; 3809 break;
3719 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3721 break; 3812 break;
3722#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3723 case XTerm_Color_BD:
3724 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3725 break;
3726 case XTerm_Color_UL:
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break;
3729 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3731 break; 3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3824 break;
3825 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp);
3827 break;
3732#endif 3828#endif
3829#if TRANSPARENT && TINTING
3830 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp);
3733 3832
3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break;
3839#endif
3840
3734 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3735 if (*str != ';') 3843 if (*str != ';')
3736 { 3844 {
3737#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3738 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3739 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3740#endif
3741 scr_touch (true); 3848 scr_touch (true);
3849#endif
3742 } 3850 }
3851
3852 int changed = 0;
3853
3743 while ((str = strchr (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3744 { 3855 {
3745 str++; 3856 str++;
3746#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3748#endif 3859#endif
3749
3750 } 3860 }
3861
3751 if (changed) 3862 if (changed)
3752 { 3863 {
3753#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3865 resize_pixmap ();
3755#endif
3756 scr_touch (true); 3866 scr_touch (true);
3867#endif
3757 } 3868 }
3869 }
3758 break; 3870 break;
3759 3871
3760 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3761 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3762 break; 3874 break;
3763 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3764 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3765 break; 3877 break;
3766 3878
3767 case XTerm_logfile: 3879 case XTerm_logfile:
3768 // TODO, when secure mode? 3880 // TODO, when secure mode?
3769 break; 3881 break;
3770 3882
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR
3806 case XTerm_Menu:
3807 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break;
3810#endif
3811#if 0 3883#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3813 { 3885 {
3814 int fd; 3886 int fd;
3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3816 { 3888 {
3817 scr_dump (fd); 3889 scr_dump (fd);
3818 close (fd); 3890 close (fd);
3819 } 3891 }
3820 } 3892 }
3893 break;
3894#endif
3895 case XTerm_font:
3896 op = URxvt_font;
3897 case URxvt_font:
3898#if ENABLE_STYLES
3899 case URxvt_boldFont:
3900 case URxvt_italicFont:
3901 case URxvt_boldItalicFont:
3902#endif
3903 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp);
3908 else
3909 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)];
3911
3912 res = strdup (str);
3913 allocated.push_back ((void *)res);
3914 set_fonts ();
3915 }
3916 break;
3917
3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3927 case URxvt_locale:
3928 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3930 else
3931 {
3932 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale ();
3935 }
3936 break;
3937
3938 case URxvt_view_up:
3939 case URxvt_view_down:
3940 {
3941 int lines = atoi (str);
3942
3943 if (lines)
3944 scr_page (op == URxvt_view_up ? UP : DN, lines);
3945 else
3946 scr_erase_savelines ();
3947 }
3948
3949 break;
3950#endif
3951
3952#if ENABLE_PERL
3953 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3955 ; // no responses yet
3821 break; 3956 break;
3822#endif 3957#endif
3823 } 3958 }
3824} 3959}
3825/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
… …
3856 return state; 3991 return state;
3857} 3992}
3858 3993
3859/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
3860void 3995void
3861rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3862{ 3997{
3863 unsigned int i, j; 3998 unsigned int i, j;
3864 int state; 3999 int state;
3865 4000
3866 static const struct 4001 static const struct
… …
3877 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
3878 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
3879 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode 4015 // 8, bi-directional support mode
3881 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
3882#ifdef menuBar_esc
3883 { menuBar_esc, PrivMode_menuBar },
3884#endif
3885 // 18, 19 printing-related 4017 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor }, 4018 { 25, PrivMode_VisibleCursor },
3887#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
3888 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
3889#endif 4021#endif
… …
3934 } 4066 }
3935 4067
3936 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4069 switch (arg[i])
3938 { 4070 {
4071#if ENABLE_STYLES
4072 case 1021:
4073 set_option (Opt_intensityStyles, mode);
4074
4075 scr_touch (true);
4076 break;
4077#endif
3939 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
4079 case 1049:
3940 if (options & Opt_secondaryScreen) 4080 if (OPTION (Opt_secondaryScreen))
3941 if (mode == 0) 4081 if (mode == 0)
3942 scr_cursor (RESTORE); 4082 scr_cursor (RESTORE);
3943 else if (mode == 1) 4083 else if (mode == 1)
3944 scr_cursor (SAVE); 4084 scr_cursor (SAVE);
3945 break; 4085 break;
… …
3957 */ 4097 */
3958 PrivMode (1, PrivMode_vt52); 4098 PrivMode (1, PrivMode_vt52);
3959 break; 4099 break;
3960 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4103 break;
3964 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
3965 if (state)
3966 options &= ~Opt_jumpScroll;
3967 else
3968 options |= Opt_jumpScroll; 4105 set_option (Opt_jumpScroll, !state);
3969 break; 4106 break;
3970 case 5: /* reverse video */ 4107 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
3972 break; 4109 break;
3973 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
3979 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
3980 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
3981 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
3982 priv_modes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
3983 break; 4120 break;
3984#ifdef menuBar_esc
3985 case menuBar_esc:
3986#ifdef MENUBAR
3987 map_menuBar (state);
3988#endif
3989 break;
3990#endif
3991#ifdef scrollBar_esc 4121#ifdef scrollBar_esc
3992 case scrollBar_esc: 4122 case scrollBar_esc:
3993 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
3994 { 4124 {
3995 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
4014#if 0 4144#if 0
4015 case 1001: 4145 case 1001:
4016 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
4017#endif 4147#endif
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state)
4020 options &= ~Opt_scrollTtyOutput;
4021 else
4022 options |= Opt_scrollTtyOutput; 4149 set_option (Opt_scrollTtyOutput, !state);
4023 break; 4150 break;
4024 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
4025 if (state)
4026 options |= Opt_scrollTtyKeypress; 4152 set_option (Opt_scrollTtyKeypress, state);
4027 else
4028 options &= ~Opt_scrollTtyKeypress;
4029 break; 4153 break;
4030 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 4155 if (OPTION (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 4157 scr_erase_screen (2);
4034 scr_change_screen (state); 4158 scr_change_screen (state);
4035 break; 4159 break;
4036 case 1049: /* secondary screen w/ clearing first */ 4160 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 4161 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 4162 if (OPTION (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 4163 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 4164 scr_erase_screen (2);
4041 break; 4165 break;
4042 default: 4166 default:
4043 break; 4167 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 4193 rendset = 0, rendstyle = ~RS_None;
4070 break; 4194 break;
4071 case 1: 4195 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4196 rendset = 1, rendstyle = RS_Bold;
4073 break; 4197 break;
4074 //case 2: // faint or second colour 4198 //case 2: // low intensity
4075 //case 3: // italic 4199 case 3:
4200 rendset = 1, rendstyle = RS_Italic;
4201 break;
4076 case 4: 4202 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4203 rendset = 1, rendstyle = RS_Uline;
4078 break; 4204 break;
4079 case 5: // slowly blinking 4205 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4206 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4218 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4219 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4220 //...
4095 //case 19: // ninth alt font 4221 //case 19: // ninth alt font
4096 //case 20: // gothic 4222 //case 20: // gothic
4097 case 21: // disable bold, faint 4223 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4224 rendset = 0, rendstyle = RS_Bold;
4099 break; 4225 break;
4100 case 22: 4226 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4227 rendset = 0, rendstyle = RS_Bold;
4102 break; 4228 break;
4103 //case 23: disable italic 4229 case 23: // disable italic
4230 rendset = 0, rendstyle = RS_Italic;
4231 break;
4104 case 24: 4232 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4233 rendset = 0, rendstyle = RS_Uline;
4106 break; 4234 break;
4107 case 25: 4235 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4236 rendset = 0, rendstyle = RS_Blink;
4109 break; 4237 break;
4110 case 26: 4238 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4239 rendset = 0, rendstyle = RS_Blink;
4112 break; 4240 break;
4113 case 27: 4241 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4242 rendset = 0, rendstyle = RS_RVid;
4115 break; 4243 break;
… …
4133 case 35: 4261 case 35:
4134 case 36: 4262 case 36:
4135 case 37: 4263 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4264 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4265 break;
4138#ifdef TTY_256COLOR 4266 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4267 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4268 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4269 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4270 i += 2;
4144 } 4271 }
4145 break; 4272 break;
4146#endif
4147 case 39: /* default fg */ 4273 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4274 scr_color (Color_fg, Color_fg);
4149 break; 4275 break;
4150 4276
4151 case 40: 4277 case 40:
… …
4156 case 45: 4282 case 45:
4157 case 46: 4283 case 46:
4158 case 47: 4284 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4285 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4286 break;
4161#ifdef TTY_256COLOR 4287 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4288 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4289 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4290 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4291 i += 2;
4167 } 4292 }
4168 break; 4293 break;
4169#endif
4170 case 49: /* default bg */ 4294 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4172 break; 4296 break;
4173 4297
4174#ifndef NO_BRIGHTCOLOR 4298 //case 50: // not variable spacing
4299
4300#if !ENABLE_MINIMAL
4175 case 90: 4301 case 90:
4176 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4177 case 92: 4303 case 92:
4178 case 93: 4304 case 93:
4179 case 94: 4305 case 94:
4180 case 95: 4306 case 95:
4181 case 96: 4307 case 96:
4182 case 97: 4308 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4309 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4310 break;
4186 case 100: 4311 case 100:
4187 case 101: /* set bright bg color */ 4312 case 101: /* set bright bg color */
4188 case 102: 4313 case 102:
4189 case 103: 4314 case 103:
4190 case 104: 4315 case 104:
4191 case 105: 4316 case 105:
4192 case 106: 4317 case 106:
4193 case 107: 4318 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4320 break;
4197#endif 4321#endif
4198
4199 } 4322 }
4200 } 4323 }
4201} 4324}
4202/*}}} */ 4325/*}}} */
4203 4326
… …
4227 */ 4350 */
4228void 4351void
4229rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
4230{ 4353{
4231 va_list arg_ptr; 4354 va_list arg_ptr;
4232 unsigned char buf[256]; 4355 char buf[256];
4233 4356
4234 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4236 va_end (arg_ptr); 4359 va_end (arg_ptr);
4237 tt_write (buf, strlen (buf)); 4360 tt_write (buf, strlen (buf));
… …
4239 4362
4240/* ---------------------------------------------------------------------- */ 4363/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4364/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4365 * or generated by us in response to a query ESC sequence.
4243 */ 4366 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368
4244void 4369void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
4246{ 4371{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
4248 4374
4249 if (len) 4375 if (pty->pty < 0)
4376 return;
4377
4378 if (v_buflen == 0)
4379 {
4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4381
4382 if ((unsigned int)written == len)
4383 return;
4384
4385 data += written;
4386 len -= written;
4250 { 4387 }
4388
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390
4391 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len;
4393
4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4395}
4396
4397void rxvt_term::pty_write ()
4398{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4400
4401 if (written > 0)
4402 {
4403 v_buflen -= written;
4404
4251 if (v_buflen == 0) 4405 if (v_buflen == 0)
4252 { 4406 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4407 free (v_buffer);
4280 v_buffer = 0; 4408 v_buffer = 0;
4281 v_buflen = 0; 4409 v_buflen = 0;
4282 4410
4283 pty_ev.set (EVENT_READ); 4411 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4412 return;
4296 } 4413 }
4414
4415 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4416 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ);
4298} 4419}
4299 4420
4300/*----------------------- end-of-file (C source) -----------------------*/ 4421/*----------------------- end-of-file (C source) -----------------------*/
4301 4422

Diff Legend

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