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.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.244 by root, Fri Jan 6 17:09:27 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 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
141 break; 160 break;
142 } 161 }
143 162
144 x--; 163 x--;
145 } 164 }
146
147} 165}
148#endif
149 166
150#if ENABLE_OVERLAY
151void 167void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 169{
154 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 173 int len;
158 174
175 fname = rxvt_utf8towcs (f->name);
176
159#if ENABLE_COMBINING 177# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
161 { 179 {
162 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
165 } 183 }
166 else 184 else
167#endif 185# endif
168 { 186 {
169 ch2 = ch; 187 ch2 = ch;
170 188
171 alloc = 0; 189 alloc = 0;
172 chr = &ch2; 190 chr = &ch2;
173 len = 1; 191 len = 1;
174 } 192 }
175 193
176 int width = strlen (f->name); 194 char attr[80]; // plenty
177 195
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
217 scr_overlay_new (x, y, width, len + 2);
179 218
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 220
182 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
183 { 222 {
… …
186 ch = *chr++; 225 ch = *chr++;
187 226
188 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
191#if !UNICODE3 230# if !UNICODE3
192 if (ch >= 0x10000) 231 if (ch >= 0x10000)
193 ch = 0xfffd; 232 ch = 0xfffd;
194#endif 233# endif
195 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
197 } 236 }
198 237
238 scr_overlay_set (0, len , attr);
199 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
200 240
241 free (fname);
242
201#if ENABLE_COMBINING 243# if ENABLE_COMBINING
202 if (alloc) 244 if (alloc)
203 delete [] alloc; 245 delete [] alloc;
204#endif 246# endif
205} 247}
206#endif 248#endif
207 249
208void 250void
209rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
226 mb[0] = ch[0]; 268 mb[0] = ch[0];
227 len = 1; 269 len = 1;
228 } 270 }
229 271
230 if (len > 0) 272 if (len > 0)
231 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
232 else 274 else
233 scr_bell (); 275 scr_bell ();
234 } 276 }
235 277
236 iso14755buf = 0; 278 iso14755buf = 0;
… …
264 KeySym keysym; 306 KeySym keysym;
265#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
266 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
267#endif 309#endif
268 int valid_keysym; 310 int valid_keysym;
269 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
270 312
271 /* 313 /*
272 * 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
273 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
274 * 316 *
275 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
276 */ 318 */
277 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
280 322
281 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
282 { 324 {
283 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
292 Status status_return; 334 Status status_return;
293 335
294#if 0 336#if 0
295#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
296 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
297 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
298 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
299 else 341 else
300#endif 342#endif
301#endif 343#endif
302 { 344 {
… …
304 346
305 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
309 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
312 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 357 SET_LOCALE (locale);
314 358
315 if (status_return == XLookupChars 359 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
337 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
338 } 382 }
339 else 383 else
340#endif 384#endif
341 { 385 {
342 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
343 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
344 } 388 }
345 389
346 if (valid_keysym) 390 if (valid_keysym)
347 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
348 if (TermWin.saveLines) 397 if (saveLines)
349 { 398 {
350#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 400 if (!ctrl && !meta)
352#else 401#else
353 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
354#endif 403#endif
355 { 404 {
356 int lnsppg; 405 int lnsppg;
357 406
358#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 409#else
361 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
362#endif 411#endif
363 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
364 { 413 {
365 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
366 return; 415 return;
… …
417 { 466 {
418 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
421 return; 470 return;
422#if TODO // TODO 471#if TODO
423 /* rxvt extras */ 472 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 474 change_font (FONT_UP);
426 return; 475 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 535 }
487#endif 536#endif
488 537
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 539 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 540 {
517 newlen = 1; 541 newlen = 1;
518 switch (keysym) 542 switch (keysym)
519 { 543 {
520#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
528 else 552 else
529 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
530 break; 554 break;
531#endif 555#endif
532#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
533 case XK_Delete: 567 case XK_Delete:
534 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
535 break; 569 break;
536#endif 570#endif
537 case XK_Tab: 571 case XK_Tab:
… …
640#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
641 case XK_KP_Begin: 675 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
643 break; 677 break;
644 678
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 679#endif
653 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
688 break; 715 break;
689 716
690 case XK_Find: 717 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
692 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
693 case XK_Insert: 731 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
695 break; 733 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 735 case DXK_Remove:
… …
787#undef FKEY 825#undef FKEY
788 default: 826 default:
789 newlen = 0; 827 newlen = 0;
790 break; 828 break;
791 } 829 }
830
792 if (newlen) 831 if (newlen)
793 len = strlen (kbuf); 832 len = strlen (kbuf);
794 } 833 }
795 834
796 /* 835 /*
… …
805 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
806 { 845 {
807 len = 1; 846 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
810 else 854 else
811 { 855 {
812#ifdef META8_OPTION 856#ifdef META8_OPTION
813 /* set 8-bit on */ 857 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
815 { 859 {
816 unsigned char *ch; 860 char *ch;
817 861
818 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
819 *ch |= 0x80; 863 *ch |= 0x80;
820 864
821 meta = 0; 865 meta = 0;
… …
823#endif 867#endif
824 /* nil */ ; 868 /* nil */ ;
825 } 869 }
826 } 870 }
827 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
873 return;
874
828 if (len <= 0) 875 if (len <= 0)
829 return; /* not mapped */ 876 return; /* not mapped */
830 877
831 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 879 if (view_start)
833 { 880 {
834 TermWin.view_start = 0; 881 view_start = 0;
835 want_refresh = 1; 882 want_refresh = 1;
836 } 883 }
837 884
838 /* 885 /*
839 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
854#ifdef META8_OPTION 901#ifdef META8_OPTION
855 && meta_char == C0_ESC 902 && meta_char == C0_ESC
856#endif 903#endif
857 ) 904 )
858 { 905 {
859 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
860 tt_write (&ch, 1); 907 tt_write (&ch, 1);
861 } 908 }
862 909
863#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
864 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
872#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
874} 921}
875/*}}} */ 922/*}}} */
876 923
877#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
880unsigned int 927unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
882{ 929{
883 unsigned int n, s; 930 unsigned int n, s;
884 931
885 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
905 952
906 cmd_parse (); 953 cmd_parse ();
907 954
908 return 0; 955 return 0;
909} 956}
910#endif /* MENUBAR_MAX */ 957#endif
911 958
912void 959void
913rxvt_term::flush () 960rxvt_term::flush ()
914{ 961{
962 flush_ev.stop ();
963
915#ifdef TRANSPARENT 964#ifdef TRANSPARENT
916 if (want_full_refresh) 965 if (want_full_refresh)
917 { 966 {
918 want_full_refresh = 0; 967 want_full_refresh = 0;
919 scr_clear (); 968 scr_clear ();
… …
921 } 970 }
922#endif 971#endif
923 972
924 if (want_refresh) 973 if (want_refresh)
925 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
926 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
927 scrollbar_show (1); 1015 scrollbar_show (1);
928#ifdef USE_XIM 1016#ifdef USE_XIM
929 IMSendSpot (); 1017 IMSendSpot ();
930#endif 1018#endif
931 } 1019 }
932 1020
933 display->flush (); 1021 display->flush ();
934
935 flush_ev.stop ();
936} 1022}
937 1023
938void 1024void
939rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
940{ 1026{
… …
942 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
943 1029
944 display->flush (); 1030 display->flush ();
945 1031
946 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
948} 1034}
949 1035
950void 1036void
951rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
952{ 1038{
… …
1016{ 1102{
1017 if (mouse_slip_wheel_speed == 0 1103 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1105 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1021 refresh_type |= SMOOTH_REFRESH; 1111 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1112 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1114 }
1025} 1115}
1026#endif 1116#endif
1027 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1028bool 1136bool
1029rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1030{ 1138{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032 1140
1033 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1034 { 1142 {
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1036 n = 0; 1144 n = 0;
1037 } 1145 }
1038 1146
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1042 1150
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1044 1152
1045 if (n > 0) 1153 if (r > 0)
1046 { 1154 {
1047 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1048 return true; 1156 return true;
1049 } 1157 }
1050 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
1051 destroy (); 1170 destroy ();
1171 }
1052 1172
1053 return false; 1173 return false;
1054} 1174}
1055 1175
1056void 1176void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1178{
1059 SET_R (this); 1179 SET_R (this);
1060 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
1061 1181
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1182 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1183 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1184 while (pty_fill ())
1067 if (cmd_parse ()) 1185 if (cmd_parse ())
1068 break; 1186 break;
1187
1188 if (revents & EVENT_WRITE)
1189 pty_write ();
1069} 1190}
1070 1191
1071void 1192void
1072rxvt_term::pointer_unblank () 1193rxvt_term::pointer_unblank ()
1073{ 1194{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1195 XDefineCursor (display->display, vt, TermWin_cursor);
1075 recolour_cursor (); 1196 recolour_cursor ();
1076 1197
1077#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1199 hidden_pointer = 0;
1079 1200
1080 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif 1203#endif
1083} 1204}
1084 1205
1085#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1086void 1207void
1087rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1088{ 1209{
1089 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1090 return; 1211 return;
1091 1212
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1093 XFlush (display->display); 1214 XFlush (display->display);
1094 1215
1095 hidden_pointer = 1; 1216 hidden_pointer = 1;
1096} 1217}
1097 1218
… …
1186 1307
1187/*{{{ process an X event */ 1308/*{{{ process an X event */
1188void 1309void
1189rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
1190{ 1311{
1312 dDisp;
1313
1191 SET_R (this); 1314 SET_R (this);
1192 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1193 1316
1194#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1196 { 1319 {
1197 if (hidden_cursor) 1320 if (hidden_cursor)
1198 { 1321 {
1199 hidden_cursor = 0; 1322 hidden_cursor = 0;
1200 want_refresh = 1; 1323 want_refresh = 1;
… …
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1204 } 1327 }
1205#endif 1328#endif
1206 1329
1207#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1209 { 1332 {
1210 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1213 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1216 if (ev.type == KeyPress && hidden_pointer == 0) 1339 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank (); 1340 pointer_blank ();
1218 } 1341 }
1219#endif 1342#endif
1220 1343
1221#ifdef USE_XIM
1222 if (XFilterEvent (&ev, None))
1223 return;
1224#endif
1225
1226 Window unused_root, unused_child; 1344 Window unused_root, unused_child;
1227 int unused_root_x, unused_root_y; 1345 int unused_root_x, unused_root_y;
1228 unsigned int unused_mask; 1346 unsigned int unused_mask;
1229 1347
1230 switch (ev.type) 1348 switch (ev.type)
1231 { 1349 {
1232 case KeyPress: 1350 case KeyPress:
1233#if ISO_14755 1351#if ISO_14755
… …
1297 else 1415 else
1298 iso14755buf = 0; 1416 iso14755buf = 0;
1299 } 1417 }
1300#endif 1418#endif
1301 1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1303 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1304 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1305 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1306 mouse_slip_wheel_speed = 0; 1428 mouse_slip_wheel_speed = 0;
… …
1316 button_release (ev.xbutton); 1438 button_release (ev.xbutton);
1317 break; 1439 break;
1318 1440
1319 case ClientMessage: 1441 case ClientMessage:
1320 if (ev.xclient.format == 32 1442 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1321 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1322 destroy (); 1446 destroy ();
1447#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev);
1452#endif
1453 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1323#ifdef OFFIX_DND 1463#ifdef OFFIX_DND
1324 /* OffiX Dnd (drag 'n' drop) protocol */ 1464 /* OffiX Dnd (drag 'n' drop) protocol */
1325 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1326 && (ev.xclient.data.l[0] == DndFile 1466 && (ev.xclient.data.l[0] == DndFile
1327 || ev.xclient.data.l[0] == DndDir 1467 || ev.xclient.data.l[0] == DndDir
1328 || ev.xclient.data.l[0] == DndLink)) 1468 || ev.xclient.data.l[0] == DndLink))
1329 { 1469 {
1330 /* Get Dnd data */ 1470 /* Get Dnd data */
1331 Atom ActualType; 1471 Atom ActualType;
1332 int ActualFormat; 1472 int ActualFormat;
1333 unsigned char *data; 1473 unsigned char *data;
1334 unsigned long Size, RemainingBytes; 1474 unsigned long Size, RemainingBytes;
1335 1475
1336 XGetWindowProperty (display->display, display->root, 1476 XGetWindowProperty (disp, display->root,
1337 xa[XA_DNDSELECTION], 1477 xa[XA_DNDSELECTION],
1338 0L, 1000000L, 1478 0L, 1000000L,
1339 False, AnyPropertyType, 1479 False, AnyPropertyType,
1340 &ActualType, &ActualFormat, 1480 &ActualType, &ActualFormat,
1341 &Size, &RemainingBytes, 1481 &Size, &RemainingBytes,
1342 &data); 1482 &data);
1343 XChangeProperty (display->display, display->root, 1483 set_string_property (XA_CUT_BUFFER0, data);
1344 XA_CUT_BUFFER0, XA_STRING,
1345 8, PropModeReplace,
1346 data, strlen (data));
1347 XFree (data); 1484 XFree (data);
1348 selection_paste (display->root, XA_CUT_BUFFER0, True); 1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350 } 1487 }
1351#endif /* OFFIX_DND */ 1488#endif /* OFFIX_DND */
1352 break; 1489 break;
1353 1490
1354 case MappingNotify: 1491 case MappingNotify:
… …
1379 break; 1516 break;
1380 } 1517 }
1381 break; 1518 break;
1382 1519
1383 case FocusIn: 1520 case FocusIn:
1384 if (!TermWin.focus) 1521 focus_in ();
1522 break;
1523
1524 case FocusOut:
1525 focus_out ();
1526 break;
1527
1528 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0])
1385 { 1530 {
1386 TermWin.focus = 1;
1387 want_refresh = 1;
1388#ifdef USE_XIM
1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1392 XSetICFocus (Input_Context);
1393 }
1394#endif
1395#ifdef CURSOR_BLINK
1396 if (options & Opt_cursorBlink)
1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398#endif
1399#ifdef OFF_FOCUS_FADING
1400 if (rs[Rs_fade])
1401 {
1402 pix_colors = pix_colors_focused;
1403 scr_recolour ();
1404 }
1405#endif
1406
1407 }
1408 break;
1409
1410 case FocusOut:
1411 if (TermWin.focus)
1412 {
1413 TermWin.focus = 0;
1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1422#ifdef USE_XIM
1423 if (Input_Context != NULL)
1424 XUnsetICFocus (Input_Context);
1425#endif
1426#ifdef CURSOR_BLINK
1427 if (options & Opt_cursorBlink)
1428 cursor_blink_ev.stop ();
1429 hidden_cursor = 0;
1430#endif
1431#ifdef OFF_FOCUS_FADING
1432 if (rs[Rs_fade])
1433 {
1434 pix_colors = pix_colors_unfocused;
1435 scr_recolour ();
1436 }
1437#endif
1438 }
1439 break;
1440
1441 case ConfigureNotify:
1442 if (ev.xconfigure.window == TermWin.parent[0])
1443 {
1444 int height, width;
1445
1446 do
1447 { /* Wrap lots of configures into one */
1448 width = ev.xconfigure.width;
1449 height = ev.xconfigure.height;
1450 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451 }
1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ;
1453 1533
1454 if (szHint.width != width || szHint.height != height) 1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1455 { 1535 {
1456 seen_resize = 1; 1536 seen_resize = 1;
1457 resize_all_windows (width, height, 1); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1458 } 1538 }
1459 1539
1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461 if (options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1462 {
1463 check_our_parents (); 1542 check_our_parents ();
1464 if (am_transparent)
1465 want_refresh = want_full_refresh = 1;
1466 }
1467#endif 1543#endif
1468 } 1544 }
1469 break; 1545 break;
1470 1546
1471 case PropertyNotify: 1547 case PropertyNotify:
… …
1479 selection_clear (); 1555 selection_clear ();
1480 break; 1556 break;
1481 1557
1482 case SelectionNotify: 1558 case SelectionNotify:
1483 if (selection_wait == Sel_normal) 1559 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, 1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 ev.xselection.property, True);
1486 break; 1561 break;
1487 1562
1488 case SelectionRequest: 1563 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1490 break; 1565 break;
1491 1566
1492 case UnmapNotify: 1567 case UnmapNotify:
1493 TermWin.mapped = 0; 1568 mapped = 0;
1494#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1570 text_blink_ev.stop ();
1496#endif 1571#endif
1497 break; 1572 break;
1498 1573
1499 case MapNotify: 1574 case MapNotify:
1500 TermWin.mapped = 1; 1575 mapped = 1;
1501#ifdef TEXT_BLINK 1576#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif 1578#endif
1504 break; 1579 break;
1505 1580
… …
1509 break; 1584 break;
1510#endif /* TRANSPARENT */ 1585#endif /* TRANSPARENT */
1511 1586
1512 case GraphicsExpose: 1587 case GraphicsExpose:
1513 case Expose: 1588 case Expose:
1514 if (ev.xany.window == TermWin.vt) 1589 if (ev.xany.window == vt)
1515 { 1590 {
1516 do 1591 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1520 1595
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1597
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1599 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1600 ev.xexpose.width, ev.xexpose.height, False);
1526 1601
1527 scr_refresh (refresh_type); 1602 scr_refresh (refresh_type);
1528 } 1603 }
1529 else 1604 else
1530 { 1605 {
1531 XEvent unused_event; 1606 XEvent unused_event;
1532 1607
1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534 ; 1609 ;
1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1611 ;
1537 1612
1538 if (isScrollbarWindow (ev.xany.window)) 1613 if (isScrollbarWindow (ev.xany.window))
1539 { 1614 {
1540 scrollBar.setIdle (); 1615 scrollBar.setIdle ();
… …
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose (); 1620 menubar_expose ();
1546#endif 1621#endif
1547 1622
1548#ifdef TRANSPARENT 1623#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1624 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (display->display, ev.xany.window); 1625 XClearWindow (disp, ev.xany.window);
1551#endif 1626#endif
1552 } 1627 }
1553 break; 1628 break;
1554 1629
1555 case MotionNotify: 1630 case MotionNotify:
… …
1562 { 1637 {
1563 menubar_control (ev.xbutton); 1638 menubar_control (ev.xbutton);
1564 break; 1639 break;
1565 } 1640 }
1566#endif 1641#endif
1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1643 break;
1569 1644
1570 if (ev.xany.window == TermWin.vt) 1645 if (ev.xany.window == vt)
1571 { 1646 {
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1650 {
1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1652 ;
1576 1653
1577 XQueryPointer (display->display, TermWin.vt, 1654 XQueryPointer (disp, vt,
1578 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1580 & (ev.xbutton.x), & (ev.xbutton.y), 1657 &ev.xbutton.x, &ev.xbutton.y,
1581 &unused_mask); 1658 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1659#ifdef MOUSE_THRESHOLD
1583 /* deal with a `jumpy' mouse */ 1660 /* deal with a `jumpy' mouse */
1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1661 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585 { 1662 {
1586#endif 1663#endif
… …
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1668 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break; 1669 break;
1593 } 1670 }
1594#endif 1671#endif
1595 selection_extend (ev.xbutton.x, ev.xbutton.y, 1672 selection_extend (ev.xbutton.x, ev.xbutton.y,
1596 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1673 ev.xbutton.state & Button3Mask ? 2 : 0);
1674
1597#ifdef SELECTION_SCROLLING 1675#ifdef SELECTION_SCROLLING
1598 if (ev.xbutton.y < TermWin.int_bwidth 1676 if (ev.xbutton.y < int_bwidth
1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1677 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1600 { 1678 {
1601 int dist; 1679 int dist;
1602 1680
1603 /* don't clobber the current delay if we are 1681 /* don't clobber the current delay if we are
1604 * already in the middle of scrolling. 1682 * already in the middle of scrolling.
… …
1612 selection_save_x = ev.xbutton.x; 1690 selection_save_x = ev.xbutton.x;
1613 selection_save_y = ev.xbutton.y; 1691 selection_save_y = ev.xbutton.y;
1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1692 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615 1693
1616 /* calc number of lines to scroll */ 1694 /* calc number of lines to scroll */
1617 if (ev.xbutton.y<TermWin.int_bwidth) 1695 if (ev.xbutton.y < int_bwidth)
1618 { 1696 {
1619 scroll_selection_dir = UP; 1697 scroll_selection_dir = UP;
1620 dist = TermWin.int_bwidth - ev.xbutton.y; 1698 dist = int_bwidth - ev.xbutton.y;
1621 } 1699 }
1622 else 1700 else
1623 { 1701 {
1624 scroll_selection_dir = DN; 1702 scroll_selection_dir = DN;
1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1703 dist = ev.xbutton.y - (int_bwidth + height);
1626 } 1704 }
1627 1705
1628 scroll_selection_lines = Pixel2Height (dist) 1706 scroll_selection_lines = Pixel2Height (dist)
1629 / SELECTION_SCROLL_LINE_SPEEDUP 1707 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1; 1708 + 1;
1631 MIN_IT (scroll_selection_lines, 1709 min_it (scroll_selection_lines,
1632 SELECTION_SCROLL_MAX_LINES); 1710 SELECTION_SCROLL_MAX_LINES);
1633 } 1711 }
1634 else 1712 else
1635 { 1713 {
1636 /* we are within the text window, so we 1714 /* we are within the text window, so we
… …
1645#endif 1723#endif
1646 } 1724 }
1647 } 1725 }
1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649 { 1727 {
1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1728 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651 MotionNotify, &ev)) ; 1729 MotionNotify, &ev))
1730 ;
1731
1652 XQueryPointer (display->display, scrollBar.win, 1732 XQueryPointer (disp, scrollBar.win,
1653 &unused_root, &unused_child, 1733 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1734 &unused_root_x, &unused_root_y,
1655 & (ev.xbutton.x), & (ev.xbutton.y), 1735 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1736 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658 scrollbar_size ()); 1738 scrollbar_size ());
1659 scr_refresh (refresh_type); 1739 scr_refresh (refresh_type);
1660 refresh_limit = 0; 1740 refresh_limit = 0;
… …
1662 } 1742 }
1663 break; 1743 break;
1664 } 1744 }
1665} 1745}
1666 1746
1747void
1748rxvt_term::focus_in ()
1749{
1750 if (!focus)
1751 {
1752 focus = 1;
1753 want_refresh = 1;
1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1757#if USE_XIM
1758 if (Input_Context != NULL)
1759 {
1760 IMSetStatusPosition ();
1761 XSetICFocus (Input_Context);
1762 }
1763#endif
1764#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1767#endif
1768#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade])
1770 {
1771 pix_colors = pix_colors_focused;
1772 scr_recolour ();
1773 }
1774#endif
1775 }
1776}
1777
1778void
1779rxvt_term::focus_out ()
1780{
1781 if (focus)
1782 {
1783 focus = 0;
1784 want_refresh = 1;
1785
1786 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1787
1788#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf)
1790 {
1791 iso14755buf = 0;
1792# if ENABLE_OVERLAY
1793 scr_overlay_off ();
1794# endif
1795 }
1796#endif
1797#if USE_XIM
1798 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context);
1800#endif
1801#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink))
1803 cursor_blink_ev.stop ();
1804 hidden_cursor = 0;
1805#endif
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 pix_colors = pix_colors_unfocused;
1810 scr_recolour ();
1811 }
1812#endif
1813 }
1814}
1815
1667#if TRANSPARENT 1816#if TRANSPARENT
1668void 1817void
1669rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1670{ 1819{
1671 SET_R (this); 1820 SET_R (this);
… …
1676 case PropertyNotify: 1825 case PropertyNotify:
1677 /* 1826 /*
1678 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1679 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1680 */ 1829 */
1681 if (xa[XA_XROOTPMAPID] == 0)
1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1685 return; 1832 return;
1686 1833
1687 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1688 case ReparentNotify: 1835 case ReparentNotify:
1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1690 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1691 break; 1838 break;
1692 } 1839 }
1693} 1840}
1694#endif 1841#endif
… …
1697rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
1698{ 1845{
1699 int reportmode = 0, clickintime; 1846 int reportmode = 0, clickintime;
1700 1847
1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1848 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1849
1702 if (!bypass_keystate) 1850 if (!bypass_keystate)
1703 reportmode = !! (priv_modes & PrivMode_mouse_report); 1851 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704 1852
1705 /* 1853 /*
1706 * VT window processing of button press 1854 * VT window processing of button press
1707 */ 1855 */
1708 if (ev.window == TermWin.vt) 1856 if (ev.window == vt)
1709 { 1857 {
1710#if ISO_14755 1858#if ISO_14755
1711 // 5.4 1859 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 { 1861 {
… …
1715 return; 1863 return;
1716 } 1864 }
1717#endif 1865#endif
1718 1866
1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1867 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1868
1720 if (reportmode) 1869 if (reportmode)
1721 { 1870 {
1722 /* mouse report from vt window */ 1871 /* mouse report from vt window */
1723 /* save the xbutton state (for ButtonRelease) */ 1872 /* save the xbutton state (for ButtonRelease) */
1724 MEvent.state = ev.state; 1873 MEvent.state = ev.state;
1725#ifdef MOUSE_REPORT_DOUBLECLICK 1874#ifdef MOUSE_REPORT_DOUBLECLICK
1726 if (ev.button == MEvent.button && clickintime) 1875 if (ev.button == MEvent.button && clickintime)
1727 { 1876 {
1728 /* same button, within alloted time */ 1877 /* same button, within alloted time */
1729 MEvent.clicks++; 1878 MEvent.clicks++;
1879
1730 if (MEvent.clicks > 1) 1880 if (MEvent.clicks > 1)
1731 { 1881 {
1732 /* only report double clicks */ 1882 /* only report double clicks */
1733 MEvent.clicks = 2; 1883 MEvent.clicks = 2;
1734 mouse_report (ev); 1884 mouse_report (ev);
… …
1753 } 1903 }
1754 else 1904 else
1755 { 1905 {
1756 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1757 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1908
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1758 switch (ev.button) 1910 switch (ev.button)
1759 { 1911 {
1760 case Button1: 1912 case Button1:
1913 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */
1915#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask);
1917#else
1918 selection.rect = false;
1919#endif
1920
1761 /* allow shift+left click to extend selection */ 1921 /* allow shift+left click to extend selection */
1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763 { 1923 {
1764 if (MEvent.button == Button1 && clickintime) 1924 if (MEvent.button == Button1 && clickintime)
1765 selection_rotate (ev.x, ev.y); 1925 selection_rotate (ev.x, ev.y);
1766 else 1926 else
1767 selection_extend (ev.x, ev.y, 1); 1927 selection_extend (ev.x, ev.y, 1);
1768 } 1928 }
1769 else 1929 else
1770 { 1930 {
1771 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1772 MEvent.clicks++; 1932 MEvent.clicks++;
1773 else 1933 else
1774 MEvent.clicks = 1; 1934 MEvent.clicks = 1;
1775 1935
1776 selection_click (MEvent.clicks, ev.x, ev.y); 1936 selection_click (MEvent.clicks, ev.x, ev.y);
1777 } 1937 }
1778 1938
1779 MEvent.button = Button1; 1939 MEvent.button = Button1;
1780 break; 1940 break;
1781 1941
1782 case Button3: 1942 case Button3:
1783 if (MEvent.button == Button3 && clickintime) 1943 if (MEvent.button == Button3 && clickintime)
1784 selection_rotate (ev.x, ev.y); 1944 selection_rotate (ev.x, ev.y);
1785 else 1945 else
1786 selection_extend (ev.x, ev.y, 1); 1946 selection_extend (ev.x, ev.y, 1);
1787 1947
1788 MEvent.button = Button3; 1948 MEvent.button = Button3;
1789 break; 1949 break;
1790 } 1950 }
1791 } 1951 }
1792 1952
1793 MEvent.time = ev.time; 1953 MEvent.time = ev.time;
1794 return; 1954 return;
1795 } 1955 }
1796 1956
… …
1908 case Button3: 2068 case Button3:
1909 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
1910 { 2070 {
1911 if (scrollbar_above_slider (ev.y)) 2071 if (scrollbar_above_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
1913 scr_page (UP, TermWin.nrow - 1); 2073 scr_page (UP, nrow - 1);
1914# else 2074# else
1915 scr_page (UP, TermWin.nrow / 4); 2075 scr_page (UP, nrow / 4);
1916# endif 2076# endif
1917 else if (scrollbar_below_slider (ev.y)) 2077 else if (scrollbar_below_slider (ev.y))
1918# ifdef RXVT_SCROLL_FULL 2078# ifdef RXVT_SCROLL_FULL
1919 scr_page (DN, TermWin.nrow - 1); 2079 scr_page (DN, nrow - 1);
1920# else 2080# else
1921 scr_page (DN, TermWin.nrow / 4); 2081 scr_page (DN, nrow / 4);
1922# endif 2082# endif
1923 else 2083 else
1924 scrollBar.setMotion (); 2084 scrollBar.setMotion ();
1925 } 2085 }
1926 else 2086 else
1927 { 2087 {
1928 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
1929 (TermWin.nrow 2089 (nrow
1930 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
1931 / scrollbar_size ())); 2091 / scrollbar_size ()));
1932 } 2092 }
1933 2093
1934 break; 2094 break;
1935 } 2095 }
1936 } 2096 }
2097
1937 return; 2098 return;
1938 } 2099 }
2100
1939#if MENUBAR 2101#if MENUBAR
1940 /* 2102 /*
1941 * Menubar window processing of button press 2103 * Menubar window processing of button press
1942 */ 2104 */
1943 if (isMenuBarWindow (ev.window)) 2105 if (isMenuBarWindow (ev.window))
… …
1966#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
1967 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
1969#endif 2131#endif
1970 2132
1971 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1972 { 2134 {
1973#if ISO_14755 2135#if ISO_14755
1974 // 5.4 2136 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return; 2138 return;
… …
2006 if (priv_modes & PrivMode_mouse_report 2168 if (priv_modes & PrivMode_mouse_report
2007 && bypass_keystate 2169 && bypass_keystate
2008 && ev.button == Button1 && MEvent.clicks <= 1) 2170 && ev.button == Button1 && MEvent.clicks <= 1)
2009 selection_extend (ev.x, ev.y, 0); 2171 selection_extend (ev.x, ev.y, 0);
2010 2172
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2011 switch (ev.button) 2176 switch (ev.button)
2012 { 2177 {
2013 case Button1: 2178 case Button1:
2014 case Button3: 2179 case Button3:
2015 selection_make (ev.time); 2180 selection_make (ev.time);
… …
2026 2191
2027 v = ev.button == Button4 ? UP : DN; 2192 v = ev.button == Button4 ? UP : DN;
2028 2193
2029 if (ev.state & ShiftMask) 2194 if (ev.state & ShiftMask)
2030 i = 1; 2195 i = 1;
2031 else if (options & Opt_mouseWheelScrollPage) 2196 else if (OPTION (Opt_mouseWheelScrollPage))
2032 i = TermWin.nrow - 1; 2197 i = nrow - 1;
2033 else 2198 else
2034 i = 5; 2199 i = 5;
2035 2200
2036# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2037 if (ev.state & ControlMask) 2202 if (ev.state & ControlMask)
2038 { 2203 {
2039 mouse_slip_wheel_speed += v ? -1 : 1; 2204 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2205 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2206 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042 2207
2043 if (slip_wheel_ev.at < NOW) 2208 if (slip_wheel_ev.at < NOW)
2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2209 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045 2210
2046 slip_wheel_ev.start (); 2211 slip_wheel_ev.start ();
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2255 int i;
2091 2256
2092 Visual* visual = display->visual; 2257 Visual *visual = display->visual;
2093 2258
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2260
2096 /* for convenience */ 2261 /* for convenience */
2097 mask_r = visual->red_mask; 2262 mask_r = visual->red_mask;
… …
2318 Atom atype; 2483 Atom atype;
2319 unsigned char *prop = NULL; 2484 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2485 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2486 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2487 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2323 2489
2324 pchanged = 0; 2490 pchanged = 0;
2325 2491
2326 if (!(options & Opt_transparent)) 2492 if (!OPTION (Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2493 return pchanged; /* Don't try any more */
2328 2494
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2495 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2496 rootdepth = wrootattr.depth;
2331 2497
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2498 XGetWindowAttributes (disp, parent[0], &wattr);
2333 2499
2334 if (rootdepth != wattr.depth) 2500 if (rootdepth != wattr.depth)
2335 { 2501 {
2336 if (am_transparent) 2502 if (am_transparent)
2337 { 2503 {
2338 pchanged = 1; 2504 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2506 am_transparent = am_pixmap_trans = 0;
2341 } 2507 }
2342 2508
2343 return pchanged; /* Don't try any more */ 2509 return pchanged; /* Don't try any more */
2344 } 2510 }
2345 2511
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2512 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2513 XSync (disp, False);
2348 2514
2349 /* 2515 /*
2350 * Make the frame window set by the window manager have 2516 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2517 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2518 * windows for each client, so we have to take care about that.
2353 */ 2519 */
2354 i = (xa[XA_XROOTPMAPID] 2520 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2523 &nitems, &bytes_after, &prop) == Success);
2358 2524
2359 if (!i || prop == NULL) 2525 if (!i || prop == NULL)
2360 i = (xa[XA_XSETROOTID] 2526 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2529 &nitems, &bytes_after, &prop) == Success);
2364 2530
2365 if (!i || prop == NULL 2531 if (!i || prop == NULL
2366#if TINTING 2532#if TINTING
… …
2385 Window cr; 2551 Window cr;
2386 XImage *image; 2552 XImage *image;
2387 GC gc; 2553 GC gc;
2388 XGCValues gcvalue; 2554 XGCValues gcvalue;
2389 2555
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2556 XTranslateCoordinates (disp, parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2557 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2558 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2559 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2560 nx = ny = 0;
2395 2561
… …
2405 nh += sy; 2571 nh += sy;
2406 ny = -sy; 2572 ny = -sy;
2407 sy = 0; 2573 sy = 0;
2408 } 2574 }
2409 2575
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2576 min_it (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2577 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578
2579 XSync (disp, False);
2412 allowedxerror = -1; 2580 allowedxerror = -1;
2413 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414 2582
2415 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2416 /* XXX: may need a delay here? */ 2584 /* XXX: may need a delay here? */
2417 allowedxerror = 0; 2585 allowedxerror = 0;
2418 2586
2419 if (image == NULL) 2587 if (image == NULL)
2420 { 2588 {
2421 if (am_transparent && am_pixmap_trans) 2589 if (am_transparent && am_pixmap_trans)
2422 { 2590 {
2423 pchanged = 1; 2591 pchanged = 1;
2424 if (TermWin.pixmap != None) 2592 if (pixmap != None)
2425 { 2593 {
2426 XFreePixmap (display->display, TermWin.pixmap); 2594 XFreePixmap (disp, pixmap);
2427 TermWin.pixmap = None; 2595 pixmap = None;
2428 } 2596 }
2429 } 2597 }
2430 2598
2431 am_pixmap_trans = 0; 2599 am_pixmap_trans = 0;
2432 } 2600 }
2433 else 2601 else
2434 { 2602 {
2435 if (TermWin.pixmap != None) 2603 if (pixmap != None)
2436 XFreePixmap (display->display, TermWin.pixmap); 2604 XFreePixmap (disp, pixmap);
2437 2605
2438#if TINTING 2606#if TINTING
2439 if (ISSET_PIXCOLOR (Color_tint)) 2607 if (ISSET_PIXCOLOR (Color_tint))
2440 { 2608 {
2441 unsigned short rm, gm, bm; 2609 unsigned short rm, gm, bm;
… …
2445 2613
2446 ShadeXImage (display, image, shade, rm, gm, bm); 2614 ShadeXImage (display, image, shade, rm, gm, bm);
2447 } 2615 }
2448#endif 2616#endif
2449 2617
2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2618 pixmap = XCreatePixmap (disp, vt,
2451 szHint.width, szHint.height, image->depth); 2619 szHint.width, szHint.height, image->depth);
2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2621 XPutImage (disp, pixmap, gc, image, 0, 0,
2454 nx, ny, image->width, image->height); 2622 nx, ny, image->width, image->height);
2455 XFreeGC (display->display, gc); 2623 XFreeGC (disp, gc);
2456 XDestroyImage (image); 2624 XDestroyImage (image);
2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2458 XClearWindow (display->display, TermWin.parent[0]); 2626 XClearWindow (disp, parent[0]);
2459 2627
2460 if (!am_transparent || !am_pixmap_trans) 2628 if (!am_transparent || !am_pixmap_trans)
2461 pchanged = 1; 2629 pchanged = 1;
2462 2630
2463 am_transparent = am_pixmap_trans = 1; 2631 am_transparent = am_pixmap_trans = 1;
2464 } 2632 }
2465 } 2633 }
2466 2634
2467 if (!am_pixmap_trans) 2635 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2637 else
2468 { 2638 {
2469 unsigned int n; 2639 unsigned int n;
2470 /* 2640 /*
2471 * InheritPixmap transparency 2641 * InheritPixmap transparency
2472 */ 2642 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2644 {
2475 oldp = TermWin.parent[i]; 2645 oldp = parent[i];
2476 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2646 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2647 &parent[i], &list, &n);
2478 XFree (list); 2648 XFree (list);
2479 2649
2480 if (TermWin.parent[i] == display->root) 2650 if (parent[i] == display->root)
2481 { 2651 {
2482 if (oldp != None) 2652 if (oldp != None)
2483 pchanged = 1; 2653 pchanged = 1;
2484 2654
2485 break; 2655 break;
2486 } 2656 }
2487 2657
2488 if (oldp != TermWin.parent[i]) 2658 if (oldp != parent[i])
2489 pchanged = 1; 2659 pchanged = 1;
2490 } 2660 }
2491 2661
2492 n = 0; 2662 n = 0;
2493 2663
2494 if (pchanged) 2664 if (pchanged)
2495 { 2665 {
2496 for (; n < (unsigned int)i; n++) 2666 for (; n < (unsigned int)i; n++)
2497 { 2667 {
2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2668 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2670 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2672 break;
2503 } 2673 }
2504 } 2674 }
2505 } 2675 }
2506 2676
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2677 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2678 {
2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2681 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2682 /* XXX: also turn off Opt_transparent? */
2513 } 2683 }
2514 else 2684 else
2515 { 2685 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2688 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2689 sleep (1);
2520#endif 2690#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2691 for (n = 0; n < (unsigned int)i; n++)
2522 { 2692 {
2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (display->display, TermWin.parent[n]); 2694 XClearWindow (disp, parent[n]);
2525 } 2695 }
2526 2696
2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2698 am_transparent = 1;
2529 } 2699 }
2530 2700
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2702 parent[i] = None;
2533 } 2703 }
2534 2704
2535 if (scrollBar.win) 2705 if (scrollBar.win)
2536 { 2706 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle (); 2708 scrollBar.setIdle ();
2539 scrollbar_show (0); 2709 scrollbar_show (0);
2540 } 2710 }
2541 2711
2712 if (am_transparent)
2713 {
2714 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans)
2716 flush ();
2717 }
2718
2542 return pchanged; 2719 return pchanged;
2543} 2720}
2544#endif 2721#endif
2545 2722
2546/*}}} */ 2723/*}}} */
… …
2548bool 2725bool
2549rxvt_term::cmd_parse () 2726rxvt_term::cmd_parse ()
2550{ 2727{
2551 bool flag = false; 2728 bool flag = false;
2552 unicode_t ch = NOCHAR; 2729 unicode_t ch = NOCHAR;
2553 unsigned char *seq_begin; // remember start of esc-sequence here 2730 char *seq_begin; // remember start of esc-sequence here
2554 2731
2555 for (;;) 2732 for (;;)
2556 { 2733 {
2557 if (ch == NOCHAR) 2734 if (ch == NOCHAR)
2558 { 2735 {
2559 seq_begin = cmdbuf_ptr; 2736 seq_begin = cmdbuf_ptr;
2560 ch = next_char (); 2737 ch = next_char ();
2561 }
2562 2738
2563 if (ch == NOCHAR) // TODO: improve 2739 if (ch == NOCHAR)
2564 break; 2740 break;
2741 }
2565 2742
2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2743 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2567 { 2744 {
2568 if (!seen_input) 2745 if (!seen_input)
2569 { 2746 {
… …
2573 // some window managers resize the window early, and these programs 2750 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong. 2751 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike 2752 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being 2753 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized. 2754 // resized.
2578 if (seen_resize) 2755 if (seen_resize && cmd_pid)
2579 kill (-cmd_pid, SIGWINCH); 2756 kill (-cmd_pid, SIGWINCH);
2580 } 2757 }
2581 2758
2582 /* Read a text string from the input buffer */ 2759 /* Read a text string from the input buffer */
2583 unicode_t buf[UBUFSIZ]; 2760 unicode_t buf[UBUFSIZ];
2584 bool refreshnow = false; 2761 bool refreshnow = false;
2585 int nlines = 0; 2762 int nlines = 0;
2586 unicode_t *str = buf; 2763 unicode_t *str = buf;
2764 unicode_t *eol = str + min (ncol, UBUFSIZ);
2587 2765
2588 for (;;) 2766 for (;;)
2589 { 2767 {
2590 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2591 break; 2769 break;
2592 2770
2593 *str++ = ch; 2771 *str++ = ch;
2594 2772
2595 if (ch == C0_LF) 2773 if (ch == C0_LF || str >= eol)
2596 { 2774 {
2775 if (ch == C0_LF)
2597 nlines++; 2776 nlines++;
2777
2598 refresh_count++; 2778 refresh_count++;
2599 2779
2600 if (!(options & Opt_jumpScroll) 2780 if (!OPTION (Opt_jumpScroll)
2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2781 || (refresh_count >= refresh_limit * (nrow - 1)))
2602 { 2782 {
2603 refreshnow = true; 2783 refreshnow = true;
2784 refresh_count = 0;
2604 ch = NOCHAR; 2785 ch = NOCHAR;
2605 break; 2786 break;
2606 } 2787 }
2607 2788
2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2789 // scr_add_lines only works for nlines <= nrow - 1.
2609 if (nlines >= TermWin.nrow - 1) 2790 if (nlines >= nrow - 1)
2610 { 2791 {
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2611 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, nlines, str - buf);
2794
2612 nlines = 0; 2795 nlines = 0;
2613 str = buf; 2796 str = buf;
2797 eol = str + min (ncol, UBUFSIZ);
2614 } 2798 }
2615 }
2616 2799
2617 if (str >= buf + UBUFSIZ) 2800 if (str >= eol)
2618 { 2801 {
2802 if (eol >= buf + UBUFSIZ)
2803 {
2619 ch = NOCHAR; 2804 ch = NOCHAR;
2620 break; 2805 break;
2806 }
2807 else
2808 eol = min (eol + ncol, buf + UBUFSIZ);
2809 }
2810
2621 } 2811 }
2622 2812
2623 seq_begin = cmdbuf_ptr; 2813 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2814 ch = next_char ();
2625 } 2815 }
2626 2816
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2627 scr_add_lines (buf, nlines, str - buf); 2818 scr_add_lines (buf, nlines, str - buf);
2628 2819
2629 /* 2820 /*
2630 * If there have been a lot of new lines, then update the screen 2821 * If there have been a lot of new lines, then update the screen
2631 * What the heck I'll cheat and only refresh less than every page-full. 2822 * What the heck I'll cheat and only refresh less than every page-full.
2632 * the number of pages between refreshes is refresh_limit, which 2823 * the number of pages between refreshes is refresh_limit, which
2633 * is incremented here because we must be doing flat-out scrolling. 2824 * is incremented here because we must be doing flat-out scrolling.
2634 */ 2825 */
2635 if (refreshnow) 2826 if (refreshnow)
2636 { 2827 {
2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2638 refresh_limit++; 2829 refresh_limit++;
2639 else 2830 else
2640 { 2831 {
2641 flag = true; 2832 flag = true;
2642 scr_refresh (refresh_type); 2833 scr_refresh (refresh_type);
2834 flush_ev.stop ();
2643 } 2835 }
2644 } 2836 }
2645 2837
2646 } 2838 }
2647 else 2839 else
… …
2678rxvt_term::next_char () 2870rxvt_term::next_char ()
2679{ 2871{
2680 while (cmdbuf_ptr < cmdbuf_endp) 2872 while (cmdbuf_ptr < cmdbuf_endp)
2681 { 2873 {
2682 // assume 7-bit to be ascii ALWAYS 2874 // assume 7-bit to be ascii ALWAYS
2683 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2875 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2684 return *cmdbuf_ptr++; 2876 return *cmdbuf_ptr++;
2685 2877
2686 wchar_t wc; 2878 wchar_t wc;
2687 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2879 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2688 2880
2689 if (len == (size_t)-2) 2881 if (len == (size_t)-2)
2690 { 2882 {
2691 // the mbstate stores incomplete sequences. didn't know this :/ 2883 // the mbstate stores incomplete sequences. didn't know this :/
2692 cmdbuf_ptr = cmdbuf_endp; 2884 cmdbuf_ptr = cmdbuf_endp;
… …
2696 if (len == (size_t)-1) 2888 if (len == (size_t)-1)
2697 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2698 2890
2699 // assume wchar == unicode 2891 // assume wchar == unicode
2700 cmdbuf_ptr += len; 2892 cmdbuf_ptr += len;
2701 return wc; 2893 return wc & UNICODE_MASK;
2702 } 2894 }
2703 2895
2704 return NOCHAR; 2896 return NOCHAR;
2705} 2897}
2706 2898
… …
2831 case C0_ESC: 3023 case C0_ESC:
2832 process_escape_seq (); 3024 process_escape_seq ();
2833 break; 3025 break;
2834 case C0_ENQ: /* terminal Status */ 3026 case C0_ENQ: /* terminal Status */
2835 if (rs[Rs_answerbackstring]) 3027 if (rs[Rs_answerbackstring])
2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3028 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2838 else 3029 else
2839 tt_write ((unsigned char *)VT100_ANS, 3030 tt_write (VT100_ANS, strlen (VT100_ANS));
2840 (unsigned int)strlen (VT100_ANS));
2841 break; 3031 break;
2842 case C0_BEL: /* bell */ 3032 case C0_BEL: /* bell */
2843 scr_bell (); 3033 scr_bell ();
2844 break; 3034 break;
2845 case C0_BS: /* backspace */ 3035 case C0_BS: /* backspace */
… …
3033 process_dcs_seq (); 3223 process_dcs_seq ();
3034 break; 3224 break;
3035 3225
3036 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3226 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3037 case C1_SCI: /* ESC Z */ 3227 case C1_SCI: /* ESC Z */
3038 tt_write ((const unsigned char *)ESCZ_ANSWER, 3228 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3039 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3040 break; /* steal obsolete ESC [ c */ 3229 break; /* steal obsolete ESC [ c */
3041 3230
3042 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3231 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3043 case C1_CSI: /* ESC [ */ 3232 case C1_CSI: /* ESC [ */
3044 process_csi_seq (); 3233 process_csi_seq ();
… …
3169 { 3358 {
3170 switch (priv) 3359 switch (priv)
3171 { 3360 {
3172 case '>': 3361 case '>':
3173 if (ch == CSI_DA) /* secondary device attributes */ 3362 if (ch == CSI_DA) /* secondary device attributes */
3174 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175 break; 3364 break;
3176 case '?': 3365 case '?':
3177 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3178 process_terminal_mode (ch, priv, nargs, arg); 3367 process_terminal_mode (ch, priv, nargs, arg);
3179 break; 3368 break;
… …
3284 3473
3285 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3474 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3286 arg[0] = -arg[0]; 3475 arg[0] = -arg[0];
3287 /* FALLTHROUGH */ 3476 /* FALLTHROUGH */
3288 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3477 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3478 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3290 break; 3479 break;
3291 3480
3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3481 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3293 tt_write ((const unsigned char *)VT100_ANS, 3482 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3294 (unsigned int) (sizeof (VT100_ANS) - 1));
3295 break; 3483 break;
3296 3484
3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3485 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3298 process_sgr_mode (nargs, arg); 3486 process_sgr_mode (nargs, arg);
3299 break; 3487 break;
… …
3306 break; 3494 break;
3307 case 6: /* CPR requested */ 3495 case 6: /* CPR requested */
3308 scr_report_position (); 3496 scr_report_position ();
3309 break; 3497 break;
3310 case 7: /* unofficial extension */ 3498 case 7: /* unofficial extension */
3311 if (options & Opt_insecure) 3499 if (OPTION (Opt_insecure))
3312 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3500 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3313 break; 3501 break;
3314 case 8: /* unofficial extension */ 3502 case 8: /* unofficial extension */
3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3316 break; 3504 break;
… …
3408rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3596rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409{ 3597{
3410 int x, y; 3598 int x, y;
3411 XWindowAttributes wattr; 3599 XWindowAttributes wattr;
3412 Window wdummy; 3600 Window wdummy;
3601 dDisp;
3413 3602
3414 if (nargs == 0) 3603 if (nargs == 0)
3415 return; 3604 return;
3416 3605
3417 switch (args[0]) 3606 switch (args[0])
3418 { 3607 {
3419 /* 3608 /*
3420 * commands 3609 * commands
3421 */ 3610 */
3422 case 1: /* deiconify window */ 3611 case 1: /* deiconify window */
3423 XMapWindow (display->display, TermWin.parent[0]); 3612 XMapWindow (disp, parent[0]);
3424 break; 3613 break;
3425 case 2: /* iconify window */ 3614 case 2: /* iconify window */
3426 XIconifyWindow (display->display, TermWin.parent[0], 3615 XIconifyWindow (disp, parent[0], display->screen);
3427 DefaultScreen (display->display));
3428 break; 3616 break;
3429 case 3: /* set position (pixels) */ 3617 case 3: /* set position (pixels) */
3430 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3618 XMoveWindow (disp, parent[0], args[1], args[2]);
3431 break; 3619 break;
3432 case 4: /* set size (pixels) */ 3620 case 4: /* set size (pixels) */
3433 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434 break; 3622 break;
3435 case 5: /* raise window */ 3623 case 5: /* raise window */
3436 XRaiseWindow (display->display, TermWin.parent[0]); 3624 XRaiseWindow (disp, parent[0]);
3437 break; 3625 break;
3438 case 6: /* lower window */ 3626 case 6: /* lower window */
3439 XLowerWindow (display->display, TermWin.parent[0]); 3627 XLowerWindow (disp, parent[0]);
3440 break; 3628 break;
3441 case 7: /* refresh window */ 3629 case 7: /* refresh window */
3442 scr_touch (true); 3630 scr_touch (true);
3443 break; 3631 break;
3444 case 8: /* set size (chars) */ 3632 case 8: /* set size (chars) */
3445 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3633 set_widthheight ((unsigned int) (args[2] * fwidth),
3446 (unsigned int) (args[1] * TermWin.fheight)); 3634 (unsigned int) (args[1] * fheight));
3447 break; 3635 break;
3448 3636
3449 //case 9: NYI, TODO, restore maximized window or maximize window 3637 //case 9: NYI, TODO, restore maximized window or maximize window
3450 default: 3638 default:
3451 if (args[0] >= 24) /* set height (chars) */ 3639 if (args[0] >= 24) /* set height (chars) */
3452 set_widthheight ((unsigned int)TermWin.width, 3640 set_widthheight ((unsigned int)width,
3453 (unsigned int) (args[1] * TermWin.fheight)); 3641 (unsigned int) (args[1] * fheight));
3454 break; 3642 break;
3455 3643
3456 3644
3457 /* 3645 /*
3458 * reports - some output format copied from XTerm 3646 * reports - some output format copied from XTerm
3459 */ 3647 */
3460 case 11: /* report window state */ 3648 case 11: /* report window state */
3461 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3649 XGetWindowAttributes (disp, parent[0], &wattr);
3462 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463 break; 3651 break;
3464 case 13: /* report window position */ 3652 case 13: /* report window position */
3465 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
3466 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3654 XTranslateCoordinates (disp, parent[0], wattr.root,
3467 -wattr.border_width, -wattr.border_width, 3655 -wattr.border_width, -wattr.border_width,
3468 &x, &y, &wdummy); 3656 &x, &y, &wdummy);
3469 tt_printf ("\033[3;%d;%dt", x, y); 3657 tt_printf ("\033[3;%d;%dt", x, y);
3470 break; 3658 break;
3471 case 14: /* report window size (pixels) */ 3659 case 14: /* report window size (pixels) */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3660 XGetWindowAttributes (disp, parent[0], &wattr);
3473 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474 break; 3662 break;
3475 case 18: /* report text area size (chars) */ 3663 case 18: /* report text area size (chars) */
3476 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3664 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3477 break; 3665 break;
3478 case 19: /* report window size (chars) */ 3666 case 19: /* report window size (chars) */
3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3667 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3480 break; 3668 break;
3481 case 20: /* report icon label */ 3669 case 20: /* report icon label */
3482 { 3670 {
3483 char *s; 3671 char *s;
3484 XGetIconName (display->display, TermWin.parent[0], &s); 3672 XGetIconName (disp, parent[0], &s);
3485 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3486 XFree (s); 3674 XFree (s);
3487 } 3675 }
3488 break; 3676 break;
3489 case 21: /* report window title */ 3677 case 21: /* report window title */
3490 { 3678 {
3491 char *s; 3679 char *s;
3492 XFetchName (display->display, TermWin.parent[0], &s); 3680 XFetchName (disp, parent[0], &s);
3493 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3682 XFree (s);
3495 } 3683 }
3496 break; 3684 break;
3497 } 3685 }
3498} 3686}
… …
3501/*----------------------------------------------------------------------*/ 3689/*----------------------------------------------------------------------*/
3502/* 3690/*
3503 * get input up until STRING TERMINATOR (or BEL) 3691 * get input up until STRING TERMINATOR (or BEL)
3504 * ends_how is terminator used. returned input must be free()'d 3692 * ends_how is terminator used. returned input must be free()'d
3505 */ 3693 */
3506unsigned char * 3694char *
3507rxvt_term::get_to_st (unicode_t &ends_how) 3695rxvt_term::get_to_st (unicode_t &ends_how)
3508{ 3696{
3509 unicode_t seen_esc = 0, ch; 3697 unicode_t ch;
3698 bool seen_esc = false;
3510 unsigned int n = 0; 3699 unsigned int n = 0;
3511 unsigned char *s;
3512 unsigned char string[STRING_MAX]; 3700 wchar_t string[STRING_MAX];
3513 3701
3514 while ((ch = cmd_getc ()) != NOCHAR) 3702 while ((ch = cmd_getc ()) != NOCHAR)
3515 { 3703 {
3516 if (seen_esc) 3704 if (seen_esc)
3517 { 3705 {
… …
3520 else 3708 else
3521 return NULL; 3709 return NULL;
3522 } 3710 }
3523 else if (ch == C0_ESC) 3711 else if (ch == C0_ESC)
3524 { 3712 {
3525 seen_esc = 1; 3713 seen_esc = true;
3526 continue; 3714 continue;
3527 } 3715 }
3528 else if (ch == C0_BEL || ch == CHAR_ST) 3716 else if (ch == C0_BEL || ch == CHAR_ST)
3529 break; 3717 break;
3530 else if (ch < 0x20) 3718 else if (ch < 0x20)
3531 return NULL; /* other control character - exit */ 3719 return NULL; /* other control character - exit */
3532 3720
3533 seen_esc = 0; 3721 seen_esc = false;
3534 3722
3535 if (n >= sizeof (string) - 1) 3723 if (n >= STRING_MAX - 1)
3536 // stop at some sane length 3724 // stop at some sane length
3537 return NULL; 3725 return NULL;
3538 3726
3539 if (ch == C0_SYN) 3727 if (ch == C0_SYN)
3540 string[n++] = cmd_get8 (); 3728 string[n++] = cmd_get8 ();
… …
3542 string[n++] = ch; 3730 string[n++] = ch;
3543 } 3731 }
3544 3732
3545 string[n++] = '\0'; 3733 string[n++] = '\0';
3546 3734
3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548 return NULL;
3549
3550 ends_how = (ch == 0x5c ? C0_ESC : ch); 3735 ends_how = (ch == 0x5c ? C0_ESC : ch);
3551 strncpy (s, string, n); 3736
3552 return s; 3737 return rxvt_wcstombs (string);
3553} 3738}
3554 3739
3555/*----------------------------------------------------------------------*/ 3740/*----------------------------------------------------------------------*/
3556/* 3741/*
3557 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3742 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3558 */ 3743 */
3559void 3744void
3560rxvt_term::process_dcs_seq () 3745rxvt_term::process_dcs_seq ()
3561{ 3746{
3562 unsigned char *s; 3747 char *s;
3563 unicode_t eh; 3748 unicode_t eh;
3564 3749
3565 /* 3750 /*
3566 * Not handled yet 3751 * Not handled yet
3567 */ 3752 */
… …
3586 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3771 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3587 arg = arg * 10 + (ch - '0'); 3772 arg = arg * 10 + (ch - '0');
3588 3773
3589 if (ch == ';') 3774 if (ch == ';')
3590 { 3775 {
3591 unsigned char *s = get_to_st (eh); 3776 char *s = get_to_st (eh);
3592 3777
3593 if (s) 3778 if (s)
3594 { 3779 {
3595 process_xterm_seq (arg, (char *)s, eh); 3780 process_xterm_seq (arg, s, eh);
3596 free (s); 3781 free (s);
3597 } 3782 }
3598 } 3783 }
3599} 3784}
3600 3785
3601void 3786void
3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3603{ 3788{
3604 if (str[0] == '?' && !str[1]) 3789 if (str[0] == '?' && !str[1])
3605 { 3790 {
3606 unsigned short r, g, b; 3791 unsigned short r, g, b;
3607 pix_colors_focused[color].get (display, r, g, b); 3792 pix_colors_focused[color].get (display, r, g, b);
… …
3611 set_window_color (color, str); 3796 set_window_color (color, str);
3612} 3797}
3613 3798
3614/* 3799/*
3615 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3616 * 0 = change iconName/title
3617 * 1 = change iconName
3618 * 2 = change title
3619 * 4 = change color
3620 * 10 = change fg color
3621 * 11 = change bg color
3622 * 12 = change text color
3623 * 13 = change mouse foreground color
3624 * 17 = change highlight character colour
3625 * 18 = change bold character color
3626 * 19 = change underlined character color
3627 * 46 = change logfile (not implemented)
3628 * 50 = change font
3629 *
3630 * rxvt extensions:
3631 * 20 = bg pixmap
3632 * 39 = change default fg color
3633 * 49 = change default bg color
3634 * 55 = dump scrollback buffer and all of screen
3635 * 701 = change locale
3636 * 702 = find font
3637 * 703 = menu
3638 */ 3801 */
3639void 3802void
3640rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3803rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3641{ 3804{
3642 int changed = 0; 3805 int changed = 0;
3643 int color; 3806 int color;
3644 char *buf, *name; 3807 char *buf, *name;
3645 bool query = str[0] == '?' && !str[1]; 3808 bool query = str[0] == '?' && !str[1];
3646 int saveop = op; 3809 int saveop = op;
3810 dDisp;
3647 3811
3648 assert (str != NULL); 3812 assert (str != NULL);
3649 switch (op) 3813 switch (op)
3650 { 3814 {
3651 case XTerm_name: 3815 case XTerm_name:
… …
3658 set_title (str); 3822 set_title (str);
3659 break; 3823 break;
3660 case XTerm_property: 3824 case XTerm_property:
3661 if (str[0] == '?') 3825 if (str[0] == '?')
3662 { 3826 {
3663 Atom prop = XInternAtom (display->display, str + 1, True); 3827 Atom prop = display->atom (str + 1);
3664 Atom actual_type; 3828 Atom actual_type;
3665 int actual_format; 3829 int actual_format;
3666 unsigned long nitems; 3830 unsigned long nitems;
3667 unsigned long bytes_after; 3831 unsigned long bytes_after;
3668 unsigned char *value = 0; 3832 unsigned char *value = 0;
3669 const char *str = ""; 3833 const char *str = "";
3670 3834
3671 if (prop 3835 if (prop
3672 && XGetWindowProperty (display->display, TermWin.parent[0], 3836 && XGetWindowProperty (disp, parent[0],
3673 prop, 0, 1<<16, 0, AnyPropertyType, 3837 prop, 0, 1<<16, 0, AnyPropertyType,
3674 &actual_type, &actual_format, 3838 &actual_type, &actual_format,
3675 &nitems, &bytes_after, &value) == Success 3839 &nitems, &bytes_after, &value) == Success
3676 && actual_type != None 3840 && actual_type != None
3677 && actual_format == 8) 3841 && actual_format == 8)
… …
3686 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3850 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687 3851
3688 if (eq) 3852 if (eq)
3689 { 3853 {
3690 *eq = 0; 3854 *eq = 0;
3691 XChangeProperty (display->display, TermWin.parent[0], 3855 set_utf8_property (display->atom (str), eq + 1);
3692 display->atom (str), XA_STRING, 8,
3693 PropModeReplace, (unsigned char *)eq + 1,
3694 strlen (eq + 1));
3695 } 3856 }
3696 else 3857 else
3697 XDeleteProperty (display->display, TermWin.parent[0], 3858 XDeleteProperty (disp, parent[0],
3698 display->atom (str)); 3859 display->atom (str));
3699 } 3860 }
3700 break; 3861 break;
3701 3862
3702 case XTerm_Color: 3863 case XTerm_Color:
… …
3743 break; 3904 break;
3744#ifndef NO_BOLD_UNDERLINE_REVERSE 3905#ifndef NO_BOLD_UNDERLINE_REVERSE
3745 case XTerm_Color_BD: 3906 case XTerm_Color_BD:
3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747 break; 3908 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750 break;
3751 case XTerm_Color_UL: 3909 case XTerm_Color_UL:
3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3753 break; 3911 break;
3754 case XTerm_Color_RV: 3912 case XTerm_Color_RV:
3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756 break; 3914 break;
3915 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917 break;
3757#endif 3918#endif
3758#if TRANSPARENT || TINTING 3919#if TRANSPARENT && TINTING
3759 case XTerm_Color_tint: 3920 case URxvt_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3761 check_our_parents (); 3922 check_our_parents ();
3762 if (am_transparent) 3923 if (am_transparent)
3763 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3764 break; 3925 break;
3765#endif 3926#endif
… …
3777 { 3938 {
3778 str++; 3939 str++;
3779#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3780 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
3781#endif 3942#endif
3782
3783 } 3943 }
3944
3784 if (changed) 3945 if (changed)
3785 { 3946 {
3786#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3787 resize_pixmap (); 3948 resize_pixmap ();
3788#endif 3949#endif
… …
3799 3960
3800 case XTerm_logfile: 3961 case XTerm_logfile:
3801 // TODO, when secure mode? 3962 // TODO, when secure mode?
3802 break; 3963 break;
3803 3964
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0
3972 case XTerm_dumpscreen: /* no error notices */
3973 {
3974 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 {
3977 scr_dump (fd);
3978 close (fd);
3979 }
3980 }
3981 break;
3982#endif
3804 case XTerm_font: 3983 case XTerm_font:
3805 op = URxvt_font; 3984 op = URxvt_font;
3806 case URxvt_font: 3985 case URxvt_font:
3807#if ENABLE_STYLES 3986#if ENABLE_STYLES
3808 case URxvt_boldFont: 3987 case URxvt_boldFont:
3809 case URxvt_italicFont: 3988 case URxvt_italicFont:
3810 case URxvt_boldItalicFont: 3989 case URxvt_boldItalicFont:
3811#endif 3990#endif
3812 if (query) 3991 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop, 3992 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3994 ? fontset[op - URxvt_font]->fontdesc : "",
3816 resp); 3995 resp);
3817 else 3996 else
3818 { 3997 {
3819 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3998 const char *&res = rs[Rs_font + (op - URxvt_font)];
3820 3999
… …
3823 set_fonts (); 4002 set_fonts ();
3824 } 4003 }
3825 break; 4004 break;
3826 4005
3827#if ENABLE_FRILLS 4006#if ENABLE_FRILLS
3828 case XTerm_locale: 4007 case URxvt_locale:
3829 if (query) 4008 if (query)
3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3831 else 4010 else
3832 { 4011 {
3833 set_locale (str); 4012 set_locale (str);
3834# ifdef USE_XIM 4013 pty.set_utf8_mode (enc_utf8);
3835 im_cb (); 4014 init_xlocale ();
3836# endif
3837 } 4015 }
3838 break; 4016 break;
3839#endif
3840 4017
3841#ifdef MENUBAR 4018 case URxvt_view_up:
3842 case XTerm_Menu: 4019 case URxvt_view_down:
3843 if (options & Opt_insecure) 4020 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4021 int lines = atoi (str);
4022
4023 if (lines)
4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
4025 else
4026 scr_erase_savelines ();
4027 }
4028
3845 break; 4029 break;
3846#endif 4030#endif
3847#if 0 4031
3848 case XTerm_dumpscreen: /* no error notices */ 4032#if ENABLE_PERL
3849 { 4033 case URxvt_perl:
3850 int fd; 4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4035 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 4036 break;
3858#endif 4037#endif
3859 } 4038 }
3860} 4039}
3861/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
… …
3970 } 4149 }
3971 4150
3972 /* extra handling for values with state unkept */ 4151 /* extra handling for values with state unkept */
3973 switch (arg[i]) 4152 switch (arg[i])
3974 { 4153 {
4154#if ENABLE_STYLES
4155 case 1021:
4156 if (mode)
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160
4161 scr_touch (true);
4162 break;
4163#endif
3975 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
3976 case 1049: 4165 case 1049:
3977 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
3978 if (mode == 0) 4167 if (mode == 0)
3979 scr_cursor (RESTORE); 4168 scr_cursor (RESTORE);
3980 else if (mode == 1) 4169 else if (mode == 1)
3981 scr_cursor (SAVE); 4170 scr_cursor (SAVE);
3982 break; 4171 break;
… …
3994 */ 4183 */
3995 PrivMode (1, PrivMode_vt52); 4184 PrivMode (1, PrivMode_vt52);
3996 break; 4185 break;
3997 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 4189 break;
4001 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
4002 if (state) 4191 if (!state)
4003 options &= ~Opt_jumpScroll; 4192 SET_OPTION (Opt_jumpScroll);
4004 else 4193 else
4005 options |= Opt_jumpScroll; 4194 CLR_OPTION (Opt_jumpScroll);
4006 break; 4195 break;
4007 case 5: /* reverse video */ 4196 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 4197 scr_rvideo_mode (state);
4009 break; 4198 break;
4010 case 6: /* relative/absolute origins */ 4199 case 6: /* relative/absolute origins */
… …
4051#if 0 4240#if 0
4052 case 1001: 4241 case 1001:
4053 break; /* X11 mouse highlighting */ 4242 break; /* X11 mouse highlighting */
4054#endif 4243#endif
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 4244 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state) 4245 if (!state)
4057 options &= ~Opt_scrollTtyOutput; 4246 SET_OPTION (Opt_scrollTtyOutput);
4058 else 4247 else
4059 options |= Opt_scrollTtyOutput; 4248 CLR_OPTION (Opt_scrollTtyOutput);
4060 break; 4249 break;
4061 case 1011: /* scroll to bottom on key press */ 4250 case 1011: /* scroll to bottom on key press */
4062 if (state) 4251 if (state)
4063 options |= Opt_scrollTtyKeypress; 4252 SET_OPTION (Opt_scrollTtyKeypress);
4064 else 4253 else
4065 options &= ~Opt_scrollTtyKeypress; 4254 CLR_OPTION (Opt_scrollTtyKeypress);
4066 break; 4255 break;
4067 case 1047: /* secondary screen w/ clearing last */ 4256 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 4257 if (OPTION (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 4258 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 4259 scr_erase_screen (2);
4071 scr_change_screen (state); 4260 scr_change_screen (state);
4072 break; 4261 break;
4073 case 1049: /* secondary screen w/ clearing first */ 4262 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 4263 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 4264 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4265 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4266 scr_erase_screen (2);
4078 break; 4267 break;
4079 default: 4268 default:
4080 break; 4269 break;
… …
4208 scr_color (Color_bg, Color_bg); 4397 scr_color (Color_bg, Color_bg);
4209 break; 4398 break;
4210 4399
4211 //case 50: // not variable spacing 4400 //case 50: // not variable spacing
4212 4401
4213#ifndef NO_BRIGHTCOLOR 4402#if ENABLE_FRILLS
4214 case 90: 4403 case 90:
4215 case 91: /* set bright fg color */ 4404 case 91: /* set bright fg color */
4216 case 92: 4405 case 92:
4217 case 93: 4406 case 93:
4218 case 94: 4407 case 94:
… …
4230 case 106: 4419 case 106:
4231 case 107: 4420 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4421 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 4422 break;
4234#endif 4423#endif
4235
4236 } 4424 }
4237 } 4425 }
4238} 4426}
4239/*}}} */ 4427/*}}} */
4240 4428
… …
4264 */ 4452 */
4265void 4453void
4266rxvt_term::tt_printf (const char *fmt,...) 4454rxvt_term::tt_printf (const char *fmt,...)
4267{ 4455{
4268 va_list arg_ptr; 4456 va_list arg_ptr;
4269 unsigned char buf[256]; 4457 char buf[256];
4270 4458
4271 va_start (arg_ptr, fmt); 4459 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4460 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 4461 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 4462 tt_write (buf, strlen (buf));
… …
4276 4464
4277/* ---------------------------------------------------------------------- */ 4465/* ---------------------------------------------------------------------- */
4278/* Write data to the pty as typed by the user, pasted with the mouse, 4466/* Write data to the pty as typed by the user, pasted with the mouse,
4279 * or generated by us in response to a query ESC sequence. 4467 * or generated by us in response to a query ESC sequence.
4280 */ 4468 */
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470
4281void 4471void
4282rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4472rxvt_term::tt_write (const char *data, unsigned int len)
4283{ 4473{
4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4474 if (pty.pty < 0)
4475 return;
4285 4476
4286 if (len) 4477 if (v_buflen == 0)
4478 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4480
4481 if ((unsigned int)written == len)
4482 return;
4483
4484 data += written;
4485 len -= written;
4287 { 4486 }
4487
4488 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4489
4490 memcpy (v_buffer + v_buflen, data, len);
4491 v_buflen += len;
4492
4493 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494}
4495
4496void rxvt_term::pty_write ()
4497{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499
4500 if (written > 0)
4501 {
4502 v_buflen -= written;
4503
4288 if (v_buflen == 0) 4504 if (v_buflen == 0)
4289 { 4505 {
4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292 if ((unsigned int)written == len)
4293 return;
4294
4295 data += written;
4296 len -= written;
4297 }
4298
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304 }
4305
4306 for (;;)
4307 {
4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310 if (written > 0)
4311 {
4312 v_buflen -= written;
4313
4314 if (v_buflen == 0)
4315 {
4316 free (v_buffer); 4506 free (v_buffer);
4317 v_buffer = 0; 4507 v_buffer = 0;
4318 v_buflen = 0; 4508 v_buflen = 0;
4319 4509
4320 pty_ev.set (EVENT_READ); 4510 pty_ev.set (EVENT_READ);
4321 return;
4322 }
4323
4324 memmove (v_buffer, v_buffer + written, v_buflen);
4325 }
4326 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4327 // original code just ignores this...
4328 destroy ();
4329 else
4330 {
4331 pty_ev.set (EVENT_READ | EVENT_WRITE);
4332 return; 4511 return;
4333 } 4512 }
4513
4514 memmove (v_buffer, v_buffer + written, v_buflen);
4334 } 4515 }
4516 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4517 pty_ev.set (EVENT_READ);
4335} 4518}
4336 4519
4337/*----------------------- end-of-file (C source) -----------------------*/ 4520/*----------------------- end-of-file (C source) -----------------------*/
4338 4521

Diff Legend

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