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.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#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 67
62#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
63 69
64#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
113 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 121 XK_Print, 0x2399,
116 122
117 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
119 0, 133 0,
120}; 134};
121 135
122void 136void
123rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
124{ 138{
125 x = Pixel2Col (x); 139 x = Pixel2Col (x);
126 y = Pixel2Row (y); 140 y = Pixel2Row (y);
127 141
128 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 144 return;
131 145
132 for (;;) 146 for (;;)
133 { 147 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
135 151
136 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
137 { 153 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
139 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
141 break; 156 break;
142 } 157 }
143 158
144 x--; 159 x--;
145 } 160 }
146
147} 161}
148#endif
149 162
150#if ENABLE_OVERLAY
151void 163void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 165{
154 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 169 int len;
158 170
171 fname = rxvt_utf8towcs (f->name);
172
159#if ENABLE_COMBINING 173# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
161 { 175 {
162 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
165 } 179 }
166 else 180 else
167#endif 181# endif
168 { 182 {
169 ch2 = ch; 183 ch2 = ch;
170 184
171 alloc = 0; 185 alloc = 0;
172 chr = &ch2; 186 chr = &ch2;
173 len = 1; 187 len = 1;
174 } 188 }
175 189
176 int width = strlen (f->name); 190 char attr[80]; // plenty
177 191
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
179 214
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 216
182 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
183 { 218 {
… …
186 ch = *chr++; 221 ch = *chr++;
187 222
188 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
191#if !UNICODE3 226# if !UNICODE3
192 if (ch >= 0x10000) 227 if (ch >= 0x10000)
193 ch = 0xfffd; 228 ch = 0xfffd;
194#endif 229# endif
195 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
196 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
197 } 234 }
198 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
199 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
200 243
244 free (fname);
245
201#if ENABLE_COMBINING 246# if ENABLE_COMBINING
202 if (alloc) 247 if (alloc)
203 delete [] alloc; 248 delete [] alloc;
204#endif 249# endif
205} 250}
206#endif 251#endif
207 252
208void 253void
209rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
226 mb[0] = ch[0]; 271 mb[0] = ch[0];
227 len = 1; 272 len = 1;
228 } 273 }
229 274
230 if (len > 0) 275 if (len > 0)
231 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
232 else 277 else
233 scr_bell (); 278 scr_bell ();
234 } 279 }
235 280
236 iso14755buf = 0; 281 iso14755buf = 0;
… …
260rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
261{ 306{
262 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
263 unsigned int newlen; 308 unsigned int newlen;
264 KeySym keysym; 309 KeySym keysym;
265#ifdef DEBUG_CMD
266 static int debug_key = 1; /* accessible by a debugger only */
267#endif
268 int valid_keysym; 310 int valid_keysym;
269 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
270 312
271 /* 313 /*
272 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
274 * 316 *
275 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
276 */ 318 */
277 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
280 322
281 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
282 { 324 {
283 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
292 Status status_return; 334 Status status_return;
293 335
294#if 0 336#if 0
295#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
296 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
297 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
298 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
299 else 341 else
300#endif 342#endif
301#endif 343#endif
302 { 344 {
… …
304 346
305 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
309 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
312 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 357 SET_LOCALE (locale);
314 358
315 if (status_return == XLookupChars 359 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
337 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
338 } 382 }
339 else 383 else
340#endif 384#endif
341 { 385 {
342 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
343 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
344 } 388 }
345 389
346 if (valid_keysym) 390 if (valid_keysym)
347 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
348 if (TermWin.saveLines) 397 if (saveLines)
349 { 398 {
350#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 400 if (!ctrl && !meta)
352#else 401#else
353 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
354#endif 403#endif
355 { 404 {
356 int lnsppg; 405 int lnsppg;
357 406
358#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 409#else
361 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
362#endif 411#endif
363 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
364 { 413 {
365 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
366 return; 415 return;
… …
394 scr_move_to (0, 1); 443 scr_move_to (0, 1);
395 return; 444 return;
396 } 445 }
397 else if (keysym == XK_End) 446 else if (keysym == XK_End)
398 { 447 {
399 scr_move_to (1, 0); 448 scr_move_to (1, 1);
400 return; 449 return;
401 } 450 }
402 } 451 }
403#endif 452#endif
404 } 453 }
… …
415 { 464 {
416 switch (keysym) 465 switch (keysym)
417 { 466 {
418 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
421 return; 470 return;
422#if TODO // TODO 471#if TODO
423 /* rxvt extras */ 472 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 474 change_font (FONT_UP);
426 return; 475 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 535 }
487#endif 536#endif
488 537
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 539 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 540 {
517 newlen = 1; 541 newlen = 1;
518 switch (keysym) 542 switch (keysym)
519 { 543 {
520#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
528 else 552 else
529 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
530 break; 554 break;
531#endif 555#endif
532#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
533 case XK_Delete: 567 case XK_Delete:
534 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
535 break; 569 break;
536#endif 570#endif
537 case XK_Tab: 571 case XK_Tab:
… …
640#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
641 case XK_KP_Begin: 675 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
643 break; 677 break;
644 678
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 679#endif
653 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
688 break; 715 break;
689 716
690 case XK_Find: 717 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
692 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
693 case XK_Insert: 731 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
695 break; 733 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 735 case DXK_Remove:
… …
787#undef FKEY 825#undef FKEY
788 default: 826 default:
789 newlen = 0; 827 newlen = 0;
790 break; 828 break;
791 } 829 }
830
792 if (newlen) 831 if (newlen)
793 len = strlen (kbuf); 832 len = strlen (kbuf);
794 } 833 }
795 834
796 /* 835 /*
… …
805 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
806 { 845 {
807 len = 1; 846 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
810 else 854 else
811 { 855 {
812#ifdef META8_OPTION 856#ifdef META8_OPTION
813 /* set 8-bit on */ 857 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
815 { 859 {
816 unsigned char *ch; 860 char *ch;
817 861
818 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
819 *ch |= 0x80; 863 *ch |= 0x80;
820 864
821 meta = 0; 865 meta = 0;
… …
823#endif 867#endif
824 /* nil */ ; 868 /* nil */ ;
825 } 869 }
826 } 870 }
827 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
828 if (len <= 0) 875 if (len <= 0)
829 return; /* not mapped */ 876 return; /* not mapped */
830 877
831 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 879 if (view_start)
833 { 880 {
834 TermWin.view_start = 0; 881 view_start = 0;
835 want_refresh = 1; 882 want_refresh = 1;
836 } 883 }
837 884
838 /* 885 /*
839 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
854#ifdef META8_OPTION 901#ifdef META8_OPTION
855 && meta_char == C0_ESC 902 && meta_char == C0_ESC
856#endif 903#endif
857 ) 904 )
858 { 905 {
859 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
860 tt_write (&ch, 1); 907 tt_write (&ch, 1);
861 } 908 }
862 909
863#if defined(DEBUG_CMD)
864 /* Display keyboard buffer contents */
865 unsigned char *p;
866 int i;
867
868 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
869 for (i = 0, p = kbuf; i < len; i++, p++)
870 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
871 fprintf (stderr, "'\n");
872#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 910 tt_write (kbuf, (unsigned int)len);
874} 911}
875/*}}} */ 912/*}}} */
876 913
877#if (MENUBAR_MAX) 914#if defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */
880unsigned int 915unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 916rxvt_term::cmd_write (const char *str, unsigned int count)
882{ 917{
883 unsigned int n, s; 918 unsigned int n, s;
884 919
885 n = cmdbuf_ptr - cmdbuf_base; 920 n = cmdbuf_ptr - cmdbuf_base;
886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 921 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
905 940
906 cmd_parse (); 941 cmd_parse ();
907 942
908 return 0; 943 return 0;
909} 944}
910#endif /* MENUBAR_MAX */ 945#endif
911 946
912void 947void
913rxvt_term::flush () 948rxvt_term::flush ()
914{ 949{
950 flush_ev.stop ();
951
915#ifdef TRANSPARENT 952#ifdef TRANSPARENT
916 if (want_full_refresh) 953 if (want_full_refresh)
917 { 954 {
918 want_full_refresh = 0; 955 want_full_refresh = 0;
919 scr_clear (); 956 scr_clear ();
… …
921 } 958 }
922#endif 959#endif
923 960
924 if (want_refresh) 961 if (want_refresh)
925 { 962 {
963 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
964 {
965 int row = view_start;
966 int end_row = row + nrow;
967
968 while (row > top_row && ROW (row - 1).is_longer ())
969 --row;
970
971 do
972 {
973 int start_row = row;
974 line_t *l;
975
976 do
977 {
978 l = &ROW (row++);
979
980 if (!(l->f & LINE_FILTERED))
981 {
982 // line not filtered, mark it as filtered
983 l->f |= LINE_FILTERED;
984 while (l->is_longer ())
985 {
986 l = &ROW (row++);
987 l->f |= LINE_FILTERED;
988 }
989
990 // and filter it
991 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
992
993 break;
994 }
995 }
996 while (l->is_longer () && row < end_row);
997 }
998 while (row < end_row);
999 }
1000
926 scr_refresh (refresh_type); 1001 scr_refresh ();
927 scrollbar_show (1); 1002 scrollbar_show (1);
928#ifdef USE_XIM 1003#ifdef USE_XIM
929 IMSendSpot (); 1004 IMSendSpot ();
930#endif 1005#endif
931 } 1006 }
932 1007
933 display->flush (); 1008 display->flush ();
934
935 flush_ev.stop ();
936} 1009}
937 1010
938void 1011void
939rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
940{ 1013{
941 SET_R (this); 1014 make_current ();
942 SET_LOCALE (locale);
943 1015
944 display->flush (); 1016 display->flush ();
945 1017
946 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01); 1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
948} 1020}
949 1021
950void 1022void
951rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
952{ 1024{
953 SET_R (this); 1025 make_current ();
954 SET_LOCALE (locale);
955 1026
956 refresh_limit = 1; 1027 refresh_limit = 1;
957 refresh_count = 0; 1028 refresh_count = 0;
958 flush (); 1029 flush ();
959} 1030}
… …
963rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
964{ 1035{
965 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
966 want_refresh = 1; 1037 want_refresh = 1;
967 1038
968 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
969} 1040}
970#endif 1041#endif
971 1042
972#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
973void 1044void
… …
987rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
988{ 1059{
989 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
990 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
991 { 1062 {
992 refresh_type |= SMOOTH_REFRESH;
993 want_refresh = 1; 1063 want_refresh = 1;
994 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
995 } 1065 }
996} 1066}
997#endif 1067#endif
… …
1001rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
1002{ 1072{
1003 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1004 { 1074 {
1005 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1076 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 } 1078 }
1010} 1079}
1011#endif 1080#endif
… …
1016{ 1085{
1017 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1089 {
1021 refresh_type |= SMOOTH_REFRESH; 1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
1022 want_refresh = 1; 1093 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1095 }
1025} 1096}
1026#endif 1097#endif
1027 1098
1099#if LINUX_YIELD_HACK
1100static struct event_handler
1101{
1102 check_watcher yield_ev;
1103
1104 void yield_cb (check_watcher &w)
1105 {
1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels.
1109
1110 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0);
1112
1113 w.stop ();
1114 }
1115
1116 event_handler ()
1117 : yield_ev (this, &event_handler::yield_cb)
1118 {
1119 }
1120} event_handler;
1121#endif
1122
1028bool 1123bool
1029rxvt_term::pty_fill () 1124rxvt_term::pty_fill ()
1030{ 1125{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1126 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032 1127
1033 if (CBUFSIZ == n) 1128 if (CBUFSIZ == n)
1034 { 1129 {
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1130 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1036 n = 0; 1131 n = 0;
1037 } 1132 }
1038 1133
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1134 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1135 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1136 cmdbuf_endp = cmdbuf_ptr + n;
1042 1137
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1138 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1044 1139
1045 if (n > 0) 1140 if (r > 0)
1046 { 1141 {
1047 cmdbuf_endp += n; 1142 cmdbuf_endp += r;
1048 return true; 1143 return true;
1049 } 1144 }
1050 else if (n < 0 && errno != EAGAIN) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1146 {
1147#if LINUX_YIELD_HACK
1148 if (display->is_local)
1149 event_handler.yield_ev.start ();
1150#endif
1151 }
1152 else
1153 {
1154 pty_ev.stop ();
1155
1156 if (!OPTION (Opt_hold))
1051 destroy (); 1157 destroy ();
1158 }
1052 1159
1053 return false; 1160 return false;
1054} 1161}
1055 1162
1056void 1163void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1164rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1165{
1059 SET_R (this); 1166 make_current ();
1060 SET_LOCALE (locale);
1061 1167
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1168 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1169 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1170 while (pty_fill ())
1067 if (cmd_parse ()) 1171 if (cmd_parse ())
1068 break; 1172 break;
1173
1174 if (revents & EVENT_WRITE)
1175 pty_write ();
1069} 1176}
1070 1177
1071void 1178void
1072rxvt_term::pointer_unblank () 1179rxvt_term::pointer_unblank ()
1073{ 1180{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1181 XDefineCursor (xdisp, vt, TermWin_cursor);
1075 recolour_cursor (); 1182 recolour_cursor ();
1076 1183
1077#ifdef POINTER_BLANK 1184#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1185 hidden_pointer = 0;
1079 1186
1080 if (options & Opt_pointerBlank) 1187 if (OPTION (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1188 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif 1189#endif
1083} 1190}
1084 1191
1085#ifdef POINTER_BLANK 1192#ifdef POINTER_BLANK
1086void 1193void
1087rxvt_term::pointer_blank () 1194rxvt_term::pointer_blank ()
1088{ 1195{
1089 if (! (options & Opt_pointerBlank)) 1196 if (!OPTION (Opt_pointerBlank))
1090 return; 1197 return;
1091 1198
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1199 XDefineCursor (xdisp, vt, display->blank_cursor);
1093 XFlush (display->display); 1200 XFlush (xdisp);
1094 1201
1095 hidden_pointer = 1; 1202 hidden_pointer = 1;
1096} 1203}
1097 1204
1098void 1205void
1099rxvt_term::pointer_cb (time_watcher &w) 1206rxvt_term::pointer_cb (time_watcher &w)
1100{ 1207{
1101 SET_R (this); 1208 make_current ();
1102 SET_LOCALE (locale);
1103 1209
1104 pointer_blank (); 1210 pointer_blank ();
1105} 1211}
1106#endif 1212#endif
1107 1213
… …
1172 (32 + button_number + key_state), 1278 (32 + button_number + key_state),
1173 (32 + x + 1), 1279 (32 + x + 1),
1174 (32 + y + 1)); 1280 (32 + y + 1));
1175} 1281}
1176 1282
1177#ifdef USING_W11LIB
1178void
1179rxvt_W11_process_x_event (XEvent *ev)
1180{
1181 rxvt_t *r = rxvt_get_r ();
1182
1183 x_cb (*ev);
1184}
1185#endif
1186
1187/*{{{ process an X event */ 1283/*{{{ process an X event */
1188void 1284void
1189rxvt_term::x_cb (XEvent &ev) 1285rxvt_term::x_cb (XEvent &ev)
1190{ 1286{
1191 SET_R (this); 1287 make_current ();
1192 SET_LOCALE (locale);
1193 1288
1194#if defined(CURSOR_BLINK) 1289 dLocal (Display *, xdisp);
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1196 {
1197 if (hidden_cursor)
1198 {
1199 hidden_cursor = 0;
1200 want_refresh = 1;
1201 }
1202 1290
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 if (ev.xany.window == vt
1204 } 1292 && SHOULD_INVOKE (HOOK_X_EVENT)
1205#endif 1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1206
1207#if defined(POINTER_BLANK)
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1209 {
1210 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease)
1213 if (hidden_pointer)
1214 pointer_unblank ();
1215
1216 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank ();
1218 }
1219#endif
1220
1221#ifdef USE_XIM
1222 if (XFilterEvent (&ev, None))
1223 return; 1294 return;
1224#endif
1225 1295
1296 // for XQueryPointer
1226 Window unused_root, unused_child; 1297 Window unused_root, unused_child;
1227 int unused_root_x, unused_root_y; 1298 int unused_root_x, unused_root_y;
1228 unsigned int unused_mask; 1299 unsigned int unused_mask;
1229 1300
1230 switch (ev.type) 1301 switch (ev.type)
1231 { 1302 {
1232 case KeyPress: 1303 case KeyPress:
1233#if ISO_14755 1304#if ISO_14755
… …
1237 1308
1238 break; 1309 break;
1239 1310
1240 case KeyRelease: 1311 case KeyRelease:
1241 { 1312 {
1242#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1243 KeySym ks; 1314 KeySym keysym;
1244 1315
1245 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1246#endif 1317#endif
1247 1318
1248#if ENABLE_FRILLS || ISO_14755 1319#if ENABLE_FRILLS || ISO_14755
1249 // ISO 14755 support 1320 // ISO 14755 support
1250 if (iso14755buf) 1321 if (iso14755buf)
… …
1255# endif 1326# endif
1256# if ISO_14755 1327# if ISO_14755
1257 // iso14755 part 5.2 handling: release time 1328 // iso14755 part 5.2 handling: release time
1258 // first: controls 1329 // first: controls
1259 if ((ev.xkey.state & ControlMask) 1330 if ((ev.xkey.state & ControlMask)
1260 && ((ks >= 0x40 && ks <= 0x5f) 1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1261 || (ks >= 0x61 && ks <= 0x7f))) 1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1262 { 1333 {
1263 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1264 commit_iso14755 (); 1335 commit_iso14755 ();
1265 return; // case-break; 1336 goto skip_switch;
1266 } 1337 }
1267 1338
1268 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1269 if (i[0] == ks) 1340 if (i[0] == keysym)
1270 { 1341 {
1271 iso14755buf = ISO_14755_51 | i[1]; 1342 iso14755buf = ISO_14755_51 | i[1];
1272 commit_iso14755 (); 1343 commit_iso14755 ();
1273 return; // case-break; 1344 goto skip_switch;
1274 } 1345 }
1275 1346
1276 scr_bell (); 1347 scr_bell ();
1277# endif 1348# endif
1278 iso14755buf = 0; 1349 iso14755buf = 0;
… …
1297 else 1368 else
1298 iso14755buf = 0; 1369 iso14755buf = 0;
1299 } 1370 }
1300#endif 1371#endif
1301 1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1303 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1304 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1305 else if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1306 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1307#endif 1382#endif
1308 break; 1383 break;
1309 } 1384 }
1310 1385
… …
1316 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1317 break; 1392 break;
1318 1393
1319 case ClientMessage: 1394 case ClientMessage:
1320 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1321 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1396 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1322 destroy ();
1323#ifdef OFFIX_DND
1324 /* OffiX Dnd (drag 'n' drop) protocol */
1325 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1326 && (ev.xclient.data.l[0] == DndFile
1327 || ev.xclient.data.l[0] == DndDir
1328 || ev.xclient.data.l[0] == DndLink))
1329 { 1397 {
1330 /* Get Dnd data */ 1398 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1331 Atom ActualType; 1399 {
1332 int ActualFormat; 1400 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1333 unsigned char *data; 1401 {
1334 unsigned long Size, RemainingBytes; 1402 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 1403 {
1336 XGetWindowProperty (display->display, display->root, 1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1337 xa[XA_DNDSELECTION], 1405 destroy ();
1338 0L, 1000000L, 1406 }
1339 False, AnyPropertyType, 1407#if ENABLE_EWMH
1340 &ActualType, &ActualFormat, 1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1341 &Size, &RemainingBytes, 1409 XSendEvent (xdisp, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask,
1342 &data); 1411 &ev);
1343 XChangeProperty (display->display, display->root, 1412#endif
1344 XA_CUT_BUFFER0, XA_STRING, 1413 }
1345 8, PropModeReplace, 1414 }
1346 data, strlen (data)); 1415#if ENABLE_XEMBED
1347 XFree (data); 1416 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1348 selection_paste (display->root, XA_CUT_BUFFER0, True); 1417 {
1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1418 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1419 focus_in ();
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out ();
1422 }
1423#endif
1350 } 1424 }
1351#endif /* OFFIX_DND */
1352 break; 1425 break;
1353 1426
1354 case MappingNotify: 1427 case MappingNotify:
1355 XRefreshKeyboardMapping (&ev.xmapping); 1428 XRefreshKeyboardMapping (&ev.xmapping);
1356 break; 1429 break;
… …
1379 break; 1452 break;
1380 } 1453 }
1381 break; 1454 break;
1382 1455
1383 case FocusIn: 1456 case FocusIn:
1384 if (!TermWin.focus) 1457 focus_in ();
1458 break;
1459
1460 case FocusOut:
1461 focus_out ();
1462 break;
1463
1464 case ConfigureNotify:
1465 if (ev.xconfigure.window == parent[0])
1385 { 1466 {
1386 TermWin.focus = 1; 1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1387 want_refresh = 1;
1388#ifdef USE_XIM
1389 if (Input_Context != NULL)
1390 { 1468 ;
1391 IMSetStatusPosition ();
1392 XSetICFocus (Input_Context);
1393 }
1394#endif
1395#ifdef CURSOR_BLINK
1396 if (options & Opt_cursorBlink)
1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398#endif
1399#ifdef OFF_FOCUS_FADING
1400 if (rs[Rs_fade])
1401 {
1402 pix_colors = pix_colors_focused;
1403 scr_recolour ();
1404 }
1405#endif
1406 1469
1407 }
1408 break;
1409
1410 case FocusOut:
1411 if (TermWin.focus)
1412 {
1413 TermWin.focus = 0;
1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1422#ifdef USE_XIM
1423 if (Input_Context != NULL)
1424 XUnsetICFocus (Input_Context);
1425#endif
1426#ifdef CURSOR_BLINK
1427 if (options & Opt_cursorBlink)
1428 cursor_blink_ev.stop ();
1429 hidden_cursor = 0;
1430#endif
1431#ifdef OFF_FOCUS_FADING
1432 if (rs[Rs_fade])
1433 {
1434 pix_colors = pix_colors_unfocused;
1435 scr_recolour ();
1436 }
1437#endif
1438 }
1439 break;
1440
1441 case ConfigureNotify:
1442 if (ev.xconfigure.window == TermWin.parent[0])
1443 {
1444 int height, width;
1445
1446 do
1447 { /* Wrap lots of configures into one */
1448 width = ev.xconfigure.width;
1449 height = ev.xconfigure.height;
1450 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451 }
1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1453
1454 if (szHint.width != width || szHint.height != height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1455 { 1471 {
1456 seen_resize = 1; 1472 seen_resize = 1;
1457 resize_all_windows (width, height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1458 } 1474 }
1459 1475
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461 if (options & Opt_transparent) 1479 if (OPTION (Opt_transparent))
1462 {
1463 check_our_parents (); 1480 check_our_parents ();
1464 if (am_transparent)
1465 want_refresh = want_full_refresh = 1;
1466 }
1467#endif 1481#endif
1468 } 1482 }
1469 break; 1483 break;
1470 1484
1471 case PropertyNotify: 1485 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue) 1488 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom); 1489 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475 1490
1476 break; 1491 break;
1477 1492
1478 case SelectionClear: 1493 case SelectionClear:
1479 selection_clear (); 1494 selection_clear ();
1480 break; 1495 break;
1481 1496
1482 case SelectionNotify: 1497 case SelectionNotify:
1483 if (selection_wait == Sel_normal) 1498 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, 1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 ev.xselection.property, True);
1486 break; 1500 break;
1487 1501
1488 case SelectionRequest: 1502 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1490 break; 1504 break;
1491 1505
1506 case MapNotify:
1507 mapped = 1;
1508#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1510#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 break;
1513
1492 case UnmapNotify: 1514 case UnmapNotify:
1493 TermWin.mapped = 0; 1515 mapped = 0;
1494#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1517 text_blink_ev.stop ();
1496#endif 1518#endif
1497 break; 1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498
1499 case MapNotify:
1500 TermWin.mapped = 1;
1501#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif
1504 break; 1520 break;
1505 1521
1506#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1507 case ReparentNotify: 1523 case ReparentNotify:
1508 rootwin_cb (ev); 1524 rootwin_cb (ev);
1509 break; 1525 break;
1510#endif /* TRANSPARENT */ 1526#endif /* TRANSPARENT */
1511 1527
1512 case GraphicsExpose: 1528 case GraphicsExpose:
1513 case Expose: 1529 case Expose:
1514 if (ev.xany.window == TermWin.vt) 1530 if (ev.xany.window == vt)
1515 { 1531 {
1516 do 1532 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1520 1536
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1538
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1526 1542
1527 scr_refresh (refresh_type); 1543 want_refresh = 1;
1528 } 1544 }
1529 else 1545 else
1530 { 1546 {
1531 XEvent unused_event; 1547 XEvent unused_event;
1532 1548
1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1534 ; 1550 ;
1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1552 ;
1537 1553
1538 if (isScrollbarWindow (ev.xany.window)) 1554 if (isScrollbarWindow (ev.xany.window))
1539 { 1555 {
1540 scrollBar.setIdle (); 1556 scrollBar.setIdle ();
1541 scrollbar_show (0); 1557 scrollbar_show (0);
1542 } 1558 }
1543#ifdef MENUBAR
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose ();
1546#endif
1547 1559
1548#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1561 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (display->display, ev.xany.window); 1562 XClearWindow (xdisp, ev.xany.window);
1551#endif 1563#endif
1552 } 1564 }
1553 break; 1565 break;
1554 1566
1555 case MotionNotify: 1567 case MotionNotify:
1556#ifdef POINTER_BLANK 1568#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1569 if (hidden_pointer)
1558 pointer_unblank (); 1570 pointer_unblank ();
1559#endif 1571#endif
1560#if MENUBAR 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 if (isMenuBarWindow (ev.xany.window)) 1573 break;
1574
1575 if (ev.xany.window == vt)
1562 { 1576 {
1563 menubar_control (ev.xbutton); 1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1564 break; 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1565 } 1579 ; // nop
1566#endif
1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1568 break;
1569
1570 if (ev.xany.window == TermWin.vt)
1571 {
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1581 {
1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1575 ; 1583 ;
1576 1584
1577 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (xdisp, vt,
1578 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1580 & (ev.xbutton.x), & (ev.xbutton.y), 1588 &ev.xbutton.x, &ev.xbutton.y,
1581 &unused_mask); 1589 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
1583 /* deal with a `jumpy' mouse */ 1591 /* deal with a `jumpy' mouse */
1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585 { 1593 {
1586#endif 1594#endif
… …
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break; 1600 break;
1593 } 1601 }
1594#endif 1602#endif
1595 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1596 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1605
1597#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1598 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1600 { 1609 {
1601 int dist; 1610 int dist;
1602 1611
1603 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1604 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1612 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1613 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615 1624
1616 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1617 if (ev.xbutton.y<TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1618 { 1627 {
1619 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1620 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1621 } 1630 }
1622 else 1631 else
1623 { 1632 {
1624 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1626 } 1635 }
1627 1636
1628 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1629 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1; 1639 + 1;
1631 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1632 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1633 } 1642 }
1634 else 1643 else
1635 { 1644 {
1636 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1645#endif 1654#endif
1646 } 1655 }
1647 } 1656 }
1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649 { 1658 {
1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1651 MotionNotify, &ev)) ; 1660 MotionNotify, &ev))
1661 ;
1662
1652 XQueryPointer (display->display, scrollBar.win, 1663 XQueryPointer (xdisp, scrollBar.win,
1653 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1655 & (ev.xbutton.x), & (ev.xbutton.y), 1666 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1667 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658 scrollbar_size ()); 1669 scrollbar_size ());
1659 scr_refresh (refresh_type); 1670 want_refresh = 1;
1660 refresh_limit = 0; 1671 refresh_limit = 0;
1661 scrollbar_show (1); 1672 scrollbar_show (1);
1662 } 1673 }
1663 break; 1674 break;
1664 } 1675 }
1676
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 }
1690#endif
1691
1692#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 {
1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer)
1699 pointer_unblank ();
1700
1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank ();
1703 }
1704#endif
1705}
1706
1707void
1708rxvt_term::focus_in ()
1709{
1710 if (!focus)
1711 {
1712 focus = 1;
1713 want_refresh = 1;
1714
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1716
1717#if USE_XIM
1718 if (Input_Context != NULL)
1719 {
1720 IMSetStatusPosition ();
1721 XSetICFocus (Input_Context);
1722 }
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1727#endif
1728#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade])
1730 {
1731 pix_colors = pix_colors_focused;
1732 scr_recolour ();
1733 }
1734#endif
1735 }
1736}
1737
1738void
1739rxvt_term::focus_out ()
1740{
1741 if (focus)
1742 {
1743 focus = 0;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf)
1750 {
1751 iso14755buf = 0;
1752# if ENABLE_OVERLAY
1753 scr_overlay_off ();
1754# endif
1755 }
1756#endif
1757#if USE_XIM
1758 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context);
1760#endif
1761#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink))
1763 cursor_blink_ev.stop ();
1764 hidden_cursor = 0;
1765#endif
1766#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade])
1768 {
1769 pix_colors = pix_colors_unfocused;
1770 scr_recolour ();
1771 }
1772#endif
1773 }
1665} 1774}
1666 1775
1667#if TRANSPARENT 1776#if TRANSPARENT
1668void 1777void
1669rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1670{ 1779{
1671 SET_R (this); 1780 make_current ();
1672 SET_LOCALE (locale);
1673 1781
1674 switch (ev.type) 1782 switch (ev.type)
1675 { 1783 {
1676 case PropertyNotify: 1784 case PropertyNotify:
1677 /* 1785 /*
1678 * if user used some Esetroot compatible prog to set the root bg, 1786 * if user used some Esetroot compatible prog to set the root bg,
1679 * use the property to determine the pixmap. We use it later on. 1787 * use the property to determine the pixmap. We use it later on.
1680 */ 1788 */
1681 if (xa[XA_XROOTPMAPID] == 0)
1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1789 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1685 return; 1791 return;
1686 1792
1687 /* FALLTHROUGH */ 1793 /* FALLTHROUGH */
1688 case ReparentNotify: 1794 case ReparentNotify:
1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1690 want_refresh = want_full_refresh = 1; 1796 want_refresh = want_full_refresh = 1;
1691 break; 1797 break;
1692 } 1798 }
1693} 1799}
1694#endif 1800#endif
… …
1697rxvt_term::button_press (XButtonEvent &ev) 1803rxvt_term::button_press (XButtonEvent &ev)
1698{ 1804{
1699 int reportmode = 0, clickintime; 1805 int reportmode = 0, clickintime;
1700 1806
1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1807 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1808
1702 if (!bypass_keystate) 1809 if (!bypass_keystate)
1703 reportmode = !! (priv_modes & PrivMode_mouse_report); 1810 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704 1811
1705 /* 1812 /*
1706 * VT window processing of button press 1813 * VT window processing of button press
1707 */ 1814 */
1708 if (ev.window == TermWin.vt) 1815 if (ev.window == vt)
1709 { 1816 {
1817 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1710#if ISO_14755 1820#if ISO_14755
1711 // 5.4 1821 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 { 1823 {
1714 iso14755_54 (ev.x, ev.y); 1824 iso14755_54 (ev.x, ev.y);
1715 return; 1825 return;
1716 } 1826 }
1717#endif 1827#endif
1718 1828
1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1829 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1830
1720 if (reportmode) 1831 if (reportmode)
1721 { 1832 {
1722 /* mouse report from vt window */ 1833 /* mouse report from vt window */
1723 /* save the xbutton state (for ButtonRelease) */ 1834 /* save the xbutton state (for ButtonRelease) */
1724 MEvent.state = ev.state; 1835 MEvent.state = ev.state;
1725#ifdef MOUSE_REPORT_DOUBLECLICK 1836#ifdef MOUSE_REPORT_DOUBLECLICK
1726 if (ev.button == MEvent.button && clickintime) 1837 if (ev.button == MEvent.button && clickintime)
1727 { 1838 {
1728 /* same button, within alloted time */ 1839 /* same button, within alloted time */
1729 MEvent.clicks++; 1840 MEvent.clicks++;
1841
1730 if (MEvent.clicks > 1) 1842 if (MEvent.clicks > 1)
1731 { 1843 {
1732 /* only report double clicks */ 1844 /* only report double clicks */
1733 MEvent.clicks = 2; 1845 MEvent.clicks = 2;
1734 mouse_report (ev); 1846 mouse_report (ev);
… …
1753 } 1865 }
1754 else 1866 else
1755 { 1867 {
1756 if (ev.button != MEvent.button) 1868 if (ev.button != MEvent.button)
1757 MEvent.clicks = 0; 1869 MEvent.clicks = 0;
1870
1758 switch (ev.button) 1871 switch (ev.button)
1759 { 1872 {
1760 case Button1: 1873 case Button1:
1874 /* allow meta + click to select rectangular areas */
1875 /* should be done in screen.C */
1876#if ENABLE_FRILLS
1877 selection.rect = !!(ev.state & ModMetaMask);
1878#else
1879 selection.rect = false;
1880#endif
1881
1761 /* allow shift+left click to extend selection */ 1882 /* allow shift+left click to extend selection */
1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1883 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1763 { 1884 {
1764 if (MEvent.button == Button1 && clickintime) 1885 if (MEvent.button == Button1 && clickintime)
1765 selection_rotate (ev.x, ev.y); 1886 selection_rotate (ev.x, ev.y);
1766 else 1887 else
1767 selection_extend (ev.x, ev.y, 1); 1888 selection_extend (ev.x, ev.y, 1);
… …
1908 case Button3: 2029 case Button3:
1909 if (scrollBar.style != R_SB_XTERM) 2030 if (scrollBar.style != R_SB_XTERM)
1910 { 2031 {
1911 if (scrollbar_above_slider (ev.y)) 2032 if (scrollbar_above_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2033# ifdef RXVT_SCROLL_FULL
1913 scr_page (UP, TermWin.nrow - 1); 2034 scr_page (UP, nrow - 1);
1914# else 2035# else
1915 scr_page (UP, TermWin.nrow / 4); 2036 scr_page (UP, nrow / 4);
1916# endif 2037# endif
1917 else if (scrollbar_below_slider (ev.y)) 2038 else if (scrollbar_below_slider (ev.y))
1918# ifdef RXVT_SCROLL_FULL 2039# ifdef RXVT_SCROLL_FULL
1919 scr_page (DN, TermWin.nrow - 1); 2040 scr_page (DN, nrow - 1);
1920# else 2041# else
1921 scr_page (DN, TermWin.nrow / 4); 2042 scr_page (DN, nrow / 4);
1922# endif 2043# endif
1923 else 2044 else
1924 scrollBar.setMotion (); 2045 scrollBar.setMotion ();
1925 } 2046 }
1926 else 2047 else
1927 { 2048 {
1928 scr_page ((ev.button == Button1 ? DN : UP), 2049 scr_page ((ev.button == Button1 ? DN : UP),
1929 (TermWin.nrow 2050 (nrow
1930 * scrollbar_position (ev.y) 2051 * scrollbar_position (ev.y)
1931 / scrollbar_size ())); 2052 / scrollbar_size ()));
1932 } 2053 }
1933 2054
1934 break; 2055 break;
1935 } 2056 }
1936 } 2057 }
2058
1937 return; 2059 return;
1938 } 2060 }
1939#if MENUBAR
1940 /*
1941 * Menubar window processing of button press
1942 */
1943 if (isMenuBarWindow (ev.window))
1944 menubar_control (ev);
1945#endif
1946} 2061}
1947 2062
1948void 2063void
1949rxvt_term::button_release (XButtonEvent &ev) 2064rxvt_term::button_release (XButtonEvent &ev)
1950{ 2065{
… …
1956 2071
1957 if (scrollbar_isUpDn ()) 2072 if (scrollbar_isUpDn ())
1958 { 2073 {
1959 scrollBar.setIdle (); 2074 scrollBar.setIdle ();
1960 scrollbar_show (0); 2075 scrollbar_show (0);
1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1962 refresh_type &= ~SMOOTH_REFRESH;
1963#endif
1964 } 2076 }
1965 2077
1966#ifdef SELECTION_SCROLLING 2078#ifdef SELECTION_SCROLLING
1967 if (sel_scroll_ev.active) 2079 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop(); 2080 sel_scroll_ev.stop();
1969#endif 2081#endif
1970 2082
1971 if (ev.window == TermWin.vt) 2083 if (ev.window == vt)
1972 { 2084 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2086 return;
2087
1973#if ISO_14755 2088#if ISO_14755
1974 // 5.4 2089 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2090 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return; 2091 return;
1977#endif 2092#endif
2093
1978 if (reportmode) 2094 if (reportmode)
1979 { 2095 {
1980 /* mouse report from vt window */ 2096 /* mouse report from vt window */
1981 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
1982 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
2012 { 2128 {
2013 case Button1: 2129 case Button1:
2014 case Button3: 2130 case Button3:
2015 selection_make (ev.time); 2131 selection_make (ev.time);
2016 break; 2132 break;
2133
2017 case Button2: 2134 case Button2:
2018 selection_request (ev.time, ev.x, ev.y); 2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2019 break; 2137 break;
2138
2020#ifdef MOUSE_WHEEL 2139#ifdef MOUSE_WHEEL
2021 case Button4: 2140 case Button4:
2022 case Button5: 2141 case Button5:
2023 { 2142 {
2024 int i; 2143 int i;
… …
2026 2145
2027 v = ev.button == Button4 ? UP : DN; 2146 v = ev.button == Button4 ? UP : DN;
2028 2147
2029 if (ev.state & ShiftMask) 2148 if (ev.state & ShiftMask)
2030 i = 1; 2149 i = 1;
2031 else if (options & Opt_mouseWheelScrollPage) 2150 else if (OPTION (Opt_mouseWheelScrollPage))
2032 i = TermWin.nrow - 1; 2151 i = nrow - 1;
2033 else 2152 else
2034 i = 5; 2153 i = 5;
2035 2154
2036# ifdef MOUSE_SLIP_WHEELING 2155# ifdef MOUSE_SLIP_WHEELING
2037 if (ev.state & ControlMask) 2156 if (ev.state & ControlMask)
2038 { 2157 {
2039 mouse_slip_wheel_speed += v ? -1 : 1; 2158 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2159 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2160 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042 2161
2043 if (slip_wheel_ev.at < NOW) 2162 if (slip_wheel_ev.at < NOW)
2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2163 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045 2164
2046 slip_wheel_ev.start (); 2165 slip_wheel_ev.start ();
2047 } 2166 }
2048 else 2167 else
2049 { 2168 {
2050# endif 2169# endif
2051# ifdef JUMP_MOUSE_WHEEL
2052 scr_page (v, i); 2170 scr_page (v, i);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1); 2171 scrollbar_show (1);
2055# else
2056 while (i--)
2057 {
2058 scr_page (v, 1);
2059 scr_refresh (SMOOTH_REFRESH);
2060 scrollbar_show (1);
2061 }
2062# endif
2063# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
2064 } 2173 }
2065#endif 2174# endif
2066 } 2175 }
2067 break; 2176 break;
2068#endif 2177#endif
2069 } 2178 }
2070 } 2179 }
2071#ifdef MENUBAR
2072 else if (isMenuBarWindow (ev.window))
2073 menubar_control (ev);
2074#endif
2075} 2180}
2076 2181
2077#ifdef TRANSPARENT 2182#ifdef TRANSPARENT
2078#if TINTING 2183#if TINTING
2079/* taken from aterm-0.4.2 */ 2184/* taken from aterm-0.4.2 */
2080 2185
2081typedef uint32_t RUINT32T; 2186typedef uint32_t RUINT32T;
2082 2187
2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2084{ 2189{
2085 int sh_r, sh_g, sh_b; 2190 int sh_r, sh_g, sh_b;
2086 RUINT32T mask_r, mask_g, mask_b; 2191 RUINT32T mask_r, mask_g, mask_b;
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2195 int i;
2091 2196
2092 Visual* visual = display->visual; 2197 Visual *visual = term->visual;
2093 2198
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2200
2096 /* for convenience */ 2201 /* for convenience */
2097 mask_r = visual->red_mask; 2202 mask_r = visual->red_mask;
… …
2321 Pixmap rootpixmap = None; 2426 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2427 XWindowAttributes wattr, wrootattr;
2323 2428
2324 pchanged = 0; 2429 pchanged = 0;
2325 2430
2326 if (!(options & Opt_transparent)) 2431 if (!OPTION (Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2432 return pchanged; /* Don't try any more */
2328 2433
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2435 rootdepth = wrootattr.depth;
2331 2436
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2333 2438
2334 if (rootdepth != wattr.depth) 2439 if (rootdepth != wattr.depth)
2335 { 2440 {
2336 if (am_transparent) 2441 if (am_transparent)
2337 { 2442 {
2338 pchanged = 1; 2443 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2445 am_transparent = am_pixmap_trans = 0;
2341 } 2446 }
2342 2447
2343 return pchanged; /* Don't try any more */ 2448 return pchanged; /* Don't try any more */
2344 } 2449 }
2345 2450
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2452 XSync (xdisp, False);
2348 2453
2349 /* 2454 /*
2350 * Make the frame window set by the window manager have 2455 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2456 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2457 * windows for each client, so we have to take care about that.
2353 */ 2458 */
2354 i = (xa[XA_XROOTPMAPID] 2459 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2462 &nitems, &bytes_after, &prop) == Success);
2358 2463
2359 if (!i || prop == NULL) 2464 if (!i || prop == NULL)
2360 i = (xa[XA_XSETROOTID] 2465 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2364 2469
2365 if (!i || prop == NULL 2470 if (!i || prop == NULL
2366#if TINTING 2471#if TINTING
2367 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2368#endif 2473#endif
2369 ) 2474 )
2370 have_pixmap = 0; 2475 have_pixmap = 0;
2371 else 2476 else
2372 { 2477 {
… …
2385 Window cr; 2490 Window cr;
2386 XImage *image; 2491 XImage *image;
2387 GC gc; 2492 GC gc;
2388 XGCValues gcvalue; 2493 XGCValues gcvalue;
2389 2494
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2496 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2497 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2498 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2499 nx = ny = 0;
2395 2500
… …
2405 nh += sy; 2510 nh += sy;
2406 ny = -sy; 2511 ny = -sy;
2407 sy = 0; 2512 sy = 0;
2408 } 2513 }
2409 2514
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517
2518 XSync (xdisp, False);
2412 allowedxerror = -1; 2519 allowedxerror = -1;
2413 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414 2521
2415 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2416 /* XXX: may need a delay here? */ 2523 /* XXX: may need a delay here? */
2417 allowedxerror = 0; 2524 allowedxerror = 0;
2418 2525
2419 if (image == NULL) 2526 if (image == NULL)
2420 { 2527 {
2421 if (am_transparent && am_pixmap_trans) 2528 if (am_transparent && am_pixmap_trans)
2422 { 2529 {
2423 pchanged = 1; 2530 pchanged = 1;
2424 if (TermWin.pixmap != None) 2531 if (pixmap != None)
2425 { 2532 {
2426 XFreePixmap (display->display, TermWin.pixmap); 2533 XFreePixmap (xdisp, pixmap);
2427 TermWin.pixmap = None; 2534 pixmap = None;
2428 } 2535 }
2429 } 2536 }
2430 2537
2431 am_pixmap_trans = 0; 2538 am_pixmap_trans = 0;
2432 } 2539 }
2433 else 2540 else
2434 { 2541 {
2435 if (TermWin.pixmap != None) 2542 if (pixmap != None)
2436 XFreePixmap (display->display, TermWin.pixmap); 2543 XFreePixmap (xdisp, pixmap);
2437 2544
2438#if TINTING 2545#if TINTING
2439 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2440 { 2547 {
2441 unsigned short rm, gm, bm;
2442 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2443 2549
2550 rgba c;
2444 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2445 2552
2446 ShadeXImage (display, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2447 } 2554 }
2448#endif 2555#endif
2449 2556
2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2451 szHint.width, szHint.height, image->depth);
2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2454 nx, ny, image->width, image->height); 2560 nx, ny, image->width, image->height);
2455 XFreeGC (display->display, gc); 2561 XFreeGC (xdisp, gc);
2456 XDestroyImage (image); 2562 XDestroyImage (image);
2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2458 XClearWindow (display->display, TermWin.parent[0]); 2564 XClearWindow (xdisp, parent[0]);
2459 2565
2460 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2461 pchanged = 1; 2567 pchanged = 1;
2462 2568
2463 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2464 } 2570 }
2465 } 2571 }
2466 2572
2467 if (!am_pixmap_trans) 2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else
2468 { 2576 {
2469 unsigned int n; 2577 unsigned int n;
2470 /* 2578 /*
2471 * InheritPixmap transparency 2579 * InheritPixmap transparency
2472 */ 2580 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2582 {
2475 oldp = TermWin.parent[i]; 2583 oldp = parent[i];
2476 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2477 &TermWin.parent[i], &list, &n);
2478 XFree (list); 2585 XFree (list);
2479 2586
2480 if (TermWin.parent[i] == display->root) 2587 if (parent[i] == display->root)
2481 { 2588 {
2482 if (oldp != None) 2589 if (oldp != None)
2483 pchanged = 1; 2590 pchanged = 1;
2484 2591
2485 break; 2592 break;
2486 } 2593 }
2487 2594
2488 if (oldp != TermWin.parent[i]) 2595 if (oldp != parent[i])
2489 pchanged = 1; 2596 pchanged = 1;
2490 } 2597 }
2491 2598
2492 n = 0; 2599 n = 0;
2493 2600
2494 if (pchanged) 2601 if (pchanged)
2495 {
2496 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2497 { 2603 {
2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2607 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2609 break;
2503 } 2610 }
2504 } 2611 }
2612
2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2505 } 2614 {
2506
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2508 {
2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2617 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
2513 } 2619 }
2514 else 2620 else
2515 { 2621 {
2516#if WAIT_FOR_WM
2517 /* wait (an arbitrary period) for the WM to do its thing
2518 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1);
2520#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2622 for (n = 0; n < (unsigned int)i; n++)
2522 { 2623 {
2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2524 XClearWindow (display->display, TermWin.parent[n]); 2625 XClearWindow (xdisp, parent[n]);
2525 } 2626 }
2526 2627
2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2528 am_transparent = 1; 2629 am_transparent = 1;
2529 } 2630 }
2530 2631
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2633 parent[i] = None;
2533 } 2634 }
2534 2635
2535 if (scrollBar.win) 2636 if (scrollBar.win)
2536 { 2637 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle (); 2639 scrollBar.setIdle ();
2539 scrollbar_show (0); 2640 scrollbar_show (0);
2540 } 2641 }
2541 2642
2643 if (am_transparent)
2644 {
2645 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans)
2647 flush ();
2648 }
2649
2542 return pchanged; 2650 return pchanged;
2543} 2651}
2544#endif 2652#endif
2545 2653
2546/*}}} */ 2654/*}}} */
2547 2655
2548bool 2656bool
2549rxvt_term::cmd_parse () 2657rxvt_term::cmd_parse ()
2550{ 2658{
2551 bool flag = false; 2659 bool flag = false;
2552 unicode_t ch = NOCHAR; 2660 wchar_t ch = NOCHAR;
2553 unsigned char *seq_begin; // remember start of esc-sequence here 2661 char *seq_begin; // remember start of esc-sequence here
2554 2662
2555 for (;;) 2663 for (;;)
2556 { 2664 {
2557 if (ch == NOCHAR) 2665 if (ch == NOCHAR)
2558 { 2666 {
2559 seq_begin = cmdbuf_ptr; 2667 seq_begin = cmdbuf_ptr;
2560 ch = next_char (); 2668 ch = next_char ();
2561 }
2562 2669
2563 if (ch == NOCHAR) // TODO: improve 2670 if (ch == NOCHAR)
2564 break; 2671 break;
2672 }
2565 2673
2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2674 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2567 { 2675 {
2568 if (!seen_input) 2676 if (!seen_input)
2569 { 2677 {
… …
2573 // some window managers resize the window early, and these programs 2681 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong. 2682 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike 2683 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being 2684 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized. 2685 // resized.
2578 if (seen_resize) 2686 if (seen_resize && cmd_pid)
2579 kill (-cmd_pid, SIGWINCH); 2687 kill (-cmd_pid, SIGWINCH);
2580 } 2688 }
2581 2689
2582 /* Read a text string from the input buffer */ 2690 /* Read a text string from the input buffer */
2583 unicode_t buf[UBUFSIZ]; 2691 wchar_t buf[UBUFSIZ];
2584 bool refreshnow = false; 2692 bool refreshnow = false;
2585 int nlines = 0; 2693 int nlines = 0;
2586 unicode_t *str = buf; 2694 wchar_t *str = buf;
2695 wchar_t *eol = str + min (ncol, UBUFSIZ);
2587 2696
2588 for (;;) 2697 for (;;)
2589 { 2698 {
2590 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2699 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2591 break; 2700 break;
2592 2701
2593 *str++ = ch; 2702 *str++ = ch;
2594 2703
2595 if (ch == C0_LF) 2704 if (ch == C0_LF || str >= eol)
2596 { 2705 {
2706 if (ch == C0_LF)
2597 nlines++; 2707 nlines++;
2708
2598 refresh_count++; 2709 refresh_count++;
2599 2710
2600 if (!(options & Opt_jumpScroll) 2711 if (!OPTION (Opt_jumpScroll)
2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2602 { 2713 {
2603 refreshnow = true; 2714 refreshnow = true;
2715 refresh_count = 0;
2604 ch = NOCHAR; 2716 ch = NOCHAR;
2605 break; 2717 break;
2606 } 2718 }
2607 2719
2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2720 // scr_add_lines only works for nlines <= nrow - 1.
2609 if (nlines >= TermWin.nrow - 1) 2721 if (nlines >= nrow - 1)
2610 { 2722 {
2723 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2724 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2611 scr_add_lines (buf, nlines, str - buf); 2725 scr_add_lines (buf, str - buf, nlines);
2726
2612 nlines = 0; 2727 nlines = 0;
2613 str = buf; 2728 str = buf;
2729 eol = str + min (ncol, UBUFSIZ);
2614 } 2730 }
2615 }
2616 2731
2617 if (str >= buf + UBUFSIZ) 2732 if (str >= eol)
2618 { 2733 {
2734 if (eol >= buf + UBUFSIZ)
2735 {
2619 ch = NOCHAR; 2736 ch = NOCHAR;
2620 break; 2737 break;
2738 }
2739 else
2740 eol = min (eol + ncol, buf + UBUFSIZ);
2741 }
2742
2621 } 2743 }
2622 2744
2623 seq_begin = cmdbuf_ptr; 2745 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2746 ch = next_char ();
2625 } 2747 }
2626 2748
2749 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2627 scr_add_lines (buf, nlines, str - buf); 2751 scr_add_lines (buf, str - buf, nlines);
2628 2752
2629 /* 2753 /*
2630 * If there have been a lot of new lines, then update the screen 2754 * If there have been a lot of new lines, then update the screen
2631 * What the heck I'll cheat and only refresh less than every page-full. 2755 * What the heck I'll cheat and only refresh less than every page-full.
2632 * the number of pages between refreshes is refresh_limit, which 2756 * the number of pages between refreshes is refresh_limit, which
2633 * is incremented here because we must be doing flat-out scrolling. 2757 * is incremented here because we must be doing flat-out scrolling.
2634 */ 2758 */
2635 if (refreshnow) 2759 if (refreshnow)
2636 { 2760 {
2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2638 refresh_limit++; 2762 refresh_limit++;
2639 else 2763 else
2640 { 2764 {
2641 flag = true; 2765 flag = true;
2642 scr_refresh (refresh_type); 2766 scr_refresh ();
2767 want_refresh = 1;
2643 } 2768 }
2644 } 2769 }
2645 2770
2646 } 2771 }
2647 else 2772 else
… …
2662 } 2787 }
2663 2788
2664 return flag; 2789 return flag;
2665} 2790}
2666 2791
2667// read the next octet
2668unicode_t
2669rxvt_term::next_octet ()
2670{
2671 return cmdbuf_ptr < cmdbuf_endp
2672 ? *cmdbuf_ptr++
2673 : NOCHAR;
2674}
2675
2676// read the next character 2792// read the next character
2677unicode_t 2793wchar_t
2678rxvt_term::next_char () 2794rxvt_term::next_char () NOTHROW
2679{ 2795{
2680 while (cmdbuf_ptr < cmdbuf_endp) 2796 while (cmdbuf_ptr < cmdbuf_endp)
2681 { 2797 {
2682 // assume 7-bit to be ascii ALWAYS 2798 // assume 7-bit to be ascii ALWAYS
2683 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2684 return *cmdbuf_ptr++; 2800 return *cmdbuf_ptr++;
2685 2801
2686 wchar_t wc; 2802 wchar_t wc;
2687 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2803 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2688 2804
2689 if (len == (size_t)-2) 2805 if (len == (size_t)-2)
2690 { 2806 {
2691 // the mbstate stores incomplete sequences. didn't know this :/ 2807 // the mbstate stores incomplete sequences. didn't know this :/
2692 cmdbuf_ptr = cmdbuf_endp; 2808 cmdbuf_ptr = cmdbuf_endp;
2693 break; 2809 break;
2694 } 2810 }
2695 2811
2696 if (len == (size_t)-1) 2812 if (len == (size_t)-1)
2697 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2813 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2698 2814
2699 // assume wchar == unicode 2815 // assume wchar == unicode
2700 cmdbuf_ptr += len; 2816 cmdbuf_ptr += len;
2701 return wc; 2817 return wc & UNICODE_MASK;
2702 } 2818 }
2703 2819
2704 return NOCHAR; 2820 return NOCHAR;
2705} 2821}
2822
2823// read the next octet
2824uint32_t
2825rxvt_term::next_octet () NOTHROW
2826{
2827 return cmdbuf_ptr < cmdbuf_endp
2828 ? (unsigned char)*cmdbuf_ptr++
2829 : NOCHAR;
2830}
2831
2832static class out_of_input out_of_input;
2706 2833
2707/* rxvt_cmd_getc () - Return next input character */ 2834/* rxvt_cmd_getc () - Return next input character */
2708/* 2835/*
2709 * Return the next input character after first passing any keyboard input 2836 * Return the next input character after first passing any keyboard input
2710 * to the command. 2837 * to the command.
2711 */ 2838 */
2712unicode_t 2839wchar_t
2713rxvt_term::cmd_getc () 2840rxvt_term::cmd_getc () THROW ((class out_of_input))
2714{ 2841{
2715 unicode_t c = next_char (); 2842 wchar_t c = next_char ();
2716 2843
2717 if (c == NOCHAR) 2844 if (c == NOCHAR)
2718 throw out_of_input; 2845 throw out_of_input;
2719 2846
2720 return c; 2847 return c;
2721} 2848}
2722 2849
2723unicode_t 2850uint32_t
2724rxvt_term::cmd_get8 () 2851rxvt_term::cmd_get8 () THROW ((class out_of_input))
2725{ 2852{
2726 unicode_t c = next_octet (); 2853 uint32_t c = next_octet ();
2727 2854
2728 if (c == NOCHAR) 2855 if (c == NOCHAR)
2729 throw out_of_input; 2856 throw out_of_input;
2730 2857
2731 return c; 2858 return c;
… …
2831 case C0_ESC: 2958 case C0_ESC:
2832 process_escape_seq (); 2959 process_escape_seq ();
2833 break; 2960 break;
2834 case C0_ENQ: /* terminal Status */ 2961 case C0_ENQ: /* terminal Status */
2835 if (rs[Rs_answerbackstring]) 2962 if (rs[Rs_answerbackstring])
2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2963 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2838 else 2964 else
2839 tt_write ((unsigned char *)VT100_ANS, 2965 tt_write (VT100_ANS, strlen (VT100_ANS));
2840 (unsigned int)strlen (VT100_ANS));
2841 break; 2966 break;
2842 case C0_BEL: /* bell */ 2967 case C0_BEL: /* bell */
2843 scr_bell (); 2968 scr_bell ();
2844 break; 2969 break;
2845 case C0_BS: /* backspace */ 2970 case C0_BS: /* backspace */
… …
2969 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
2970 break; 3095 break;
2971 case '+': 3096 case '+':
2972 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
2973 break; 3098 break;
2974#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
2975 case '6': 3100 case '6':
2976 scr_backindex (); 3101 scr_backindex ();
2977 break; 3102 break;
2978#endif 3103#endif
2979 case '7': 3104 case '7':
2980 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
2981 break; 3106 break;
2982 case '8': 3107 case '8':
2983 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
2984 break; 3109 break;
2985#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
2986 case '9': 3111 case '9':
2987 scr_forwardindex (); 3112 scr_forwardindex ();
2988 break; 3113 break;
2989#endif 3114#endif
2990 case '=': 3115 case '=':
… …
3000 break; 3125 break;
3001 3126
3002 /* 8.3.87: NEXT LINE */ 3127 /* 8.3.87: NEXT LINE */
3003 case C1_NEL: /* ESC E */ 3128 case C1_NEL: /* ESC E */
3004 { 3129 {
3005 unicode_t nlcr[] = { C0_LF, C0_CR }; 3130 wchar_t nlcr[] = { C0_LF, C0_CR };
3006 scr_add_lines (nlcr, 1, 2); 3131 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3007 } 3132 }
3008 break; 3133 break;
3009 3134
3010 /* kidnapped escape sequence: Should be 8.3.48 */ 3135 /* kidnapped escape sequence: Should be 8.3.48 */
3011 case C1_ESA: /* ESC G */ 3136 case C1_ESA: /* ESC G */
… …
3033 process_dcs_seq (); 3158 process_dcs_seq ();
3034 break; 3159 break;
3035 3160
3036 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3161 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3037 case C1_SCI: /* ESC Z */ 3162 case C1_SCI: /* ESC Z */
3038 tt_write ((const unsigned char *)ESCZ_ANSWER, 3163 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3039 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3040 break; /* steal obsolete ESC [ c */ 3164 break; /* steal obsolete ESC [ c */
3041 3165
3042 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3166 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3043 case C1_CSI: /* ESC [ */ 3167 case C1_CSI: /* ESC [ */
3044 process_csi_seq (); 3168 process_csi_seq ();
… …
3153 ndef = get_byte_array_bit (csi_defaults, i); 3277 ndef = get_byte_array_bit (csi_defaults, i);
3154 for (p = 0; p < nargs; p++) 3278 for (p = 0; p < nargs; p++)
3155 if (arg[p] == -1) 3279 if (arg[p] == -1)
3156 arg[p] = ndef; 3280 arg[p] = ndef;
3157 3281
3158#ifdef DEBUG_CMD
3159 fprintf (stderr, "CSI ");
3160 for (p = 0; p < nargs; p++)
3161 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3162 fprintf (stderr, "%c\n", ch);
3163#endif
3164
3165 /* 3282 /*
3166 * private mode handling 3283 * private mode handling
3167 */ 3284 */
3168 if (priv) 3285 if (priv)
3169 { 3286 {
3170 switch (priv) 3287 switch (priv)
3171 { 3288 {
3172 case '>': 3289 case '>':
3173 if (ch == CSI_DA) /* secondary device attributes */ 3290 if (ch == CSI_DA) /* secondary device attributes */
3291 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3297 // that we do not support xterm mouse reporting (should be 95 when we do).
3298 //
3174 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3299 tt_printf ("\033[>%d;94;0c", 'U');
3300 }
3175 break; 3301 break;
3176 case '?': 3302 case '?':
3177 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3178 process_terminal_mode (ch, priv, nargs, arg); 3304 process_terminal_mode (ch, priv, nargs, arg);
3179 break; 3305 break;
… …
3284 3410
3285 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3411 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3286 arg[0] = -arg[0]; 3412 arg[0] = -arg[0];
3287 /* FALLTHROUGH */ 3413 /* FALLTHROUGH */
3288 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3414 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3415 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3290 break; 3416 break;
3291 3417
3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3418 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3293 tt_write ((const unsigned char *)VT100_ANS, 3419 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3294 (unsigned int) (sizeof (VT100_ANS) - 1));
3295 break; 3420 break;
3296 3421
3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3422 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3298 process_sgr_mode (nargs, arg); 3423 process_sgr_mode (nargs, arg);
3299 break; 3424 break;
… …
3306 break; 3431 break;
3307 case 6: /* CPR requested */ 3432 case 6: /* CPR requested */
3308 scr_report_position (); 3433 scr_report_position ();
3309 break; 3434 break;
3310 case 7: /* unofficial extension */ 3435 case 7: /* unofficial extension */
3311 if (options & Opt_insecure) 3436 if (OPTION (Opt_insecure))
3312 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3437 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3313 break; 3438 break;
3314 case 8: /* unofficial extension */ 3439 case 8: /* unofficial extension */
3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3316 break; 3441 break;
… …
3383 break; 3508 break;
3384 case CSI_75: 3509 case CSI_75:
3385 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3386 break; 3511 break;
3387 3512
3388#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3389 case CSI_74: 3514 case CSI_74:
3390 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3391 break; 3516 break;
3392#endif 3517#endif
3393 3518
… …
3400 break; 3525 break;
3401 } 3526 }
3402} 3527}
3403/*}}} */ 3528/*}}} */
3404 3529
3405#if ENABLE_FRILLS 3530#if !ENABLE_MINIMAL
3406/* ARGSUSED */ 3531/* ARGSUSED */
3407void 3532void
3408rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409{ 3534{
3410 int x, y; 3535 int x, y;
3411 XWindowAttributes wattr; 3536 XWindowAttributes wattr;
3412 Window wdummy; 3537 Window wdummy;
3538
3539 dLocal (Display *, xdisp);
3413 3540
3414 if (nargs == 0) 3541 if (nargs == 0)
3415 return; 3542 return;
3416 3543
3417 switch (args[0]) 3544 switch (args[0])
3418 { 3545 {
3419 /* 3546 /*
3420 * commands 3547 * commands
3421 */ 3548 */
3422 case 1: /* deiconify window */ 3549 case 1: /* deiconify window */
3423 XMapWindow (display->display, TermWin.parent[0]); 3550 XMapWindow (xdisp, parent[0]);
3424 break; 3551 break;
3425 case 2: /* iconify window */ 3552 case 2: /* iconify window */
3426 XIconifyWindow (display->display, TermWin.parent[0], 3553 XIconifyWindow (xdisp, parent[0], display->screen);
3427 DefaultScreen (display->display));
3428 break; 3554 break;
3429 case 3: /* set position (pixels) */ 3555 case 3: /* set position (pixels) */
3430 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3556 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3431 break; 3557 break;
3432 case 4: /* set size (pixels) */ 3558 case 4: /* set size (pixels) */
3433 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434 break; 3560 break;
3435 case 5: /* raise window */ 3561 case 5: /* raise window */
3436 XRaiseWindow (display->display, TermWin.parent[0]); 3562 XRaiseWindow (xdisp, parent[0]);
3437 break; 3563 break;
3438 case 6: /* lower window */ 3564 case 6: /* lower window */
3439 XLowerWindow (display->display, TermWin.parent[0]); 3565 XLowerWindow (xdisp, parent[0]);
3440 break; 3566 break;
3441 case 7: /* refresh window */ 3567 case 7: /* refresh window */
3442 scr_touch (true); 3568 scr_touch (true);
3443 break; 3569 break;
3444 case 8: /* set size (chars) */ 3570 case 8: /* set size (chars) */
3445 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3571 set_widthheight ((unsigned int) (args[2] * fwidth),
3446 (unsigned int) (args[1] * TermWin.fheight)); 3572 (unsigned int) (args[1] * fheight));
3447 break; 3573 break;
3448 3574
3449 //case 9: NYI, TODO, restore maximized window or maximize window 3575 //case 9: NYI, TODO, restore maximized window or maximize window
3450 default: 3576 default:
3451 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3452 set_widthheight ((unsigned int)TermWin.width, 3578 set_widthheight ((unsigned int)width,
3453 (unsigned int) (args[1] * TermWin.fheight)); 3579 (unsigned int) (args[1] * fheight));
3454 break; 3580 break;
3455
3456 3581
3457 /* 3582 /*
3458 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3459 */ 3584 */
3460 case 11: /* report window state */ 3585 case 11: /* report window state */
3461 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3462 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463 break; 3588 break;
3464 case 13: /* report window position */ 3589 case 13: /* report window position */
3465 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3590 XGetWindowAttributes (xdisp, parent[0], &wattr);
3466 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3591 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3467 -wattr.border_width, -wattr.border_width, 3592 -wattr.border_width, -wattr.border_width,
3468 &x, &y, &wdummy); 3593 &x, &y, &wdummy);
3469 tt_printf ("\033[3;%d;%dt", x, y); 3594 tt_printf ("\033[3;%d;%dt", x, y);
3470 break; 3595 break;
3471 case 14: /* report window size (pixels) */ 3596 case 14: /* report window size (pixels) */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (xdisp, parent[0], &wattr);
3473 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474 break; 3599 break;
3475 case 18: /* report text area size (chars) */ 3600 case 18: /* report text area size (chars) */
3476 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3601 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3477 break; 3602 break;
3478 case 19: /* report window size (chars) */ 3603 case 19: /* report window size (chars) */
3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3604 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3480 break; 3605 break;
3481 case 20: /* report icon label */ 3606 case 20: /* report icon label */
3482 { 3607 {
3483 char *s; 3608 char *s;
3484 XGetIconName (display->display, TermWin.parent[0], &s); 3609 XGetIconName (xdisp, parent[0], &s);
3485 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3486 XFree (s); 3611 XFree (s);
3487 } 3612 }
3488 break; 3613 break;
3489 case 21: /* report window title */ 3614 case 21: /* report window title */
3490 { 3615 {
3491 char *s; 3616 char *s;
3492 XFetchName (display->display, TermWin.parent[0], &s); 3617 XFetchName (xdisp, parent[0], &s);
3493 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3619 XFree (s);
3495 } 3620 }
3496 break; 3621 break;
3497 } 3622 }
3498} 3623}
… …
3501/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
3502/* 3627/*
3503 * get input up until STRING TERMINATOR (or BEL) 3628 * get input up until STRING TERMINATOR (or BEL)
3504 * ends_how is terminator used. returned input must be free()'d 3629 * ends_how is terminator used. returned input must be free()'d
3505 */ 3630 */
3506unsigned char * 3631char *
3507rxvt_term::get_to_st (unicode_t &ends_how) 3632rxvt_term::get_to_st (unicode_t &ends_how)
3508{ 3633{
3509 unicode_t seen_esc = 0, ch; 3634 unicode_t ch;
3635 bool seen_esc = false;
3510 unsigned int n = 0; 3636 unsigned int n = 0;
3511 unsigned char *s;
3512 unsigned char string[STRING_MAX]; 3637 wchar_t string[STRING_MAX];
3513 3638
3514 while ((ch = cmd_getc ()) != NOCHAR) 3639 while ((ch = cmd_getc ()) != NOCHAR)
3515 { 3640 {
3516 if (seen_esc) 3641 if (seen_esc)
3517 { 3642 {
… …
3520 else 3645 else
3521 return NULL; 3646 return NULL;
3522 } 3647 }
3523 else if (ch == C0_ESC) 3648 else if (ch == C0_ESC)
3524 { 3649 {
3525 seen_esc = 1; 3650 seen_esc = true;
3526 continue; 3651 continue;
3527 } 3652 }
3528 else if (ch == C0_BEL || ch == CHAR_ST) 3653 else if (ch == C0_BEL || ch == CHAR_ST)
3529 break; 3654 break;
3530 else if (ch < 0x20) 3655 else if (ch < 0x20)
3531 return NULL; /* other control character - exit */ 3656 return NULL; /* other control character - exit */
3532 3657
3533 seen_esc = 0; 3658 seen_esc = false;
3534 3659
3535 if (n >= sizeof (string) - 1) 3660 if (n >= STRING_MAX - 1)
3536 // stop at some sane length 3661 // stop at some sane length
3537 return NULL; 3662 return NULL;
3538 3663
3539 if (ch == C0_SYN) 3664 if (ch == C0_SYN)
3540 string[n++] = cmd_get8 (); 3665 string[n++] = cmd_get8 ();
… …
3542 string[n++] = ch; 3667 string[n++] = ch;
3543 } 3668 }
3544 3669
3545 string[n++] = '\0'; 3670 string[n++] = '\0';
3546 3671
3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548 return NULL;
3549
3550 ends_how = (ch == 0x5c ? C0_ESC : ch); 3672 ends_how = (ch == 0x5c ? C0_ESC : ch);
3551 strncpy (s, string, n); 3673
3552 return s; 3674 return rxvt_wcstombs (string);
3553} 3675}
3554 3676
3555/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3556/* 3678/*
3557 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3679 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3558 */ 3680 */
3559void 3681void
3560rxvt_term::process_dcs_seq () 3682rxvt_term::process_dcs_seq ()
3561{ 3683{
3562 unsigned char *s; 3684 char *s;
3563 unicode_t eh; 3685 unicode_t eh;
3564 3686
3565 /* 3687 /*
3566 * Not handled yet 3688 * Not handled yet
3567 */ 3689 */
… …
3586 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3708 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3587 arg = arg * 10 + (ch - '0'); 3709 arg = arg * 10 + (ch - '0');
3588 3710
3589 if (ch == ';') 3711 if (ch == ';')
3590 { 3712 {
3591 unsigned char *s = get_to_st (eh); 3713 char *s = get_to_st (eh);
3592 3714
3593 if (s) 3715 if (s)
3594 { 3716 {
3595 process_xterm_seq (arg, (char *)s, eh); 3717 process_xterm_seq (arg, s, eh);
3596 free (s); 3718 free (s);
3597 } 3719 }
3598 } 3720 }
3599} 3721}
3600 3722
3601void 3723void
3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3724rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3603{ 3725{
3604 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3605 { 3727 {
3606 unsigned short r, g, b; 3728 rgba c;
3607 pix_colors_focused[color].get (display, r, g, b); 3729 pix_colors_focused[color].get (c);
3730
3731#if XFT
3732 if (c.a != rgba::MAX_CC)
3733 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3734 else
3735#endif
3608 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3609 } 3737 }
3610 else 3738 else
3611 set_window_color (color, str); 3739 set_window_color (color, str);
3612} 3740}
3613 3741
3614/* 3742/*
3615 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3616 * 0 = change iconName/title
3617 * 1 = change iconName
3618 * 2 = change title
3619 * 4 = change color
3620 * 10 = change fg color
3621 * 11 = change bg color
3622 * 12 = change text color
3623 * 13 = change mouse foreground color
3624 * 17 = change highlight character colour
3625 * 18 = change bold character color
3626 * 19 = change underlined character color
3627 * 46 = change logfile (not implemented)
3628 * 50 = change font
3629 *
3630 * rxvt extensions:
3631 * 20 = bg pixmap
3632 * 39 = change default fg color
3633 * 49 = change default bg color
3634 * 55 = dump scrollback buffer and all of screen
3635 * 701 = change locale
3636 * 702 = find font
3637 * 703 = menu
3638 */ 3744 */
3639void 3745void
3640rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3641{ 3747{
3642 int changed = 0;
3643 int color; 3748 int color;
3644 char *buf, *name; 3749 char *buf, *name;
3645 bool query = str[0] == '?' && !str[1]; 3750 bool query = str[0] == '?' && !str[1];
3646 int saveop = op; 3751 int saveop = op;
3752
3753 dLocal (Display *, xdisp);
3647 3754
3648 assert (str != NULL); 3755 assert (str != NULL);
3649 switch (op) 3756 switch (op)
3650 { 3757 {
3651 case XTerm_name: 3758 case XTerm_name:
… …
3658 set_title (str); 3765 set_title (str);
3659 break; 3766 break;
3660 case XTerm_property: 3767 case XTerm_property:
3661 if (str[0] == '?') 3768 if (str[0] == '?')
3662 { 3769 {
3663 Atom prop = XInternAtom (display->display, str + 1, True); 3770 Atom prop = display->atom (str + 1);
3664 Atom actual_type; 3771 Atom actual_type;
3665 int actual_format; 3772 int actual_format;
3666 unsigned long nitems; 3773 unsigned long nitems;
3667 unsigned long bytes_after; 3774 unsigned long bytes_after;
3668 unsigned char *value = 0; 3775 unsigned char *value = 0;
3669 const char *str = ""; 3776 const char *str = "";
3670 3777
3671 if (prop 3778 if (prop
3672 && XGetWindowProperty (display->display, TermWin.parent[0], 3779 && XGetWindowProperty (xdisp, parent[0],
3673 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3674 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3675 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3676 && actual_type != None 3783 && actual_type != None
3677 && actual_format == 8) 3784 && actual_format == 8)
3678 str = (const char *)(value); 3785 str = (const char *)(value);
3679 3786
3680 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3681 3788
3682 XFree (value); 3789 XFree (value);
3683 } 3790 }
3684 else 3791 else
3685 { 3792 {
3686 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687 3794
3688 if (eq) 3795 if (eq)
3689 { 3796 {
3690 *eq = 0; 3797 *eq = 0;
3691 XChangeProperty (display->display, TermWin.parent[0], 3798 set_utf8_property (display->atom (str), eq + 1);
3692 display->atom (str), XA_STRING, 8,
3693 PropModeReplace, (unsigned char *)eq + 1,
3694 strlen (eq + 1));
3695 } 3799 }
3696 else 3800 else
3697 XDeleteProperty (display->display, TermWin.parent[0], 3801 XDeleteProperty (xdisp, parent[0],
3698 display->atom (str)); 3802 display->atom (str));
3699 } 3803 }
3700 break; 3804 break;
3701 3805
3702 case XTerm_Color: 3806 case XTerm_Color:
… …
3704 { 3808 {
3705 if ((name = strchr (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3706 break; 3810 break;
3707 3811
3708 *name++ = '\0'; 3812 *name++ = '\0';
3709 color = atoi (buf); 3813 color = atoi (buf) + minCOLOR;
3710 3814
3711 if (color < 0 || color >= TOTAL_COLORS) 3815 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3712 break; 3816 break;
3713 3817
3714 if ((buf = strchr (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3715 *buf++ = '\0'; 3819 *buf++ = '\0';
3716 3820
3717 if (name[0] == '?' && !name[1]) 3821 process_color_seq (op, color, name, resp);
3718 {
3719 unsigned short r, g, b;
3720 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3721 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3722 }
3723 else
3724 set_window_color (color + minCOLOR, name);
3725 } 3822 }
3726 break; 3823 break;
3727 case XTerm_Color00: 3824 case XTerm_Color00:
3728 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3729 break; 3826 break;
3730 case XTerm_Color01: 3827 case XTerm_Color01:
3731 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3732 break; 3829 break;
3733#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3734 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3735 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3736 break; 3833 break;
3737#endif 3834#endif
3738 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3739 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3740 break; 3837 break;
3741 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3742 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3743 break; 3840 break;
3744#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#ifndef NO_BOLD_UNDERLINE_REVERSE
3745 case XTerm_Color_BD:
3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750 break;
3751 case XTerm_Color_UL:
3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3753 break;
3754 case XTerm_Color_RV: 3842 case XTerm_Color_RV:
3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3843 process_color_seq (op, Color_RV, str, resp);
3756 break; 3844 break;
3845 case Rxvt_Color_BD:
3846 case URxvt_Color_BD:
3847 process_color_seq (op, Color_BD, str, resp);
3848 break;
3849 case Rxvt_Color_UL:
3850 case URxvt_Color_UL:
3851 process_color_seq (op, Color_UL, str, resp);
3852 break;
3853 case URxvt_Color_IT:
3854 process_color_seq (op, Color_IT, str, resp);
3855 break;
3757#endif 3856#endif
3758#if TRANSPARENT || TINTING 3857#if TRANSPARENT && TINTING
3759 case XTerm_Color_tint: 3858 case URxvt_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3859 process_color_seq (op, Color_tint, str, resp);
3860
3761 check_our_parents (); 3861 check_our_parents ();
3862
3762 if (am_transparent) 3863 if (am_transparent)
3763 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3764 break;
3765#endif
3766 3865
3866 break;
3867#endif
3868
3767 case XTerm_Pixmap: 3869 case Rxvt_Pixmap:
3870 {
3768 if (*str != ';') 3871 if (*str != ';')
3769 { 3872 {
3770#if XPM_BACKGROUND 3873#if XPM_BACKGROUND
3771 scale_pixmap (""); /* reset to default scaling */ 3874 scale_pixmap (""); /* reset to default scaling */
3772 set_bgPixmap (str); /* change pixmap */ 3875 set_bgPixmap (str); /* change pixmap */
3773#endif
3774 scr_touch (true); 3876 scr_touch (true);
3877#endif
3775 } 3878 }
3879
3880 int changed = 0;
3881
3776 while ((str = strchr (str, ';')) != NULL) 3882 while ((str = strchr (str, ';')) != NULL)
3777 { 3883 {
3778 str++; 3884 str++;
3779#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3780 changed += scale_pixmap (str); 3886 changed += scale_pixmap (str);
3781#endif 3887#endif
3782
3783 } 3888 }
3889
3784 if (changed) 3890 if (changed)
3785 { 3891 {
3786#ifdef XPM_BACKGROUND 3892#ifdef XPM_BACKGROUND
3787 resize_pixmap (); 3893 resize_pixmap ();
3788#endif
3789 scr_touch (true); 3894 scr_touch (true);
3895#endif
3790 } 3896 }
3897 }
3791 break; 3898 break;
3792 3899
3793 case XTerm_restoreFG: 3900 case Rxvt_restoreFG:
3794 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3795 break; 3902 break;
3796 case XTerm_restoreBG: 3903 case Rxvt_restoreBG:
3797 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3798 break; 3905 break;
3799 3906
3800 case XTerm_logfile: 3907 case XTerm_logfile:
3801 // TODO, when secure mode? 3908 // TODO, when secure mode?
3802 break; 3909 break;
3803 3910
3911#if 0
3912 case Rxvt_dumpscreen: /* no error notices */
3913 {
3914 int fd;
3915 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3916 {
3917 scr_dump (fd);
3918 close (fd);
3919 }
3920 }
3921 break;
3922#endif
3804 case XTerm_font: 3923 case XTerm_font:
3805 op = URxvt_font; 3924 op = URxvt_font;
3806 case URxvt_font: 3925 case URxvt_font:
3807#if ENABLE_STYLES 3926#if ENABLE_STYLES
3808 case URxvt_boldFont: 3927 case URxvt_boldFont:
3809 case URxvt_italicFont: 3928 case URxvt_italicFont:
3810 case URxvt_boldItalicFont: 3929 case URxvt_boldItalicFont:
3811#endif 3930#endif
3812 if (query) 3931 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop, 3932 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3934 ? fontset[op - URxvt_font]->fontdesc : "",
3816 resp); 3935 resp);
3817 else 3936 else
3818 { 3937 {
3819 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3938 const char *&res = rs[Rs_font + (op - URxvt_font)];
3820 3939
… …
3822 allocated.push_back ((void *)res); 3941 allocated.push_back ((void *)res);
3823 set_fonts (); 3942 set_fonts ();
3824 } 3943 }
3825 break; 3944 break;
3826 3945
3827#if ENABLE_FRILLS 3946 case URxvt_version:
3828 case XTerm_locale:
3829 if (query) 3947 if (query)
3948 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3949 op,
3950 rs[Rs_name], VERSION[0], VERSION[2],
3951 resp);
3952 break;
3953
3954#if !ENABLE_MINIMAL
3955 case URxvt_locale:
3956 if (query)
3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3831 else 3958 else
3832 { 3959 {
3833 set_locale (str); 3960 set_locale (str);
3834# ifdef USE_XIM 3961 pty->set_utf8_mode (enc_utf8);
3835 im_cb (); 3962 init_xlocale ();
3836# endif
3837 } 3963 }
3838 break; 3964 break;
3839#endif
3840 3965
3841#ifdef MENUBAR 3966 case URxvt_view_up:
3842 case XTerm_Menu: 3967 case URxvt_view_down:
3843 if (options & Opt_insecure) 3968 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3969 int lines = atoi (str);
3970
3971 if (lines)
3972 scr_page (op == URxvt_view_up ? UP : DN, lines);
3973 else
3974 scr_erase_savelines ();
3975 }
3976
3845 break; 3977 break;
3846#endif 3978#endif
3847#if 0 3979
3848 case XTerm_dumpscreen: /* no error notices */ 3980#if ENABLE_PERL
3849 { 3981 case URxvt_perl:
3850 int fd; 3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3983 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3984 break;
3858#endif 3985#endif
3859 } 3986 }
3860} 3987}
3861/*----------------------------------------------------------------------*/ 3988/*----------------------------------------------------------------------*/
… …
3892 return state; 4019 return state;
3893} 4020}
3894 4021
3895/* we're not using priv _yet_ */ 4022/* we're not using priv _yet_ */
3896void 4023void
3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4024rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3898{ 4025{
3899 unsigned int i, j; 4026 unsigned int i, j;
3900 int state; 4027 int state;
3901 4028
3902 static const struct 4029 static const struct
… …
3913 { 5, PrivMode_rVideo }, 4040 { 5, PrivMode_rVideo },
3914 { 6, PrivMode_relOrigin }, 4041 { 6, PrivMode_relOrigin },
3915 { 7, PrivMode_Autowrap }, 4042 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode 4043 // 8, bi-directional support mode
3917 { 9, PrivMode_MouseX10 }, 4044 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc
3919 { menuBar_esc, PrivMode_menuBar },
3920#endif
3921 // 18, 19 printing-related 4045 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 4046 { 25, PrivMode_VisibleCursor },
3923#ifdef scrollBar_esc 4047#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 4048 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 4049#endif
… …
3970 } 4094 }
3971 4095
3972 /* extra handling for values with state unkept */ 4096 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4097 switch (arg[i])
3974 { 4098 {
4099#if ENABLE_STYLES
4100 case 1021:
4101 set_option (Opt_intensityStyles, mode);
4102
4103 scr_touch (true);
4104 break;
4105#endif
3975 case 1048: /* alternative cursor save */ 4106 case 1048: /* alternative cursor save */
3976 case 1049: 4107 case 1049:
3977 if (options & Opt_secondaryScreen) 4108 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4109 if (mode == 0)
3979 scr_cursor (RESTORE); 4110 scr_cursor (RESTORE);
3980 else if (mode == 1) 4111 else if (mode == 1)
3981 scr_cursor (SAVE); 4112 scr_cursor (SAVE);
3982 break; 4113 break;
… …
3994 */ 4125 */
3995 PrivMode (1, PrivMode_vt52); 4126 PrivMode (1, PrivMode_vt52);
3996 break; 4127 break;
3997 case 3: /* 80/132 */ 4128 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4129 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4130 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4131 break;
4001 case 4: /* smooth scrolling */ 4132 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 4133 set_option (Opt_jumpScroll, !state);
4006 break; 4134 break;
4007 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4009 break; 4137 break;
4010 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4016 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
4020 break; 4148 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 4149#ifdef scrollBar_esc
4029 case scrollBar_esc: 4150 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 4151 if (scrollbar_mapping (state))
4031 { 4152 {
4032 resize_all_windows (0, 0, 0); 4153 resize_all_windows (0, 0, 0);
… …
4051#if 0 4172#if 0
4052 case 1001: 4173 case 1001:
4053 break; /* X11 mouse highlighting */ 4174 break; /* X11 mouse highlighting */
4054#endif 4175#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4176 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 4177 set_option (Opt_scrollTtyOutput, !state);
4060 break; 4178 break;
4061 case 1011: /* scroll to bottom on key press */ 4179 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 4180 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 4181 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4182 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4183 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4184 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4185 scr_erase_screen (2);
4071 scr_change_screen (state); 4186 scr_change_screen (state);
4072 break; 4187 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4188 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4189 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4190 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4191 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4192 scr_erase_screen (2);
4078 break; 4193 break;
4079 default: 4194 default:
4080 break; 4195 break;
… …
4208 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4209 break; 4324 break;
4210 4325
4211 //case 50: // not variable spacing 4326 //case 50: // not variable spacing
4212 4327
4213#ifndef NO_BRIGHTCOLOR 4328#if !ENABLE_MINIMAL
4214 case 90: 4329 case 90:
4215 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4216 case 92: 4331 case 92:
4217 case 93: 4332 case 93:
4218 case 94: 4333 case 94:
… …
4230 case 106: 4345 case 106:
4231 case 107: 4346 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4347 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4348 break;
4234#endif 4349#endif
4235
4236 } 4350 }
4237 } 4351 }
4238} 4352}
4239/*}}} */ 4353/*}}} */
4240 4354
… …
4264 */ 4378 */
4265void 4379void
4266rxvt_term::tt_printf (const char *fmt,...) 4380rxvt_term::tt_printf (const char *fmt,...)
4267{ 4381{
4268 va_list arg_ptr; 4382 va_list arg_ptr;
4269 unsigned char buf[256]; 4383 char buf[256];
4270 4384
4271 va_start (arg_ptr, fmt); 4385 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4386 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4387 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4388 tt_write (buf, strlen (buf));
… …
4276 4390
4277/* ---------------------------------------------------------------------- */ 4391/* ---------------------------------------------------------------------- */
4278/* Write data to the pty as typed by the user, pasted with the mouse, 4392/* Write data to the pty as typed by the user, pasted with the mouse,
4279 * or generated by us in response to a query ESC sequence. 4393 * or generated by us in response to a query ESC sequence.
4280 */ 4394 */
4395const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4396
4281void 4397void
4282rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4398rxvt_term::tt_write (const char *data, unsigned int len)
4283{ 4399{
4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4400 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4401 return;
4285 4402
4286 if (len) 4403 if (pty->pty < 0)
4404 return;
4405
4406 if (v_buflen == 0)
4407 {
4408 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4409
4410 if ((unsigned int)written == len)
4411 return;
4412
4413 data += written;
4414 len -= written;
4287 { 4415 }
4416
4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4418
4419 memcpy (v_buffer + v_buflen, data, len);
4420 v_buflen += len;
4421
4422 pty_ev.set (EVENT_READ | EVENT_WRITE);
4423}
4424
4425void rxvt_term::pty_write ()
4426{
4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4428
4429 if (written > 0)
4430 {
4431 v_buflen -= written;
4432
4288 if (v_buflen == 0) 4433 if (v_buflen == 0)
4289 { 4434 {
4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292 if ((unsigned int)written == len)
4293 return;
4294
4295 data += written;
4296 len -= written;
4297 }
4298
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304 }
4305
4306 for (;;)
4307 {
4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310 if (written > 0)
4311 {
4312 v_buflen -= written;
4313
4314 if (v_buflen == 0)
4315 {
4316 free (v_buffer); 4435 free (v_buffer);
4317 v_buffer = 0; 4436 v_buffer = 0;
4318 v_buflen = 0; 4437 v_buflen = 0;
4319 4438
4320 pty_ev.set (EVENT_READ); 4439 pty_ev.set (EVENT_READ);
4321 return;
4322 }
4323
4324 memmove (v_buffer, v_buffer + written, v_buflen);
4325 }
4326 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4327 // original code just ignores this...
4328 destroy ();
4329 else
4330 {
4331 pty_ev.set (EVENT_READ | EVENT_WRITE);
4332 return; 4440 return;
4333 } 4441 }
4442
4443 memmove (v_buffer, v_buffer + written, v_buflen);
4334 } 4444 }
4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4446 pty_ev.set (EVENT_READ);
4335} 4447}
4336 4448
4337/*----------------------- end-of-file (C source) -----------------------*/ 4449/*----------------------- end-of-file (C source) -----------------------*/
4338 4450

Diff Legend

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