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

Diff Legend

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