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

Diff Legend

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