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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

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

Diff Legend

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