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.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.312 by root, Sat Mar 4 22:05:05 2006 UTC

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

Diff Legend

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