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.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.311 by root, Sat Mar 4 20:14:35 2006 UTC

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

Diff Legend

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