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.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

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

Diff Legend

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