ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.305 by root, Thu Feb 2 18:04:45 2006 UTC

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

Diff Legend

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