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

Diff Legend

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