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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 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 68
… …
113 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 125 XK_Print, 0x2399,
116 126
117 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
119 0, 137 0,
120}; 138};
121 139
122void 140void
123rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
124{ 142{
125 x = Pixel2Col (x); 143 x = Pixel2Col (x);
126 y = Pixel2Row (y); 144 y = Pixel2Row (y);
127 145
128 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 148 return;
131 149
132 for (;;) 150 for (;;)
133 { 151 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y + view_start);
153
154 text_t t = l.t[x];
135 155
136 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
137 { 157 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
140 break; 160 break;
141 } 161 }
142 162
143 x--; 163 x--;
144 } 164 }
145
146} 165}
147#endif
148 166
149#if ENABLE_OVERLAY
150void 167void
151rxvt_term::iso14755_51 (wchar_t ch) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 172 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 173 int len;
155 174
175 fname = rxvt_utf8towcs (f->name);
176
156#if ENABLE_COMBINING 177# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
158 { 179 {
159 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
162 } 183 }
163 else 184 else
164#endif 185# endif
165 { 186 {
187 ch2 = ch;
188
166 alloc = 0; 189 alloc = 0;
167 chr = &ch; 190 chr = &ch2;
168 len = 1; 191 len = 1;
169 } 192 }
170 193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
171 scr_overlay_new (0, -1, 8 + 5, len); 217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 220
173 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
174 { 222 {
175 char buf[9]; 223 char buf[9];
176 224
177 ch = *chr++; 225 ch = *chr++;
178 226
179 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
182#if !UNICODE3 230# if !UNICODE3
183 if (ch >= 0x10000) 231 if (ch >= 0x10000)
184 ch = 0xfffd; 232 ch = 0xfffd;
185#endif 233# endif
186 scr_overlay_set (11, y, ch); 234 scr_overlay_set (11, y, ch, r);
187 scr_overlay_set (12, y, NOCHAR); 235 scr_overlay_set (12, y, NOCHAR, r);
188 } 236 }
189 237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
190#if ENABLE_COMBINING 243# if ENABLE_COMBINING
191 if (alloc) 244 if (alloc)
192 delete [] alloc; 245 delete [] alloc;
193#endif 246# endif
194} 247}
195#endif 248#endif
196 249
197void 250void
198rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
215 mb[0] = ch[0]; 268 mb[0] = ch[0];
216 len = 1; 269 len = 1;
217 } 270 }
218 271
219 if (len > 0) 272 if (len > 0)
220 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
221 else 274 else
222 scr_bell (); 275 scr_bell ();
223 } 276 }
224 277
225 iso14755buf = 0; 278 iso14755buf = 0;
… …
253 KeySym keysym; 306 KeySym keysym;
254#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
255 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
256#endif 309#endif
257 int valid_keysym; 310 int valid_keysym;
258 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
259 312
260 /* 313 /*
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
263 * 316 *
264 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
265 */ 318 */
266 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
269 322
270 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
271 { 324 {
272 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
281 Status status_return; 334 Status status_return;
282 335
283#if 0 336#if 0
284#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
285 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
287 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
288 else 341 else
289#endif 342#endif
290#endif 343#endif
291 { 344 {
… …
293 346
294 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
298 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
301 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 357 SET_LOCALE (locale);
303 358
304 if (status_return == XLookupChars 359 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
326 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
327 } 382 }
328 else 383 else
329#endif 384#endif
330 { 385 {
331 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
332 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
333 } 388 }
334 389
335 if (valid_keysym) 390 if (valid_keysym)
336 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
337 if (TermWin.saveLines) 397 if (saveLines)
338 { 398 {
339#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 400 if (!ctrl && !meta)
341#else 401#else
342 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
343#endif 403#endif
344 { 404 {
345 int lnsppg; 405 int lnsppg;
346 406
347#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 409#else
350 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
351#endif 411#endif
352 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
353 { 413 {
354 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
355 return; 415 return;
… …
383 scr_move_to (0, 1); 443 scr_move_to (0, 1);
384 return; 444 return;
385 } 445 }
386 else if (keysym == XK_End) 446 else if (keysym == XK_End)
387 { 447 {
388 scr_move_to (1, 0); 448 scr_move_to (1, 1);
389 return; 449 return;
390 } 450 }
391 } 451 }
392#endif 452#endif
393 } 453 }
… …
406 { 466 {
407 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
410 return; 470 return;
411#if TODO // TODO 471#if TODO
412 /* rxvt extras */ 472 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 474 change_font (FONT_UP);
415 return; 475 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 535 }
476#endif 536#endif
477 537
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 539 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 540 {
506 newlen = 1; 541 newlen = 1;
507 switch (keysym) 542 switch (keysym)
508 { 543 {
509#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
517 else 552 else
518 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
519 break; 554 break;
520#endif 555#endif
521#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
522 case XK_Delete: 567 case XK_Delete:
523 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
524 break; 569 break;
525#endif 570#endif
526 case XK_Tab: 571 case XK_Tab:
… …
629#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
630 case XK_KP_Begin: 675 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
632 break; 677 break;
633 678
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 679#endif
642 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
677 break; 715 break;
678 716
679 case XK_Find: 717 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
681 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
682 case XK_Insert: 731 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
684 break; 733 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 735 case DXK_Remove:
… …
776#undef FKEY 825#undef FKEY
777 default: 826 default:
778 newlen = 0; 827 newlen = 0;
779 break; 828 break;
780 } 829 }
830
781 if (newlen) 831 if (newlen)
782 len = strlen (kbuf); 832 len = strlen (kbuf);
783 } 833 }
784 834
785 /* 835 /*
… …
794 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
795 { 845 {
796 len = 1; 846 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
799 else 854 else
800 { 855 {
801#ifdef META8_OPTION 856#ifdef META8_OPTION
802 /* set 8-bit on */ 857 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
804 { 859 {
805 unsigned char *ch; 860 char *ch;
806 861
807 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
808 *ch |= 0x80; 863 *ch |= 0x80;
809 864
810 meta = 0; 865 meta = 0;
… …
812#endif 867#endif
813 /* nil */ ; 868 /* nil */ ;
814 } 869 }
815 } 870 }
816 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
817 if (len <= 0) 875 if (len <= 0)
818 return; /* not mapped */ 876 return; /* not mapped */
819 877
820 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 879 if (view_start)
822 { 880 {
823 TermWin.view_start = 0; 881 view_start = 0;
824 want_refresh = 1; 882 want_refresh = 1;
825 } 883 }
826 884
827 /* 885 /*
828 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
843#ifdef META8_OPTION 901#ifdef META8_OPTION
844 && meta_char == C0_ESC 902 && meta_char == C0_ESC
845#endif 903#endif
846 ) 904 )
847 { 905 {
848 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
849 tt_write (&ch, 1); 907 tt_write (&ch, 1);
850 } 908 }
851 909
852#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
853 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
861#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
863} 921}
864/*}}} */ 922/*}}} */
865 923
866#if (MENUBAR_MAX) 924#if defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */
869unsigned int 925unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
871{ 927{
872 unsigned int n, s; 928 unsigned int n, s;
873 929
874 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
894 950
895 cmd_parse (); 951 cmd_parse ();
896 952
897 return 0; 953 return 0;
898} 954}
899#endif /* MENUBAR_MAX */ 955#endif
900 956
901void 957void
902rxvt_term::flush () 958rxvt_term::flush ()
903{ 959{
960 flush_ev.stop ();
961
904#ifdef TRANSPARENT 962#ifdef TRANSPARENT
905 if (want_full_refresh) 963 if (want_full_refresh)
906 { 964 {
907 want_full_refresh = 0; 965 want_full_refresh = 0;
908 scr_clear (); 966 scr_clear ();
… …
910 } 968 }
911#endif 969#endif
912 970
913 if (want_refresh) 971 if (want_refresh)
914 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
915 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
916 scrollbar_show (1); 1012 scrollbar_show (1);
917#ifdef USE_XIM 1013#ifdef USE_XIM
918 IMSendSpot (); 1014 IMSendSpot ();
919#endif 1015#endif
920 } 1016 }
921 1017
922 display->flush (); 1018 display->flush ();
923
924 flush_ev.stop ();
925} 1019}
926 1020
927void 1021void
928rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
929{ 1023{
930 SET_R (this); 1024 make_current ();
931 SET_LOCALE (locale);
932 1025
933 display->flush (); 1026 display->flush ();
934 1027
935 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
937} 1030}
938 1031
939void 1032void
940rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
941{ 1034{
942 SET_R (this); 1035 make_current ();
943 SET_LOCALE (locale);
944 1036
945 refresh_limit = 1; 1037 refresh_limit = 1;
946 refresh_count = 0; 1038 refresh_count = 0;
947 flush (); 1039 flush ();
948} 1040}
… …
1005{ 1097{
1006 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1101 {
1102 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0;
1104
1010 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1106 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1108 }
1014} 1109}
1015#endif 1110#endif
1016 1111
1112#if HAVE_SCHED_YIELD
1113static struct event_handler
1114{
1115 check_watcher cw_yield;
1116
1117 void yield (check_watcher &w)
1118 {
1119 sched_yield ();
1120 w.stop ();
1121 }
1122
1123 event_handler ()
1124 : cw_yield (this, &event_handler::yield)
1125 {
1126 }
1127} event_handler;
1128#endif
1129
1017bool 1130bool
1018rxvt_term::pty_fill () 1131rxvt_term::pty_fill ()
1019{ 1132{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1133 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1134
1022 if (CBUFSIZ == n) 1135 if (CBUFSIZ == n)
1023 { 1136 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1137 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1138 n = 0;
1026 } 1139 }
1027 1140
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1141 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1142 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1143 cmdbuf_endp = cmdbuf_ptr + n;
1031 1144
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1033 1146
1034 if (n > 0) 1147 if (r > 0)
1035 { 1148 {
1036 cmdbuf_endp += n; 1149 cmdbuf_endp += r;
1037 return true; 1150 return true;
1038 } 1151 }
1039 else if (n < 0 && errno != EAGAIN) 1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 {
1154#if HAVE_SCHED_YIELD
1155 if (display->is_local)
1156 event_handler.cw_yield.start ();
1157#endif
1158 }
1159 else
1160 {
1161 pty_ev.stop ();
1162
1163 if (!OPTION (Opt_hold))
1040 destroy (); 1164 destroy ();
1165 }
1041 1166
1042 return false; 1167 return false;
1043} 1168}
1044 1169
1045void 1170void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1172{
1048 SET_R (this); 1173 make_current ();
1049 SET_LOCALE (locale);
1050 1174
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1177 while (pty_fill ())
1056 if (cmd_parse ()) 1178 if (cmd_parse ())
1057 break; 1179 break;
1180
1181 if (revents & EVENT_WRITE)
1182 pty_write ();
1058} 1183}
1059 1184
1060void 1185void
1061rxvt_term::pointer_unblank () 1186rxvt_term::pointer_unblank ()
1062{ 1187{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1188 XDefineCursor (display->display, vt, TermWin_cursor);
1064 recolour_cursor (); 1189 recolour_cursor ();
1065 1190
1066#ifdef POINTER_BLANK 1191#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1192 hidden_pointer = 0;
1068 1193
1069 if (options & Opt_pointerBlank) 1194 if (OPTION (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1195 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif 1196#endif
1072} 1197}
1073 1198
1074#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1075void 1200void
1076rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1077{ 1202{
1078 if (! (options & Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1079 return; 1204 return;
1080 1205
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1082 XFlush (display->display); 1207 XFlush (display->display);
1083 1208
1084 hidden_pointer = 1; 1209 hidden_pointer = 1;
1085} 1210}
1086 1211
1087void 1212void
1088rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1089{ 1214{
1090 SET_R (this); 1215 make_current ();
1091 SET_LOCALE (locale);
1092 1216
1093 pointer_blank (); 1217 pointer_blank ();
1094} 1218}
1095#endif 1219#endif
1096 1220
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1261 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1262 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1263#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1264 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1265#endif
1142
1143 } 1266 }
1144 1267
1145#ifdef DEBUG_MOUSEREPORT 1268#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1269 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1270 if (key_state & 16)
1148 fputc ('C', stderr); 1271 fputc ('C', stderr);
1149 if (key_state & 4) 1272 if (key_state & 4)
1150 fputc ('S', stderr); 1273 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1277 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1278 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1279 button_number,
1157 x + 1, 1280 x + 1,
1158 y + 1); 1281 y + 1);
1159#else 1282#endif
1283
1160 tt_printf ("\033[M%c%c%c", 1284 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1285 (32 + button_number + key_state),
1162 (32 + x + 1), 1286 (32 + x + 1),
1163 (32 + y + 1)); 1287 (32 + y + 1));
1164#endif
1165} 1288}
1166 1289
1167#ifdef USING_W11LIB 1290#ifdef USING_W11LIB
1168void 1291void
1169rxvt_W11_process_x_event (XEvent *ev) 1292rxvt_W11_process_x_event (XEvent *ev)
… …
1176 1299
1177/*{{{ process an X event */ 1300/*{{{ process an X event */
1178void 1301void
1179rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1180{ 1303{
1181 SET_R (this); 1304 make_current ();
1182 SET_LOCALE (locale);
1183 1305
1184#if defined(CURSOR_BLINK) 1306 dDisp;
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1186 {
1187 if (hidden_cursor)
1188 {
1189 hidden_cursor = 0;
1190 want_refresh = 1;
1191 }
1192 1307
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1308 if (ev.xany.window == vt
1194 } 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1195#endif 1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1196
1197#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1199 {
1200 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease)
1203 if (hidden_pointer)
1204 pointer_unblank ();
1205
1206 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank ();
1208 }
1209#endif
1210
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return; 1311 return;
1214#endif
1215 1312
1313 // for XQueryPointer
1216 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1316 unsigned int unused_mask;
1219 1317
1220 switch (ev.type) 1318 switch (ev.type)
1221 { 1319 {
1222 case KeyPress: 1320 case KeyPress:
1223#if ISO_14755 1321#if ISO_14755
… …
1227 1325
1228 break; 1326 break;
1229 1327
1230 case KeyRelease: 1328 case KeyRelease:
1231 { 1329 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1233 KeySym ks; 1331 KeySym keysym;
1234 1332
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1334#endif
1237 1335
1238#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support 1337 // ISO 14755 support
1240 if (iso14755buf) 1338 if (iso14755buf)
… …
1245# endif 1343# endif
1246# if ISO_14755 1344# if ISO_14755
1247 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1248 // first: controls 1346 // first: controls
1249 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1252 { 1350 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1254 commit_iso14755 (); 1352 commit_iso14755 ();
1255 return; // case-break; 1353 goto skip_switch;
1256 } 1354 }
1257 1355
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks) 1357 if (i[0] == keysym)
1260 { 1358 {
1261 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 (); 1360 commit_iso14755 ();
1263 return; // case-break; 1361 goto skip_switch;
1264 } 1362 }
1265 1363
1266 scr_bell (); 1364 scr_bell ();
1267# endif 1365# endif
1268 iso14755buf = 0; 1366 iso14755buf = 0;
… …
1287 else 1385 else
1288 iso14755buf = 0; 1386 iso14755buf = 0;
1289 } 1387 }
1290#endif 1388#endif
1291 1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1293 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1296 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1297#endif 1399#endif
1298 break; 1400 break;
1299 } 1401 }
1300 1402
… …
1306 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
1307 break; 1409 break;
1308 1410
1309 case ClientMessage: 1411 case ClientMessage:
1310 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1414 {
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312 destroy (); 1416 destroy ();
1417#if ENABLE_EWMH
1418 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419 XSendEvent (disp, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &ev);
1422#endif
1423 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1313#ifdef OFFIX_DND 1433#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */ 1434 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile 1436 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir 1437 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink)) 1438 || ev.xclient.data.l[0] == DndLink))
1319 { 1439 {
1320 /* Get Dnd data */ 1440 /* Get Dnd data */
1321 Atom ActualType; 1441 Atom ActualType;
1322 int ActualFormat; 1442 int ActualFormat;
1323 unsigned char *data; 1443 unsigned char *data;
1324 unsigned long Size, RemainingBytes; 1444 unsigned long Size, RemainingBytes;
1325 1445
1326 XGetWindowProperty (display->display, display->root, 1446 XGetWindowProperty (disp, display->root,
1327 xa[XA_DNDSELECTION], 1447 xa[XA_DNDSELECTION],
1328 0L, 1000000L, 1448 0L, 1000000L,
1329 False, AnyPropertyType, 1449 False, AnyPropertyType,
1330 &ActualType, &ActualFormat, 1450 &ActualType, &ActualFormat,
1331 &Size, &RemainingBytes, 1451 &Size, &RemainingBytes,
1332 &data); 1452 &data);
1333 XChangeProperty (display->display, display->root, 1453 set_string_property (XA_CUT_BUFFER0, data);
1334 XA_CUT_BUFFER0, XA_STRING,
1335 8, PropModeReplace,
1336 data, strlen (data));
1337 XFree (data); 1454 XFree (data);
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340 } 1457 }
1341#endif /* OFFIX_DND */ 1458#endif /* OFFIX_DND */
1342 break; 1459 break;
1343 1460
1344 case MappingNotify: 1461 case MappingNotify:
… …
1369 break; 1486 break;
1370 } 1487 }
1371 break; 1488 break;
1372 1489
1373 case FocusIn: 1490 case FocusIn:
1374 if (!TermWin.focus) 1491 focus_in ();
1492 break;
1493
1494 case FocusOut:
1495 focus_out ();
1496 break;
1497
1498 case ConfigureNotify:
1499 if (ev.xconfigure.window == parent[0])
1375 { 1500 {
1376 TermWin.focus = 1; 1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1502 ;
1378#ifdef USE_XIM 1503
1379 if (Input_Context != NULL) 1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1505 {
1381 IMSetStatusPosition (); 1506 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1508 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398
1399 }
1400 break;
1401
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444 1509
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1511 if (OPTION (Opt_transparent))
1447 {
1448 check_our_parents (); 1512 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif 1513#endif
1453 } 1514 }
1454 break; 1515 break;
1455 1516
1456 case PropertyNotify: 1517 case PropertyNotify:
… …
1464 selection_clear (); 1525 selection_clear ();
1465 break; 1526 break;
1466 1527
1467 case SelectionNotify: 1528 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1529 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1530 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1531 break;
1472 1532
1473 case SelectionRequest: 1533 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1475 break; 1535 break;
1476 1536
1537 case MapNotify:
1538 mapped = 1;
1539#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1541#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break;
1544
1477 case UnmapNotify: 1545 case UnmapNotify:
1478 TermWin.mapped = 0; 1546 mapped = 0;
1479#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1481#endif 1549#endif
1482 break; 1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484 case MapNotify:
1485 TermWin.mapped = 1;
1486#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif
1489 break; 1551 break;
1490 1552
1491#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1492 case ReparentNotify: 1554 case ReparentNotify:
1493 rootwin_cb (ev); 1555 rootwin_cb (ev);
1494 break; 1556 break;
1495#endif /* TRANSPARENT */ 1557#endif /* TRANSPARENT */
1496 1558
1497 case GraphicsExpose: 1559 case GraphicsExpose:
1498 case Expose: 1560 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1561 if (ev.xany.window == vt)
1500 { 1562 {
1501 do 1563 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1567
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1569
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1511 1573
1512 scr_refresh (refresh_type); 1574 want_refresh = 1;
1513 } 1575 }
1514 else 1576 else
1515 { 1577 {
1516 XEvent unused_event; 1578 XEvent unused_event;
1517 1579
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519 ; 1581 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1583 ;
1522 1584
1523 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1524 { 1586 {
1525 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1526 scrollbar_show (0); 1588 scrollbar_show (0);
1527 } 1589 }
1528#ifdef MENUBAR
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose ();
1531#endif
1532 1590
1533#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1536#endif 1594#endif
1537 } 1595 }
1538 break; 1596 break;
1539 1597
1540 case MotionNotify: 1598 case MotionNotify:
1541#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1542 if (hidden_pointer) 1600 if (hidden_pointer)
1543 pointer_unblank (); 1601 pointer_unblank ();
1544#endif 1602#endif
1545#if MENUBAR 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 if (isMenuBarWindow (ev.xany.window)) 1604 break;
1605
1606 if (ev.xany.window == vt)
1547 { 1607 {
1548 menubar_control (ev.xbutton); 1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1549 break; 1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1550 } 1610 ; // nop
1551#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1553 break;
1554
1555 if (ev.xany.window == TermWin.vt)
1556 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1612 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1614 ;
1561 1615
1562 XQueryPointer (display->display, TermWin.vt, 1616 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1617 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1618 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1619 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1620 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1622 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1623 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1624 {
1571#endif 1625#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1630 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1631 break;
1578 } 1632 }
1579#endif 1633#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1634 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1635 ev.xbutton.state & Button3Mask ? 2 : 0);
1636
1582#ifdef SELECTION_SCROLLING 1637#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1638 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1639 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1640 {
1586 int dist; 1641 int dist;
1587 1642
1588 /* don't clobber the current delay if we are 1643 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1644 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1652 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1653 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1654 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1655
1601 /* calc number of lines to scroll */ 1656 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1657 if (ev.xbutton.y < int_bwidth)
1603 { 1658 {
1604 scroll_selection_dir = UP; 1659 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1660 dist = int_bwidth - ev.xbutton.y;
1606 } 1661 }
1607 else 1662 else
1608 { 1663 {
1609 scroll_selection_dir = DN; 1664 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1665 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1666 }
1612 1667
1613 scroll_selection_lines = Pixel2Height (dist) 1668 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1669 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1670 + 1;
1616 MIN_IT (scroll_selection_lines, 1671 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1672 SELECTION_SCROLL_MAX_LINES);
1618 } 1673 }
1619 else 1674 else
1620 { 1675 {
1621 /* we are within the text window, so we 1676 /* we are within the text window, so we
… …
1630#endif 1685#endif
1631 } 1686 }
1632 } 1687 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1689 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1690 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1691 MotionNotify, &ev))
1692 ;
1693
1637 XQueryPointer (display->display, scrollBar.win, 1694 XQueryPointer (disp, scrollBar.win,
1638 &unused_root, &unused_child, 1695 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1697 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1698 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1700 scrollbar_size ());
1644 scr_refresh (refresh_type); 1701 want_refresh = 1;
1645 refresh_limit = 0; 1702 refresh_limit = 0;
1646 scrollbar_show (1); 1703 scrollbar_show (1);
1647 } 1704 }
1648 break; 1705 break;
1649 } 1706 }
1707
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 {
1713 if (hidden_cursor)
1714 {
1715 hidden_cursor = 0;
1716 want_refresh = 1;
1717 }
1718
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1720 }
1721#endif
1722
1723#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 {
1726 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease)
1729 if (hidden_pointer)
1730 pointer_unblank ();
1731
1732 if (ev.type == KeyPress && hidden_pointer == 0)
1733 pointer_blank ();
1734 }
1735#endif
1736}
1737
1738void
1739rxvt_term::focus_in ()
1740{
1741 if (!focus)
1742 {
1743 focus = 1;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 {
1751 IMSetStatusPosition ();
1752 XSetICFocus (Input_Context);
1753 }
1754#endif
1755#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1758#endif
1759#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade])
1761 {
1762 pix_colors = pix_colors_focused;
1763 scr_recolour ();
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1650} 1805}
1651 1806
1652#if TRANSPARENT 1807#if TRANSPARENT
1653void 1808void
1654rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1810{
1656 SET_R (this); 1811 make_current ();
1657 SET_LOCALE (locale);
1658 1812
1659 switch (ev.type) 1813 switch (ev.type)
1660 { 1814 {
1661 case PropertyNotify: 1815 case PropertyNotify:
1662 /* 1816 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1817 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1818 * use the property to determine the pixmap. We use it later on.
1665 */ 1819 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1820 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1821 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1822 return;
1671 1823
1672 /* FALLTHROUGH */ 1824 /* FALLTHROUGH */
1673 case ReparentNotify: 1825 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1827 want_refresh = want_full_refresh = 1;
1676 break; 1828 break;
1677 } 1829 }
1678} 1830}
1679#endif 1831#endif
… …
1682rxvt_term::button_press (XButtonEvent &ev) 1834rxvt_term::button_press (XButtonEvent &ev)
1683{ 1835{
1684 int reportmode = 0, clickintime; 1836 int reportmode = 0, clickintime;
1685 1837
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1838 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1839
1687 if (!bypass_keystate) 1840 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1841 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1842
1690 /* 1843 /*
1691 * VT window processing of button press 1844 * VT window processing of button press
1692 */ 1845 */
1693 if (ev.window == TermWin.vt) 1846 if (ev.window == vt)
1694 { 1847 {
1695#if ISO_14755 1848#if ISO_14755
1696 // 5.4 1849 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1851 {
… …
1700 return; 1853 return;
1701 } 1854 }
1702#endif 1855#endif
1703 1856
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1857 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1858
1705 if (reportmode) 1859 if (reportmode)
1706 { 1860 {
1707 /* mouse report from vt window */ 1861 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1862 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1863 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1712 { 1866 {
1713 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1714 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1715 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1716 { 1871 {
1717 /* only report double clicks */ 1872 /* only report double clicks */
1718 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1719 mouse_report (ev); 1874 mouse_report (ev);
… …
1738 } 1893 }
1739 else 1894 else
1740 { 1895 {
1741 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1898
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1743 switch (ev.button) 1900 switch (ev.button)
1744 { 1901 {
1745 case Button1: 1902 case Button1:
1903 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */
1905#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask);
1907#else
1908 selection.rect = false;
1909#endif
1910
1746 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1748 { 1913 {
1749 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1751 else 1916 else
1752 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1753 } 1918 }
1754 else 1919 else
1755 { 1920 {
1756 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1757 MEvent.clicks++; 1922 MEvent.clicks++;
1758 else 1923 else
1759 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1760 1925
1761 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1762 } 1927 }
1763 1928
1764 MEvent.button = Button1; 1929 MEvent.button = Button1;
1765 break; 1930 break;
1766 1931
1767 case Button3: 1932 case Button3:
1768 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1769 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1770 else 1935 else
1771 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1772 1937
1773 MEvent.button = Button3; 1938 MEvent.button = Button3;
1774 break; 1939 break;
1775 } 1940 }
1776 } 1941 }
1777 1942
1778 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1779 return; 1944 return;
1780 } 1945 }
1781 1946
… …
1893 case Button3: 2058 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1895 { 2060 {
1896 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1899# else 2064# else
1900 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1901# endif 2066# endif
1902 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1905# else 2070# else
1906 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1907# endif 2072# endif
1908 else 2073 else
1909 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1910 } 2075 }
1911 else 2076 else
1912 { 2077 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2079 (nrow
1915 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2081 / scrollbar_size ()));
1917 } 2082 }
1918 2083
1919 break; 2084 break;
1920 } 2085 }
1921 } 2086 }
2087
1922 return; 2088 return;
1923 } 2089 }
1924#if MENUBAR
1925 /*
1926 * Menubar window processing of button press
1927 */
1928 if (isMenuBarWindow (ev.window))
1929 menubar_control (ev);
1930#endif
1931} 2090}
1932 2091
1933void 2092void
1934rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
1935{ 2094{
… …
1951#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2111 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
1954#endif 2113#endif
1955 2114
1956 if (ev.window == TermWin.vt) 2115 if (ev.window == vt)
1957 { 2116 {
1958#if ISO_14755 2117#if ISO_14755
1959 // 5.4 2118 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2120 return;
… …
1991 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
1992 && bypass_keystate 2151 && bypass_keystate
1993 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
1994 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
1995 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
1996 switch (ev.button) 2158 switch (ev.button)
1997 { 2159 {
1998 case Button1: 2160 case Button1:
1999 case Button3: 2161 case Button3:
2000 selection_make (ev.time); 2162 selection_make (ev.time);
… …
2011 2173
2012 v = ev.button == Button4 ? UP : DN; 2174 v = ev.button == Button4 ? UP : DN;
2013 2175
2014 if (ev.state & ShiftMask) 2176 if (ev.state & ShiftMask)
2015 i = 1; 2177 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2178 else if (OPTION (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2179 i = nrow - 1;
2018 else 2180 else
2019 i = 5; 2181 i = 5;
2020 2182
2021# ifdef MOUSE_SLIP_WHEELING 2183# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2184 if (ev.state & ControlMask)
2023 { 2185 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2186 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2187 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2188 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2189
2028 if (slip_wheel_ev.at < NOW) 2190 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2191 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2192
2031 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2032 } 2194 }
2033 else 2195 else
2034 { 2196 {
2035# endif 2197# endif
2036# ifdef JUMP_MOUSE_WHEEL
2037 scr_page (v, i); 2198 scr_page (v, i);
2038 scr_refresh (SMOOTH_REFRESH);
2039 scrollbar_show (1); 2199 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2049 } 2201 }
2050#endif 2202# endif
2051 } 2203 }
2052 break; 2204 break;
2053#endif 2205#endif
2054 } 2206 }
2055 } 2207 }
2056#ifdef MENUBAR
2057 else if (isMenuBarWindow (ev.window))
2058 menubar_control (ev);
2059#endif
2060} 2208}
2061 2209
2062#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2063#if TINTING 2211#if TINTING
2064/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
… …
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2223 int i;
2076 2224
2077 Visual* visual = display->visual; 2225 Visual *visual = display->visual;
2078 2226
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2228
2081 /* for convenience */ 2229 /* for convenience */
2082 mask_r = visual->red_mask; 2230 mask_r = visual->red_mask;
… …
2303 Atom atype; 2451 Atom atype;
2304 unsigned char *prop = NULL; 2452 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2453 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2454 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2455 XWindowAttributes wattr, wrootattr;
2456 dDisp;
2308 2457
2309 pchanged = 0; 2458 pchanged = 0;
2310 2459
2311 if (!(options & Opt_transparent)) 2460 if (!OPTION (Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2313 2462
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2463 XGetWindowAttributes (disp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2316 2465
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2466 XGetWindowAttributes (disp, parent[0], &wattr);
2318 2467
2319 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2320 { 2469 {
2321 if (am_transparent) 2470 if (am_transparent)
2322 { 2471 {
2323 pchanged = 1; 2472 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2326 } 2475 }
2327 2476
2328 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2329 } 2478 }
2330 2479
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2481 XSync (disp, False);
2333 2482
2334 /* 2483 /*
2335 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2338 */ 2487 */
2339 i = (xa[XA_XROOTPMAPID] 2488 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2343 2492
2344 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2349 2498
2350 if (!i || prop == NULL 2499 if (!i || prop == NULL
2351#if TINTING 2500#if TINTING
… …
2370 Window cr; 2519 Window cr;
2371 XImage *image; 2520 XImage *image;
2372 GC gc; 2521 GC gc;
2373 XGCValues gcvalue; 2522 XGCValues gcvalue;
2374 2523
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2524 XTranslateCoordinates (disp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2528 nx = ny = 0;
2380 2529
… …
2390 nh += sy; 2539 nh += sy;
2391 ny = -sy; 2540 ny = -sy;
2392 sy = 0; 2541 sy = 0;
2393 } 2542 }
2394 2543
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546
2547 XSync (disp, False);
2397 allowedxerror = -1; 2548 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2550
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2553 allowedxerror = 0;
2403 2554
2404 if (image == NULL) 2555 if (image == NULL)
2405 { 2556 {
2406 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2407 { 2558 {
2408 pchanged = 1; 2559 pchanged = 1;
2409 if (TermWin.pixmap != None) 2560 if (pixmap != None)
2410 { 2561 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2562 XFreePixmap (disp, pixmap);
2412 TermWin.pixmap = None; 2563 pixmap = None;
2413 } 2564 }
2414 } 2565 }
2415 2566
2416 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2417 } 2568 }
2418 else 2569 else
2419 { 2570 {
2420 if (TermWin.pixmap != None) 2571 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2572 XFreePixmap (disp, pixmap);
2422 2573
2423#if TINTING 2574#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2576 {
2426 unsigned short rm, gm, bm; 2577 unsigned short rm, gm, bm;
… …
2430 2581
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (display, image, shade, rm, gm, bm);
2432 } 2583 }
2433#endif 2584#endif
2434 2585
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2586 pixmap = XCreatePixmap (disp, vt,
2436 szHint.width, szHint.height, image->depth); 2587 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2589 XPutImage (disp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2590 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2591 XFreeGC (disp, gc);
2441 XDestroyImage (image); 2592 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2594 XClearWindow (disp, parent[0]);
2444 2595
2445 if (!am_transparent || !am_pixmap_trans) 2596 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2597 pchanged = 1;
2447 2598
2448 am_transparent = am_pixmap_trans = 1; 2599 am_transparent = am_pixmap_trans = 1;
2449 } 2600 }
2450 } 2601 }
2451 2602
2452 if (!am_pixmap_trans) 2603 if (am_pixmap_trans)
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2605 else
2453 { 2606 {
2454 unsigned int n; 2607 unsigned int n;
2455 /* 2608 /*
2456 * InheritPixmap transparency 2609 * InheritPixmap transparency
2457 */ 2610 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2612 {
2460 oldp = TermWin.parent[i]; 2613 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2614 XQueryTree (disp, parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n); 2615 &parent[i], &list, &n);
2463 XFree (list); 2616 XFree (list);
2464 2617
2465 if (TermWin.parent[i] == display->root) 2618 if (parent[i] == display->root)
2466 { 2619 {
2467 if (oldp != None) 2620 if (oldp != None)
2468 pchanged = 1; 2621 pchanged = 1;
2469 2622
2470 break; 2623 break;
2471 } 2624 }
2472 2625
2473 if (oldp != TermWin.parent[i]) 2626 if (oldp != parent[i])
2474 pchanged = 1; 2627 pchanged = 1;
2475 } 2628 }
2476 2629
2477 n = 0; 2630 n = 0;
2478 2631
2479 if (pchanged) 2632 if (pchanged)
2480 { 2633 {
2481 for (; n < (unsigned int)i; n++) 2634 for (; n < (unsigned int)i; n++)
2482 { 2635 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2636 XGetWindowAttributes (disp, parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2638 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2640 break;
2488 } 2641 }
2489 } 2642 }
2490 } 2643 }
2491 2644
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2645 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2493 { 2646 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2649 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2650 /* XXX: also turn off Opt_transparent? */
2498 } 2651 }
2499 else 2652 else
2500 { 2653 {
… …
2503 * needed for fvwm2.2.2 (and before?) */ 2656 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1); 2657 sleep (1);
2505#endif 2658#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2659 for (n = 0; n < (unsigned int)i; n++)
2507 { 2660 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2662 XClearWindow (disp, parent[n]);
2510 } 2663 }
2511 2664
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2513 am_transparent = 1; 2666 am_transparent = 1;
2514 } 2667 }
2515 2668
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2670 parent[i] = None;
2518 } 2671 }
2519 2672
2520 // this is experimental
2521 if (scrollBar.win) 2673 if (scrollBar.win)
2522 { 2674 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2676 scrollBar.setIdle ();
2526 scrollbar_show (0); 2677 scrollbar_show (0);
2527 } 2678 }
2528 2679
2680 if (am_transparent)
2681 {
2682 want_refresh = want_full_refresh = 1;
2683 if (am_pixmap_trans)
2684 flush ();
2685 }
2686
2529 return pchanged; 2687 return pchanged;
2530} 2688}
2531#endif 2689#endif
2532 2690
2533/*}}} */ 2691/*}}} */
2534 2692
2535bool 2693bool
2536rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2537{ 2695{
2538 bool flag = false; 2696 bool flag = false;
2539 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2541 2699
2542 for (;;) 2700 for (;;)
2543 { 2701 {
2544 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2545 { 2703 {
2546 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2547 ch = next_char (); 2705 ch = next_char ();
2548 }
2549 2706
2550 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2551 break; 2708 break;
2709 }
2552 2710
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2711 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 { 2712 {
2555 if (!seen_input) 2713 if (!seen_input)
2556 { 2714 {
2557 seen_input = 1; 2715 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2716 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2717 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2718 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2719 // then sometimes get the size wrong.
2720 // unfortunately other programs are even more buggy and dislike
2721 // being sent SIGWINCH, so only do it when we were in fact being
2722 // resized.
2723 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2563 } 2725 }
2564 2726
2565 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2729 bool refreshnow = false;
2568 int nlines = 0; 2730 int nlines = 0;
2569 unicode_t *str = buf; 2731 wchar_t *str = buf;
2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2570 2733
2571 for (;;) 2734 for (;;)
2572 { 2735 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2736 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2737 break;
2575 2738
2576 *str++ = ch; 2739 *str++ = ch;
2577 2740
2578 if (ch == C0_LF) 2741 if (ch == C0_LF || str >= eol)
2579 { 2742 {
2743 if (ch == C0_LF)
2580 nlines++; 2744 nlines++;
2745
2581 refresh_count++; 2746 refresh_count++;
2582 2747
2583 if (!(options & Opt_jumpScroll) 2748 if (!OPTION (Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2750 {
2586 refreshnow = true; 2751 refreshnow = true;
2752 refresh_count = 0;
2587 ch = NOCHAR; 2753 ch = NOCHAR;
2588 break; 2754 break;
2589 } 2755 }
2590 2756
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2758 if (nlines >= nrow - 1)
2593 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2594 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2763
2595 nlines = 0; 2764 nlines = 0;
2596 str = buf; 2765 str = buf;
2766 eol = str + min (ncol, UBUFSIZ);
2597 } 2767 }
2598 }
2599 2768
2600 if (str >= buf + UBUFSIZ) 2769 if (str >= eol)
2601 { 2770 {
2771 if (eol >= buf + UBUFSIZ)
2772 {
2602 ch = NOCHAR; 2773 ch = NOCHAR;
2603 break; 2774 break;
2775 }
2776 else
2777 eol = min (eol + ncol, buf + UBUFSIZ);
2778 }
2779
2604 } 2780 }
2605 2781
2606 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2783 ch = next_char ();
2608 } 2784 }
2609 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2610 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2611 2789
2612 /* 2790 /*
2613 * If there have been a lot of new lines, then update the screen 2791 * If there have been a lot of new lines, then update the screen
2614 * What the heck I'll cheat and only refresh less than every page-full. 2792 * What the heck I'll cheat and only refresh less than every page-full.
2615 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling. 2794 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2795 */
2618 if (refreshnow) 2796 if (refreshnow)
2619 { 2797 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++; 2799 refresh_limit++;
2622 else 2800 else
2623 { 2801 {
2624 flag = true; 2802 flag = true;
2625 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2804 want_refresh = 1;
2626 } 2805 }
2627 } 2806 }
2628 2807
2629 } 2808 }
2630 else 2809 else
… …
2645 } 2824 }
2646 2825
2647 return flag; 2826 return flag;
2648} 2827}
2649 2828
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2659// read the next character 2829// read the next character
2660unicode_t 2830wchar_t
2661rxvt_term::next_char () 2831rxvt_term::next_char ()
2662{ 2832{
2663 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2664 { 2834 {
2665 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2667 return *cmdbuf_ptr++; 2837 return *cmdbuf_ptr++;
2668 2838
2669 wchar_t wc; 2839 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2840 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671 2841
2672 if (len == (size_t)-2) 2842 if (len == (size_t)-2)
2673 { 2843 {
2674 // the mbstate stores incomplete sequences. didn't know this :/ 2844 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2676 break; 2846 break;
2677 } 2847 }
2678 2848
2679 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2850 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2851
2682 // assume wchar == unicode 2852 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2684 return wc; 2854 return wc & UNICODE_MASK;
2685 } 2855 }
2686 2856
2687 return NOCHAR; 2857 return NOCHAR;
2858}
2859
2860// read the next octet
2861uint32_t
2862rxvt_term::next_octet ()
2863{
2864 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR;
2688} 2867}
2689 2868
2690/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2691/* 2870/*
2692 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2693 * to the command. 2872 * to the command.
2694 */ 2873 */
2695unicode_t 2874wchar_t
2696rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2697{ 2876{
2698 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2699 2878
2700 if (c == NOCHAR) 2879 if (c == NOCHAR)
2701 throw out_of_input; 2880 throw out_of_input;
2702 2881
2703 return c; 2882 return c;
2704} 2883}
2705 2884
2706unicode_t 2885uint32_t
2707rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2708{ 2887{
2709 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2710 2889
2711 if (c == NOCHAR) 2890 if (c == NOCHAR)
2712 throw out_of_input; 2891 throw out_of_input;
2713 2892
2714 return c; 2893 return c;
… …
2814 case C0_ESC: 2993 case C0_ESC:
2815 process_escape_seq (); 2994 process_escape_seq ();
2816 break; 2995 break;
2817 case C0_ENQ: /* terminal Status */ 2996 case C0_ENQ: /* terminal Status */
2818 if (rs[Rs_answerbackstring]) 2997 if (rs[Rs_answerbackstring])
2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2998 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2821 else 2999 else
2822 tt_write ((unsigned char *)VT100_ANS, 3000 tt_write (VT100_ANS, strlen (VT100_ANS));
2823 (unsigned int)strlen (VT100_ANS));
2824 break; 3001 break;
2825 case C0_BEL: /* bell */ 3002 case C0_BEL: /* bell */
2826 scr_bell (); 3003 scr_bell ();
2827 break; 3004 break;
2828 case C0_BS: /* backspace */ 3005 case C0_BS: /* backspace */
… …
2983 break; 3160 break;
2984 3161
2985 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
2986 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
2987 { 3164 {
2988 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
2989 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2990 } 3167 }
2991 break; 3168 break;
2992 3169
2993 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
2994 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
… …
3016 process_dcs_seq (); 3193 process_dcs_seq ();
3017 break; 3194 break;
3018 3195
3019 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3196 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3020 case C1_SCI: /* ESC Z */ 3197 case C1_SCI: /* ESC Z */
3021 tt_write ((const unsigned char *)ESCZ_ANSWER, 3198 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3022 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3023 break; /* steal obsolete ESC [ c */ 3199 break; /* steal obsolete ESC [ c */
3024 3200
3025 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3201 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3026 case C1_CSI: /* ESC [ */ 3202 case C1_CSI: /* ESC [ */
3027 process_csi_seq (); 3203 process_csi_seq ();
… …
3152 { 3328 {
3153 switch (priv) 3329 switch (priv)
3154 { 3330 {
3155 case '>': 3331 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3332 if (ch == CSI_DA) /* secondary device attributes */
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158 break; 3334 break;
3159 case '?': 3335 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3337 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3338 break;
… …
3267 3443
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3444 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3445 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3446 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3447 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3448 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3449 break;
3274 3450
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3451 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3452 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3277 (unsigned int) (sizeof (VT100_ANS) - 1));
3278 break; 3453 break;
3279 3454
3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3455 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3281 process_sgr_mode (nargs, arg); 3456 process_sgr_mode (nargs, arg);
3282 break; 3457 break;
… …
3289 break; 3464 break;
3290 case 6: /* CPR requested */ 3465 case 6: /* CPR requested */
3291 scr_report_position (); 3466 scr_report_position ();
3292 break; 3467 break;
3293 case 7: /* unofficial extension */ 3468 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 3469 if (OPTION (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3470 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 3471 break;
3297 case 8: /* unofficial extension */ 3472 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3473 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 3474 break;
… …
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3566rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3567{
3393 int x, y; 3568 int x, y;
3394 XWindowAttributes wattr; 3569 XWindowAttributes wattr;
3395 Window wdummy; 3570 Window wdummy;
3571 dDisp;
3396 3572
3397 if (nargs == 0) 3573 if (nargs == 0)
3398 return; 3574 return;
3399 3575
3400 switch (args[0]) 3576 switch (args[0])
3401 { 3577 {
3402 /* 3578 /*
3403 * commands 3579 * commands
3404 */ 3580 */
3405 case 1: /* deiconify window */ 3581 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3582 XMapWindow (disp, parent[0]);
3407 break; 3583 break;
3408 case 2: /* iconify window */ 3584 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3585 XIconifyWindow (disp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3586 break;
3412 case 3: /* set position (pixels) */ 3587 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3588 XMoveWindow (disp, parent[0], args[1], args[2]);
3414 break; 3589 break;
3415 case 4: /* set size (pixels) */ 3590 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3592 break;
3418 case 5: /* raise window */ 3593 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3594 XRaiseWindow (disp, parent[0]);
3420 break; 3595 break;
3421 case 6: /* lower window */ 3596 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3597 XLowerWindow (disp, parent[0]);
3423 break; 3598 break;
3424 case 7: /* refresh window */ 3599 case 7: /* refresh window */
3425 scr_touch (true); 3600 scr_touch (true);
3426 break; 3601 break;
3427 case 8: /* set size (chars) */ 3602 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3603 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3604 (unsigned int) (args[1] * fheight));
3430 break; 3605 break;
3431 3606
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3607 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3608 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3609 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3610 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3611 (unsigned int) (args[1] * fheight));
3437 break; 3612 break;
3438 3613
3439 3614
3440 /* 3615 /*
3441 * reports - some output format copied from XTerm 3616 * reports - some output format copied from XTerm
3442 */ 3617 */
3443 case 11: /* report window state */ 3618 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3619 XGetWindowAttributes (disp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3621 break;
3447 case 13: /* report window position */ 3622 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (disp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3624 XTranslateCoordinates (disp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3625 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3626 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3627 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3628 break;
3454 case 14: /* report window size (pixels) */ 3629 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3630 XGetWindowAttributes (disp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3632 break;
3458 case 18: /* report text area size (chars) */ 3633 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3634 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3635 break;
3461 case 19: /* report window size (chars) */ 3636 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3637 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3638 break;
3464 case 20: /* report icon label */ 3639 case 20: /* report icon label */
3465 { 3640 {
3466 char *s; 3641 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3642 XGetIconName (disp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3644 XFree (s);
3470 } 3645 }
3471 break; 3646 break;
3472 case 21: /* report window title */ 3647 case 21: /* report window title */
3473 { 3648 {
3474 char *s; 3649 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3650 XFetchName (disp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3652 XFree (s);
3478 } 3653 }
3479 break; 3654 break;
3480 } 3655 }
3481} 3656}
… …
3484/*----------------------------------------------------------------------*/ 3659/*----------------------------------------------------------------------*/
3485/* 3660/*
3486 * get input up until STRING TERMINATOR (or BEL) 3661 * get input up until STRING TERMINATOR (or BEL)
3487 * ends_how is terminator used. returned input must be free()'d 3662 * ends_how is terminator used. returned input must be free()'d
3488 */ 3663 */
3489unsigned char * 3664char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3665rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3666{
3492 unicode_t prev = 0, ch; 3667 unicode_t ch;
3668 bool seen_esc = false;
3493 unsigned int n = 0; 3669 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3670 wchar_t string[STRING_MAX];
3496 3671
3497 while ((ch = cmd_getc ()) != NOCHAR) 3672 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3673 {
3499 if (prev == C0_ESC) 3674 if (seen_esc)
3500 { 3675 {
3501 if (ch == 0x5c) /* 7bit ST */ 3676 if (ch == 0x5c) /* 7bit ST */
3502 break; 3677 break;
3503 else 3678 else
3504 return NULL; 3679 return NULL;
3505 } 3680 }
3681 else if (ch == C0_ESC)
3682 {
3683 seen_esc = true;
3684 continue;
3685 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3686 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3687 break;
3508 else if (ch < 0x20) 3688 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3689 return NULL; /* other control character - exit */
3510 3690
3511 if (n >= sizeof (string) - 1) 3691 seen_esc = false;
3692
3693 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3694 // stop at some sane length
3513 return NULL; 3695 return NULL;
3514 3696
3515 if (ch == C0_SYN) 3697 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3698 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3699 else
3521 string[n++] = prev = ch; 3700 string[n++] = ch;
3522 } 3701 }
3523 3702
3524 string[n++] = '\0'; 3703 string[n++] = '\0';
3525 3704
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3705 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3706
3531 return s; 3707 return rxvt_wcstombs (string);
3532} 3708}
3533 3709
3534/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3535/* 3711/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3712 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3537 */ 3713 */
3538void 3714void
3539rxvt_term::process_dcs_seq () 3715rxvt_term::process_dcs_seq ()
3540{ 3716{
3541 unsigned char *s; 3717 char *s;
3542 unicode_t eh; 3718 unicode_t eh;
3543 3719
3544 /* 3720 /*
3545 * Not handled yet 3721 * Not handled yet
3546 */ 3722 */
… …
3565 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3741 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3566 arg = arg * 10 + (ch - '0'); 3742 arg = arg * 10 + (ch - '0');
3567 3743
3568 if (ch == ';') 3744 if (ch == ';')
3569 { 3745 {
3570 unsigned char *s = get_to_st (eh); 3746 char *s = get_to_st (eh);
3571 3747
3572 if (s) 3748 if (s)
3573 { 3749 {
3574 process_xterm_seq (arg, (char *)s, eh); 3750 process_xterm_seq (arg, s, eh);
3575 free (s); 3751 free (s);
3576 } 3752 }
3577 } 3753 }
3578} 3754}
3579 3755
3580void 3756void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3582{ 3758{
3583 if (str[0] == '?' && !str[1]) 3759 if (str[0] == '?' && !str[1])
3584 { 3760 {
3585 unsigned short r, g, b; 3761 unsigned short r, g, b;
3586 pix_colors_focused[color].get (display, r, g, b); 3762 pix_colors_focused[color].get (display, r, g, b);
… …
3590 set_window_color (color, str); 3766 set_window_color (color, str);
3591} 3767}
3592 3768
3593/* 3769/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3771 */
3618void 3772void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3620{ 3774{
3621 int changed = 0; 3775 int changed = 0;
3622 int color; 3776 int color;
3623 char *buf, *name; 3777 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
3779 int saveop = op;
3780 dDisp;
3625 3781
3626 assert (str != NULL); 3782 assert (str != NULL);
3627 switch (op) 3783 switch (op)
3628 { 3784 {
3629 case XTerm_name: 3785 case XTerm_name:
… …
3636 set_title (str); 3792 set_title (str);
3637 break; 3793 break;
3638 case XTerm_property: 3794 case XTerm_property:
3639 if (str[0] == '?') 3795 if (str[0] == '?')
3640 { 3796 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3797 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3798 Atom actual_type;
3643 int actual_format; 3799 int actual_format;
3644 unsigned long nitems; 3800 unsigned long nitems;
3645 unsigned long bytes_after; 3801 unsigned long bytes_after;
3646 unsigned char *value = 0; 3802 unsigned char *value = 0;
3647 const char *str = ""; 3803 const char *str = "";
3648 3804
3649 if (prop 3805 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3806 && XGetWindowProperty (disp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3807 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3808 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3809 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3810 && actual_type != None
3655 && actual_format == 8) 3811 && actual_format == 8)
… …
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3820 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3821
3666 if (eq) 3822 if (eq)
3667 { 3823 {
3668 *eq = 0; 3824 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3825 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3826 }
3674 else 3827 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3828 XDeleteProperty (disp, parent[0],
3676 display->atom (str)); 3829 display->atom (str));
3677 } 3830 }
3678 break; 3831 break;
3679 3832
3680 case XTerm_Color: 3833 case XTerm_Color:
… …
3682 { 3835 {
3683 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3684 break; 3837 break;
3685 3838
3686 *name++ = '\0'; 3839 *name++ = '\0';
3687 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3688 3841
3689 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3690 break; 3843 break;
3691 3844
3692 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3693 *buf++ = '\0'; 3846 *buf++ = '\0';
3694 3847
3695 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3696 { 3849 {
3697 unsigned short r, g, b; 3850 unsigned short r, g, b;
3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3700 } 3853 }
3701 else 3854 else
3702 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3703 } 3856 }
3704 break; 3857 break;
3705 case XTerm_Color00: 3858 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3707 break; 3860 break;
3708 case XTerm_Color01: 3861 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3710 break; 3863 break;
3711#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3712 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3714 break; 3867 break;
… …
3718 break; 3871 break;
3719 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3721 break; 3874 break;
3722#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3723 case XTerm_Color_BD:
3724 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3725 break;
3726 case XTerm_Color_UL:
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break;
3729 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731 break; 3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3886 break;
3887 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3889 break;
3732#endif 3890#endif
3891#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3894 check_our_parents ();
3895 if (am_transparent)
3896 want_full_refresh = want_refresh = 1;
3897 break;
3898#endif
3733 3899
3734 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3735 if (*str != ';') 3901 if (*str != ';')
3736 { 3902 {
3737#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3738 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3739 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3740#endif
3741 scr_touch (true); 3906 scr_touch (true);
3907#endif
3742 } 3908 }
3909
3743 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3744 { 3911 {
3745 str++; 3912 str++;
3746#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3748#endif 3915#endif
3749
3750 } 3916 }
3917
3751 if (changed) 3918 if (changed)
3752 { 3919 {
3753#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3921 resize_pixmap ();
3755#endif
3756 scr_touch (true); 3922 scr_touch (true);
3923#endif
3757 } 3924 }
3758 break; 3925 break;
3759 3926
3760 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3761 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3762 break; 3929 break;
3763 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3764 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3765 break; 3932 break;
3766 3933
3767 case XTerm_logfile: 3934 case XTerm_logfile:
3768 // TODO, when secure mode? 3935 // TODO, when secure mode?
3769 break; 3936 break;
3770 3937
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR
3806 case XTerm_Menu:
3807 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break;
3810#endif
3811#if 0 3938#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3813 { 3940 {
3814 int fd; 3941 int fd;
3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3816 { 3943 {
3817 scr_dump (fd); 3944 scr_dump (fd);
3818 close (fd); 3945 close (fd);
3819 } 3946 }
3820 } 3947 }
3948 break;
3949#endif
3950 case XTerm_font:
3951 op = URxvt_font;
3952 case URxvt_font:
3953#if ENABLE_STYLES
3954 case URxvt_boldFont:
3955 case URxvt_italicFont:
3956 case URxvt_boldItalicFont:
3957#endif
3958 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp);
3963 else
3964 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)];
3966
3967 res = strdup (str);
3968 allocated.push_back ((void *)res);
3969 set_fonts ();
3970 }
3971 break;
3972
3973#if ENABLE_FRILLS
3974 case URxvt_locale:
3975 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3977 else
3978 {
3979 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8);
3981 init_xlocale ();
3982 }
3983 break;
3984
3985 case URxvt_view_up:
3986 case URxvt_view_down:
3987 {
3988 int lines = atoi (str);
3989
3990 if (lines)
3991 scr_page (op == URxvt_view_up ? UP : DN, lines);
3992 else
3993 scr_erase_savelines ();
3994 }
3995
3996 break;
3997#endif
3998
3999#if ENABLE_PERL
4000 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4002 ; // no responses yet
3821 break; 4003 break;
3822#endif 4004#endif
3823 } 4005 }
3824} 4006}
3825/*----------------------------------------------------------------------*/ 4007/*----------------------------------------------------------------------*/
… …
3877 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
3878 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
3879 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
3881 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
3882#ifdef menuBar_esc
3883 { menuBar_esc, PrivMode_menuBar },
3884#endif
3885 // 18, 19 printing-related 4064 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
3887#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
3888 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
3889#endif 4068#endif
… …
3934 } 4113 }
3935 4114
3936 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4116 switch (arg[i])
3938 { 4117 {
4118#if ENABLE_STYLES
4119 case 1021:
4120 set_option (Opt_intensityStyles, mode);
4121
4122 scr_touch (true);
4123 break;
4124#endif
3939 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
4126 case 1049:
3940 if (options & Opt_secondaryScreen) 4127 if (OPTION (Opt_secondaryScreen))
3941 if (mode == 0) 4128 if (mode == 0)
3942 scr_cursor (RESTORE); 4129 scr_cursor (RESTORE);
3943 else if (mode == 1) 4130 else if (mode == 1)
3944 scr_cursor (SAVE); 4131 scr_cursor (SAVE);
3945 break; 4132 break;
… …
3957 */ 4144 */
3958 PrivMode (1, PrivMode_vt52); 4145 PrivMode (1, PrivMode_vt52);
3959 break; 4146 break;
3960 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4150 break;
3964 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
3965 if (state)
3966 options &= ~Opt_jumpScroll;
3967 else
3968 options |= Opt_jumpScroll; 4152 set_option (Opt_jumpScroll, !state);
3969 break; 4153 break;
3970 case 5: /* reverse video */ 4154 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
3972 break; 4156 break;
3973 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
… …
3979 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
3980 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
3981 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
3982 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
3983 break; 4167 break;
3984#ifdef menuBar_esc
3985 case menuBar_esc:
3986#ifdef MENUBAR
3987 map_menuBar (state);
3988#endif
3989 break;
3990#endif
3991#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
3992 case scrollBar_esc: 4169 case scrollBar_esc:
3993 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
3994 { 4171 {
3995 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
… …
4014#if 0 4191#if 0
4015 case 1001: 4192 case 1001:
4016 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4017#endif 4194#endif
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state)
4020 options &= ~Opt_scrollTtyOutput;
4021 else
4022 options |= Opt_scrollTtyOutput; 4196 set_option (Opt_scrollTtyOutput, !state);
4023 break; 4197 break;
4024 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4025 if (state)
4026 options |= Opt_scrollTtyKeypress; 4199 set_option (Opt_scrollTtyKeypress, state);
4027 else
4028 options &= ~Opt_scrollTtyKeypress;
4029 break; 4200 break;
4030 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 4202 if (OPTION (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 4204 scr_erase_screen (2);
4034 scr_change_screen (state); 4205 scr_change_screen (state);
4035 break; 4206 break;
4036 case 1049: /* secondary screen w/ clearing first */ 4207 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 4208 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 4209 if (OPTION (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 4210 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 4211 scr_erase_screen (2);
4041 break; 4212 break;
4042 default: 4213 default:
4043 break; 4214 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 4240 rendset = 0, rendstyle = ~RS_None;
4070 break; 4241 break;
4071 case 1: 4242 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4243 rendset = 1, rendstyle = RS_Bold;
4073 break; 4244 break;
4074 //case 2: // faint or second colour 4245 //case 2: // low intensity
4075 //case 3: // italic 4246 case 3:
4247 rendset = 1, rendstyle = RS_Italic;
4248 break;
4076 case 4: 4249 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4250 rendset = 1, rendstyle = RS_Uline;
4078 break; 4251 break;
4079 case 5: // slowly blinking 4252 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4253 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4265 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4266 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4267 //...
4095 //case 19: // ninth alt font 4268 //case 19: // ninth alt font
4096 //case 20: // gothic 4269 //case 20: // gothic
4097 case 21: // disable bold, faint 4270 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4271 rendset = 0, rendstyle = RS_Bold;
4099 break; 4272 break;
4100 case 22: 4273 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4274 rendset = 0, rendstyle = RS_Bold;
4102 break; 4275 break;
4103 //case 23: disable italic 4276 case 23: // disable italic
4277 rendset = 0, rendstyle = RS_Italic;
4278 break;
4104 case 24: 4279 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4280 rendset = 0, rendstyle = RS_Uline;
4106 break; 4281 break;
4107 case 25: 4282 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4283 rendset = 0, rendstyle = RS_Blink;
4109 break; 4284 break;
4110 case 26: 4285 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4286 rendset = 0, rendstyle = RS_Blink;
4112 break; 4287 break;
4113 case 27: 4288 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4289 rendset = 0, rendstyle = RS_RVid;
4115 break; 4290 break;
… …
4133 case 35: 4308 case 35:
4134 case 36: 4309 case 36:
4135 case 37: 4310 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4311 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4312 break;
4138#ifdef TTY_256COLOR 4313 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4314 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4315 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4316 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4317 i += 2;
4144 } 4318 }
4145 break; 4319 break;
4146#endif
4147 case 39: /* default fg */ 4320 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4321 scr_color (Color_fg, Color_fg);
4149 break; 4322 break;
4150 4323
4151 case 40: 4324 case 40:
… …
4156 case 45: 4329 case 45:
4157 case 46: 4330 case 46:
4158 case 47: 4331 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4332 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4333 break;
4161#ifdef TTY_256COLOR 4334 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4335 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4336 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4337 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4338 i += 2;
4167 } 4339 }
4168 break; 4340 break;
4169#endif
4170 case 49: /* default bg */ 4341 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4342 scr_color (Color_bg, Color_bg);
4172 break; 4343 break;
4173 4344
4174#ifndef NO_BRIGHTCOLOR 4345 //case 50: // not variable spacing
4346
4347#if ENABLE_FRILLS
4175 case 90: 4348 case 90:
4176 case 91: /* set bright fg color */ 4349 case 91: /* set bright fg color */
4177 case 92: 4350 case 92:
4178 case 93: 4351 case 93:
4179 case 94: 4352 case 94:
4180 case 95: 4353 case 95:
4181 case 96: 4354 case 96:
4182 case 97: 4355 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4356 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4357 break;
4186 case 100: 4358 case 100:
4187 case 101: /* set bright bg color */ 4359 case 101: /* set bright bg color */
4188 case 102: 4360 case 102:
4189 case 103: 4361 case 103:
4190 case 104: 4362 case 104:
4191 case 105: 4363 case 105:
4192 case 106: 4364 case 106:
4193 case 107: 4365 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4367 break;
4197#endif 4368#endif
4198
4199 } 4369 }
4200 } 4370 }
4201} 4371}
4202/*}}} */ 4372/*}}} */
4203 4373
… …
4227 */ 4397 */
4228void 4398void
4229rxvt_term::tt_printf (const char *fmt,...) 4399rxvt_term::tt_printf (const char *fmt,...)
4230{ 4400{
4231 va_list arg_ptr; 4401 va_list arg_ptr;
4232 unsigned char buf[256]; 4402 char buf[256];
4233 4403
4234 va_start (arg_ptr, fmt); 4404 va_start (arg_ptr, fmt);
4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4405 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4236 va_end (arg_ptr); 4406 va_end (arg_ptr);
4237 tt_write (buf, strlen (buf)); 4407 tt_write (buf, strlen (buf));
… …
4239 4409
4240/* ---------------------------------------------------------------------- */ 4410/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4411/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4412 * or generated by us in response to a query ESC sequence.
4243 */ 4413 */
4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4415
4244void 4416void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4246{ 4418{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return;
4248 4421
4249 if (len) 4422 if (pty.pty < 0)
4423 return;
4424
4425 if (v_buflen == 0)
4426 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4428
4429 if ((unsigned int)written == len)
4430 return;
4431
4432 data += written;
4433 len -= written;
4250 { 4434 }
4435
4436 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4437
4438 memcpy (v_buffer + v_buflen, data, len);
4439 v_buflen += len;
4440
4441 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442}
4443
4444void rxvt_term::pty_write ()
4445{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447
4448 if (written > 0)
4449 {
4450 v_buflen -= written;
4451
4251 if (v_buflen == 0) 4452 if (v_buflen == 0)
4252 { 4453 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4454 free (v_buffer);
4280 v_buffer = 0; 4455 v_buffer = 0;
4281 v_buflen = 0; 4456 v_buflen = 0;
4282 4457
4283 pty_ev.set (EVENT_READ); 4458 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4459 return;
4296 } 4460 }
4461
4462 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4463 }
4464 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4465 pty_ev.set (EVENT_READ);
4298} 4466}
4299 4467
4300/*----------------------- end-of-file (C source) -----------------------*/ 4468/*----------------------- end-of-file (C source) -----------------------*/
4301 4469

Diff Legend

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