ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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