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.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.237 by root, Fri Jan 6 01:16:58 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 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
141 break; 160 break;
142 } 161 }
143 162
144 x--; 163 x--;
145 } 164 }
146
147} 165}
148#endif
149 166
150#if ENABLE_OVERLAY
151void 167void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 169{
154 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 173 int len;
158 174
175 fname = rxvt_utf8towcs (f->name);
176
159#if ENABLE_COMBINING 177# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
161 { 179 {
162 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
165 } 183 }
166 else 184 else
167#endif 185# endif
168 { 186 {
169 ch2 = ch; 187 ch2 = ch;
170 188
171 alloc = 0; 189 alloc = 0;
172 chr = &ch2; 190 chr = &ch2;
173 len = 1; 191 len = 1;
174 } 192 }
175 193
176 int width = strlen (f->name); 194 char attr[80]; // plenty
177 195
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
179 218
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 220
182 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
183 { 222 {
… …
186 ch = *chr++; 225 ch = *chr++;
187 226
188 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
191#if !UNICODE3 230# if !UNICODE3
192 if (ch >= 0x10000) 231 if (ch >= 0x10000)
193 ch = 0xfffd; 232 ch = 0xfffd;
194#endif 233# endif
195 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
197 } 236 }
198 237
238 scr_overlay_set (0, len , attr);
199 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
200 240
241 free (fname);
242
201#if ENABLE_COMBINING 243# if ENABLE_COMBINING
202 if (alloc) 244 if (alloc)
203 delete [] alloc; 245 delete [] alloc;
204#endif 246# endif
205} 247}
206#endif 248#endif
207 249
208void 250void
209rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
226 mb[0] = ch[0]; 268 mb[0] = ch[0];
227 len = 1; 269 len = 1;
228 } 270 }
229 271
230 if (len > 0) 272 if (len > 0)
231 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
232 else 274 else
233 scr_bell (); 275 scr_bell ();
234 } 276 }
235 277
236 iso14755buf = 0; 278 iso14755buf = 0;
… …
264 KeySym keysym; 306 KeySym keysym;
265#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
266 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
267#endif 309#endif
268 int valid_keysym; 310 int valid_keysym;
269 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
270 312
271 /* 313 /*
272 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
274 * 316 *
275 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
276 */ 318 */
277 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
280 322
281 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
282 { 324 {
283 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
292 Status status_return; 334 Status status_return;
293 335
294#if 0 336#if 0
295#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
296 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
297 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
298 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
299 else 341 else
300#endif 342#endif
301#endif 343#endif
302 { 344 {
… …
304 346
305 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
309 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
312 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 357 SET_LOCALE (locale);
314 358
315 if (status_return == XLookupChars 359 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
337 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
338 } 382 }
339 else 383 else
340#endif 384#endif
341 { 385 {
342 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
343 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
344 } 388 }
345 389
346 if (valid_keysym) 390 if (valid_keysym)
347 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
348 if (TermWin.saveLines) 397 if (saveLines)
349 { 398 {
350#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 400 if (!ctrl && !meta)
352#else 401#else
353 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
354#endif 403#endif
355 { 404 {
356 int lnsppg; 405 int lnsppg;
357 406
358#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 409#else
361 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
362#endif 411#endif
363 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
364 { 413 {
365 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
366 return; 415 return;
… …
417 { 466 {
418 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
421 return; 470 return;
422#if TODO // TODO 471#if TODO
423 /* rxvt extras */ 472 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 474 change_font (FONT_UP);
426 return; 475 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 535 }
487#endif 536#endif
488 537
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 539 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 540 {
517 newlen = 1; 541 newlen = 1;
518 switch (keysym) 542 switch (keysym)
519 { 543 {
520#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
… …
528 else 552 else
529 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
530 break; 554 break;
531#endif 555#endif
532#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
533 case XK_Delete: 567 case XK_Delete:
534 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
535 break; 569 break;
536#endif 570#endif
537 case XK_Tab: 571 case XK_Tab:
… …
640#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
641 case XK_KP_Begin: 675 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
643 break; 677 break;
644 678
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 679#endif
653 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
… …
688 break; 715 break;
689 716
690 case XK_Find: 717 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
692 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
693 case XK_Insert: 731 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
695 break; 733 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 735 case DXK_Remove:
… …
787#undef FKEY 825#undef FKEY
788 default: 826 default:
789 newlen = 0; 827 newlen = 0;
790 break; 828 break;
791 } 829 }
830
792 if (newlen) 831 if (newlen)
793 len = strlen (kbuf); 832 len = strlen (kbuf);
794 } 833 }
795 834
796 /* 835 /*
… …
805 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
806 { 845 {
807 len = 1; 846 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
810 else 854 else
811 { 855 {
812#ifdef META8_OPTION 856#ifdef META8_OPTION
813 /* set 8-bit on */ 857 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
815 { 859 {
816 unsigned char *ch; 860 char *ch;
817 861
818 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
819 *ch |= 0x80; 863 *ch |= 0x80;
820 864
821 meta = 0; 865 meta = 0;
… …
826 } 870 }
827 871
828 if (len <= 0) 872 if (len <= 0)
829 return; /* not mapped */ 873 return; /* not mapped */
830 874
831 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 876 if (view_start)
833 { 877 {
834 TermWin.view_start = 0; 878 view_start = 0;
835 want_refresh = 1; 879 want_refresh = 1;
836 } 880 }
837 881
838 /* 882 /*
839 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
854#ifdef META8_OPTION 898#ifdef META8_OPTION
855 && meta_char == C0_ESC 899 && meta_char == C0_ESC
856#endif 900#endif
857 ) 901 )
858 { 902 {
859 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
860 tt_write (&ch, 1); 904 tt_write (&ch, 1);
861 } 905 }
862 906
863#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
864 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
872#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
874} 918}
875/*}}} */ 919/*}}} */
876 920
877#if (MENUBAR_MAX) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
880unsigned int 924unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
882{ 926{
883 unsigned int n, s; 927 unsigned int n, s;
884 928
885 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
905 949
906 cmd_parse (); 950 cmd_parse ();
907 951
908 return 0; 952 return 0;
909} 953}
910#endif /* MENUBAR_MAX */ 954#endif
911 955
912void 956void
913rxvt_term::flush () 957rxvt_term::flush ()
914{ 958{
915 flush_ev.stop (); 959 flush_ev.stop ();
… …
923 } 967 }
924#endif 968#endif
925 969
926 if (want_refresh) 970 if (want_refresh)
927 { 971 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
928 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
929 scrollbar_show (1); 1012 scrollbar_show (1);
930#ifdef USE_XIM 1013#ifdef USE_XIM
931 IMSendSpot (); 1014 IMSendSpot ();
932#endif 1015#endif
… …
942 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
943 1026
944 display->flush (); 1027 display->flush ();
945 1028
946 if (want_refresh && !flush_ev.active) 1029 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01); 1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
948} 1031}
949 1032
950void 1033void
951rxvt_term::flush_cb (time_watcher &w) 1034rxvt_term::flush_cb (time_watcher &w)
952{ 1035{
… …
1016{ 1099{
1017 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1103 {
1104 if (view_start == nsaved ||
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0;
1107
1021 refresh_type |= SMOOTH_REFRESH; 1108 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1109 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1111 }
1025} 1112}
1026#endif 1113#endif
1027 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
1028bool 1133bool
1029rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
1030{ 1135{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032 1137
1033 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
1034 { 1139 {
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1036 n = 0; 1141 n = 0;
1037 } 1142 }
1038 1143
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1146 cmdbuf_endp = cmdbuf_ptr + n;
1042 1147
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1044 1149
1045 if (n > 0) 1150 if (r > 0)
1046 { 1151 {
1047 cmdbuf_endp += n; 1152 cmdbuf_endp += r;
1048 return true; 1153 return true;
1049 } 1154 }
1050 else if (n < 0 && errno != EAGAIN) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 {
1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1160#endif
1161 }
1162 else
1163 {
1164 pty_ev.stop ();
1165
1166 if (!OPTION (Opt_hold))
1051 destroy (); 1167 destroy ();
1168 }
1052 1169
1053 return false; 1170 return false;
1054} 1171}
1055 1172
1056void 1173void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1174rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1175{
1059 SET_R (this); 1176 SET_R (this);
1060 SET_LOCALE (locale); 1177 SET_LOCALE (locale);
1061 1178
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1179 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1180 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1181 while (pty_fill ())
1067 if (cmd_parse ()) 1182 if (cmd_parse ())
1068 break; 1183 break;
1184
1185 if (revents & EVENT_WRITE)
1186 pty_write ();
1069} 1187}
1070 1188
1071void 1189void
1072rxvt_term::pointer_unblank () 1190rxvt_term::pointer_unblank ()
1073{ 1191{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1192 XDefineCursor (display->display, vt, TermWin_cursor);
1075 recolour_cursor (); 1193 recolour_cursor ();
1076 1194
1077#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1196 hidden_pointer = 0;
1079 1197
1080 if (options & Opt_pointerBlank) 1198 if (OPTION (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1199 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif 1200#endif
1083} 1201}
1084 1202
1085#ifdef POINTER_BLANK 1203#ifdef POINTER_BLANK
1086void 1204void
1087rxvt_term::pointer_blank () 1205rxvt_term::pointer_blank ()
1088{ 1206{
1089 if (! (options & Opt_pointerBlank)) 1207 if (! OPTION (Opt_pointerBlank))
1090 return; 1208 return;
1091 1209
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1210 XDefineCursor (display->display, vt, display->blank_cursor);
1093 XFlush (display->display); 1211 XFlush (display->display);
1094 1212
1095 hidden_pointer = 1; 1213 hidden_pointer = 1;
1096} 1214}
1097 1215
… …
1186 1304
1187/*{{{ process an X event */ 1305/*{{{ process an X event */
1188void 1306void
1189rxvt_term::x_cb (XEvent &ev) 1307rxvt_term::x_cb (XEvent &ev)
1190{ 1308{
1309 dDisp;
1310
1191 SET_R (this); 1311 SET_R (this);
1192 SET_LOCALE (locale); 1312 SET_LOCALE (locale);
1193 1313
1194#if defined(CURSOR_BLINK) 1314#if defined(CURSOR_BLINK)
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1196 { 1316 {
1197 if (hidden_cursor) 1317 if (hidden_cursor)
1198 { 1318 {
1199 hidden_cursor = 0; 1319 hidden_cursor = 0;
1200 want_refresh = 1; 1320 want_refresh = 1;
… …
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1204 } 1324 }
1205#endif 1325#endif
1206 1326
1207#if defined(POINTER_BLANK) 1327#if defined(POINTER_BLANK)
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1209 { 1329 {
1210 if (ev.type == MotionNotify 1330 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress 1331 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease) 1332 || ev.type == ButtonRelease)
1213 if (hidden_pointer) 1333 if (hidden_pointer)
… …
1216 if (ev.type == KeyPress && hidden_pointer == 0) 1336 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank (); 1337 pointer_blank ();
1218 } 1338 }
1219#endif 1339#endif
1220 1340
1221 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1343 unsigned int unused_mask;
1224 1344
1225 switch (ev.type) 1345 switch (ev.type)
1226 { 1346 {
1227 case KeyPress: 1347 case KeyPress:
1228#if ISO_14755 1348#if ISO_14755
… …
1311 button_release (ev.xbutton); 1431 button_release (ev.xbutton);
1312 break; 1432 break;
1313 1433
1314 case ClientMessage: 1434 case ClientMessage:
1315 if (ev.xclient.format == 32 1435 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1437 {
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1438 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1317 destroy (); 1439 destroy ();
1440#if ENABLE_EWMH
1441 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442 XSendEvent (disp, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &ev);
1445#endif
1446 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1318#ifdef OFFIX_DND 1456#ifdef OFFIX_DND
1319 /* OffiX Dnd (drag 'n' drop) protocol */ 1457 /* OffiX Dnd (drag 'n' drop) protocol */
1320 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321 && (ev.xclient.data.l[0] == DndFile 1459 && (ev.xclient.data.l[0] == DndFile
1322 || ev.xclient.data.l[0] == DndDir 1460 || ev.xclient.data.l[0] == DndDir
1323 || ev.xclient.data.l[0] == DndLink)) 1461 || ev.xclient.data.l[0] == DndLink))
1324 { 1462 {
1325 /* Get Dnd data */ 1463 /* Get Dnd data */
1326 Atom ActualType; 1464 Atom ActualType;
1327 int ActualFormat; 1465 int ActualFormat;
1328 unsigned char *data; 1466 unsigned char *data;
1329 unsigned long Size, RemainingBytes; 1467 unsigned long Size, RemainingBytes;
1330 1468
1331 XGetWindowProperty (display->display, display->root, 1469 XGetWindowProperty (disp, display->root,
1332 xa[XA_DNDSELECTION], 1470 xa[XA_DNDSELECTION],
1333 0L, 1000000L, 1471 0L, 1000000L,
1334 False, AnyPropertyType, 1472 False, AnyPropertyType,
1335 &ActualType, &ActualFormat, 1473 &ActualType, &ActualFormat,
1336 &Size, &RemainingBytes, 1474 &Size, &RemainingBytes,
1337 &data); 1475 &data);
1338 XChangeProperty (display->display, display->root, 1476 set_string_property (XA_CUT_BUFFER0, data);
1339 XA_CUT_BUFFER0, XA_STRING,
1340 8, PropModeReplace,
1341 data, strlen (data));
1342 XFree (data); 1477 XFree (data);
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1345 } 1480 }
1346#endif /* OFFIX_DND */ 1481#endif /* OFFIX_DND */
1347 break; 1482 break;
1348 1483
1349 case MappingNotify: 1484 case MappingNotify:
… …
1374 break; 1509 break;
1375 } 1510 }
1376 break; 1511 break;
1377 1512
1378 case FocusIn: 1513 case FocusIn:
1379 if (!TermWin.focus) 1514 focus_in ();
1515 break;
1516
1517 case FocusOut:
1518 focus_out ();
1519 break;
1520
1521 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0])
1380 { 1523 {
1381 TermWin.focus = 1;
1382 want_refresh = 1;
1383#ifdef USE_XIM
1384 if (Input_Context != NULL)
1385 {
1386 IMSetStatusPosition ();
1387 XSetICFocus (Input_Context);
1388 }
1389#endif
1390#ifdef CURSOR_BLINK
1391 if (options & Opt_cursorBlink)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1400#endif
1401
1402 }
1403 break;
1404
1405 case FocusOut:
1406 if (TermWin.focus)
1407 {
1408 TermWin.focus = 0;
1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1417#ifdef USE_XIM
1418 if (Input_Context != NULL)
1419 XUnsetICFocus (Input_Context);
1420#endif
1421#ifdef CURSOR_BLINK
1422 if (options & Opt_cursorBlink)
1423 cursor_blink_ev.stop ();
1424 hidden_cursor = 0;
1425#endif
1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1433 }
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == TermWin.parent[0])
1438 {
1439 int height, width;
1440
1441 do
1442 { /* Wrap lots of configures into one */
1443 width = ev.xconfigure.width;
1444 height = ev.xconfigure.height;
1445 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446 }
1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ;
1448 1526
1449 if (szHint.width != width || szHint.height != height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450 { 1528 {
1451 seen_resize = 1; 1529 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453 } 1531 }
1454 1532
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456 if (options & Opt_transparent) 1534 if (OPTION (Opt_transparent))
1457 {
1458 check_our_parents (); 1535 check_our_parents ();
1459 if (am_transparent)
1460 want_refresh = want_full_refresh = 1;
1461 }
1462#endif 1536#endif
1463 } 1537 }
1464 break; 1538 break;
1465 1539
1466 case PropertyNotify: 1540 case PropertyNotify:
… …
1474 selection_clear (); 1548 selection_clear ();
1475 break; 1549 break;
1476 1550
1477 case SelectionNotify: 1551 case SelectionNotify:
1478 if (selection_wait == Sel_normal) 1552 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, 1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 ev.xselection.property, True);
1481 break; 1554 break;
1482 1555
1483 case SelectionRequest: 1556 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1485 break; 1558 break;
1486 1559
1487 case UnmapNotify: 1560 case UnmapNotify:
1488 TermWin.mapped = 0; 1561 mapped = 0;
1489#ifdef TEXT_BLINK 1562#ifdef TEXT_BLINK
1490 text_blink_ev.stop (); 1563 text_blink_ev.stop ();
1491#endif 1564#endif
1492 break; 1565 break;
1493 1566
1494 case MapNotify: 1567 case MapNotify:
1495 TermWin.mapped = 1; 1568 mapped = 1;
1496#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif 1571#endif
1499 break; 1572 break;
1500 1573
… …
1504 break; 1577 break;
1505#endif /* TRANSPARENT */ 1578#endif /* TRANSPARENT */
1506 1579
1507 case GraphicsExpose: 1580 case GraphicsExpose:
1508 case Expose: 1581 case Expose:
1509 if (ev.xany.window == TermWin.vt) 1582 if (ev.xany.window == vt)
1510 { 1583 {
1511 do 1584 do
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1585 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1586 ev.xexpose.width, ev.xexpose.height, False);
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1515 1588
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1590
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1521 1594
1522 scr_refresh (refresh_type); 1595 scr_refresh (refresh_type);
1523 } 1596 }
1524 else 1597 else
1525 { 1598 {
1526 XEvent unused_event; 1599 XEvent unused_event;
1527 1600
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1529 ; 1602 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1604 ;
1532 1605
1533 if (isScrollbarWindow (ev.xany.window)) 1606 if (isScrollbarWindow (ev.xany.window))
1534 { 1607 {
1535 scrollBar.setIdle (); 1608 scrollBar.setIdle ();
… …
1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1540 menubar_expose (); 1613 menubar_expose ();
1541#endif 1614#endif
1542 1615
1543#ifdef TRANSPARENT 1616#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1617 if (am_transparent && ev.xany.window == parent[0])
1545 XClearWindow (display->display, ev.xany.window); 1618 XClearWindow (disp, ev.xany.window);
1546#endif 1619#endif
1547 } 1620 }
1548 break; 1621 break;
1549 1622
1550 case MotionNotify: 1623 case MotionNotify:
… …
1560 } 1633 }
1561#endif 1634#endif
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1636 break;
1564 1637
1565 if (ev.xany.window == TermWin.vt) 1638 if (ev.xany.window == vt)
1566 { 1639 {
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1640 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1641 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1570 ; 1643 ;
1571 1644
1572 XQueryPointer (display->display, TermWin.vt, 1645 XQueryPointer (disp, vt,
1573 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1649 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
… …
1589#endif 1662#endif
1590 selection_extend (ev.xbutton.x, ev.xbutton.y, 1663 selection_extend (ev.xbutton.x, ev.xbutton.y,
1591 ev.xbutton.state & Button3Mask ? 2 : 0); 1664 ev.xbutton.state & Button3Mask ? 2 : 0);
1592 1665
1593#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1594 if (ev.xbutton.y < TermWin.int_bwidth 1667 if (ev.xbutton.y < int_bwidth
1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1668 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1596 { 1669 {
1597 int dist; 1670 int dist;
1598 1671
1599 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1600 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
… …
1608 selection_save_x = ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
1609 selection_save_y = ev.xbutton.y; 1682 selection_save_y = ev.xbutton.y;
1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1683 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611 1684
1612 /* calc number of lines to scroll */ 1685 /* calc number of lines to scroll */
1613 if (ev.xbutton.y < TermWin.int_bwidth) 1686 if (ev.xbutton.y < int_bwidth)
1614 { 1687 {
1615 scroll_selection_dir = UP; 1688 scroll_selection_dir = UP;
1616 dist = TermWin.int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1617 } 1690 }
1618 else 1691 else
1619 { 1692 {
1620 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1694 dist = ev.xbutton.y - (int_bwidth + height);
1622 } 1695 }
1623 1696
1624 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1625 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1; 1699 + 1;
1627 MIN_IT (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1628 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1629 } 1702 }
1630 else 1703 else
1631 { 1704 {
1632 /* we are within the text window, so we 1705 /* we are within the text window, so we
… …
1641#endif 1714#endif
1642 } 1715 }
1643 } 1716 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645 { 1718 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1719 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1647 MotionNotify, &ev)) 1720 MotionNotify, &ev))
1648 ; 1721 ;
1649 1722
1650 XQueryPointer (display->display, scrollBar.win, 1723 XQueryPointer (disp, scrollBar.win,
1651 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1726 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1727 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 } 1733 }
1661 break; 1734 break;
1662 } 1735 }
1663} 1736}
1664 1737
1738void
1739rxvt_term::focus_in ()
1740{
1741 if (!focus)
1742 {
1743 focus = 1;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 {
1751 IMSetStatusPosition ();
1752 XSetICFocus (Input_Context);
1753 }
1754#endif
1755#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1758#endif
1759#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade])
1761 {
1762 pix_colors = pix_colors_focused;
1763 scr_recolour ();
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1805}
1806
1665#if TRANSPARENT 1807#if TRANSPARENT
1666void 1808void
1667rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1810{
1669 SET_R (this); 1811 SET_R (this);
… …
1674 case PropertyNotify: 1816 case PropertyNotify:
1675 /* 1817 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1818 * if user used some Esetroot compatible prog to set the root bg,
1677 * use the property to determine the pixmap. We use it later on. 1819 * use the property to determine the pixmap. We use it later on.
1678 */ 1820 */
1679 if (xa[XA_XROOTPMAPID] == 0)
1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1821 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1683 return; 1823 return;
1684 1824
1685 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1686 case ReparentNotify: 1826 case ReparentNotify:
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1688 want_refresh = want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1689 break; 1829 break;
1690 } 1830 }
1691} 1831}
1692#endif 1832#endif
… …
1695rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1696{ 1836{
1697 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1698 1838
1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1700 if (!bypass_keystate) 1841 if (!bypass_keystate)
1701 reportmode = !! (priv_modes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702 1843
1703 /* 1844 /*
1704 * VT window processing of button press 1845 * VT window processing of button press
1705 */ 1846 */
1706 if (ev.window == TermWin.vt) 1847 if (ev.window == vt)
1707 { 1848 {
1708#if ISO_14755 1849#if ISO_14755
1709 // 5.4 1850 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 { 1852 {
… …
1753 else 1894 else
1754 { 1895 {
1755 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1756 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1757 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1758 switch (ev.button) 1900 switch (ev.button)
1759 { 1901 {
1760 case Button1: 1902 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1907#else
1766 selection.rect = false; 1908 selection.rect = false;
1767#endif 1909#endif
1768 1910
1769 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1771 { 1913 {
1772 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1773 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1774 else 1916 else
1775 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1776 } 1918 }
1777 else 1919 else
1778 { 1920 {
1779 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1780 MEvent.clicks++; 1922 MEvent.clicks++;
1781 else 1923 else
1782 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1783 1925
1784 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1785 } 1927 }
1786 1928
1787 MEvent.button = Button1; 1929 MEvent.button = Button1;
1788 break; 1930 break;
1789 1931
1790 case Button3: 1932 case Button3:
1791 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1792 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1793 else 1935 else
1794 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1795 1937
1796 MEvent.button = Button3; 1938 MEvent.button = Button3;
1797 break; 1939 break;
1798 } 1940 }
1799 } 1941 }
1800 1942
1801 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1802 return; 1944 return;
1803 } 1945 }
1804 1946
… …
1916 case Button3: 2058 case Button3:
1917 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1918 { 2060 {
1919 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1921 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1922# else 2064# else
1923 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1924# endif 2066# endif
1925 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1926# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1927 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1928# else 2070# else
1929 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1930# endif 2072# endif
1931 else 2073 else
1932 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1933 } 2075 }
1934 else 2076 else
1935 { 2077 {
1936 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1937 (TermWin.nrow 2079 (nrow
1938 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1939 / scrollbar_size ())); 2081 / scrollbar_size ()));
1940 } 2082 }
1941 2083
1942 break; 2084 break;
… …
1974#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
1975 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
1977#endif 2119#endif
1978 2120
1979 if (ev.window == TermWin.vt) 2121 if (ev.window == vt)
1980 { 2122 {
1981#if ISO_14755 2123#if ISO_14755
1982 // 5.4 2124 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return; 2126 return;
… …
2034 2176
2035 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
2036 2178
2037 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
2038 i = 1; 2180 i = 1;
2039 else if (options & Opt_mouseWheelScrollPage) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
2040 i = TermWin.nrow - 1; 2182 i = nrow - 1;
2041 else 2183 else
2042 i = 5; 2184 i = 5;
2043 2185
2044# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
2045 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
2046 { 2188 {
2047 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2050 2192
2051 if (slip_wheel_ev.at < NOW) 2193 if (slip_wheel_ev.at < NOW)
2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2053 2195
2054 slip_wheel_ev.start (); 2196 slip_wheel_ev.start ();
… …
2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i; 2240 int i;
2099 2241
2100 Visual* visual = display->visual; 2242 Visual *visual = display->visual;
2101 2243
2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103 2245
2104 /* for convenience */ 2246 /* for convenience */
2105 mask_r = visual->red_mask; 2247 mask_r = visual->red_mask;
… …
2326 Atom atype; 2468 Atom atype;
2327 unsigned char *prop = NULL; 2469 unsigned char *prop = NULL;
2328 Window root, oldp, *list; 2470 Window root, oldp, *list;
2329 Pixmap rootpixmap = None; 2471 Pixmap rootpixmap = None;
2330 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2331 2474
2332 pchanged = 0; 2475 pchanged = 0;
2333 2476
2334 if (!(options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
2335 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
2336 2479
2337 XGetWindowAttributes (display->display, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
2338 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
2339 2482
2340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2483 XGetWindowAttributes (disp, parent[0], &wattr);
2341 2484
2342 if (rootdepth != wattr.depth) 2485 if (rootdepth != wattr.depth)
2343 { 2486 {
2344 if (am_transparent) 2487 if (am_transparent)
2345 { 2488 {
2346 pchanged = 1; 2489 pchanged = 1;
2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2348 am_transparent = am_pixmap_trans = 0; 2491 am_transparent = am_pixmap_trans = 0;
2349 } 2492 }
2350 2493
2351 return pchanged; /* Don't try any more */ 2494 return pchanged; /* Don't try any more */
2352 } 2495 }
2353 2496
2354 /* Get all X ops out of the queue so that our information is up-to-date. */ 2497 /* Get all X ops out of the queue so that our information is up-to-date. */
2355 XSync (display->display, False); 2498 XSync (disp, False);
2356 2499
2357 /* 2500 /*
2358 * Make the frame window set by the window manager have 2501 * Make the frame window set by the window manager have
2359 * the root background. Some window managers put multiple nested frame 2502 * the root background. Some window managers put multiple nested frame
2360 * windows for each client, so we have to take care about that. 2503 * windows for each client, so we have to take care about that.
2361 */ 2504 */
2362 i = (xa[XA_XROOTPMAPID] 2505 i = (xa[XA_XROOTPMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2508 &nitems, &bytes_after, &prop) == Success);
2366 2509
2367 if (!i || prop == NULL) 2510 if (!i || prop == NULL)
2368 i = (xa[XA_XSETROOTID] 2511 i = (xa[XA_ESETROOT_PMAP_ID]
2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371 &nitems, &bytes_after, &prop) == Success); 2514 &nitems, &bytes_after, &prop) == Success);
2372 2515
2373 if (!i || prop == NULL 2516 if (!i || prop == NULL
2374#if TINTING 2517#if TINTING
… …
2393 Window cr; 2536 Window cr;
2394 XImage *image; 2537 XImage *image;
2395 GC gc; 2538 GC gc;
2396 XGCValues gcvalue; 2539 XGCValues gcvalue;
2397 2540
2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2541 XTranslateCoordinates (disp, parent[0], display->root,
2399 0, 0, &sx, &sy, &cr); 2542 0, 0, &sx, &sy, &cr);
2400 nw = (unsigned int)szHint.width; 2543 nw = (unsigned int)szHint.width;
2401 nh = (unsigned int)szHint.height; 2544 nh = (unsigned int)szHint.height;
2402 nx = ny = 0; 2545 nx = ny = 0;
2403 2546
… …
2413 nh += sy; 2556 nh += sy;
2414 ny = -sy; 2557 ny = -sy;
2415 sy = 0; 2558 sy = 0;
2416 } 2559 }
2417 2560
2418 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2419 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563
2564 XSync (disp, False);
2420 allowedxerror = -1; 2565 allowedxerror = -1;
2421 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422 2567
2423 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2424 /* XXX: may need a delay here? */ 2569 /* XXX: may need a delay here? */
2425 allowedxerror = 0; 2570 allowedxerror = 0;
2426 2571
2427 if (image == NULL) 2572 if (image == NULL)
2428 { 2573 {
2429 if (am_transparent && am_pixmap_trans) 2574 if (am_transparent && am_pixmap_trans)
2430 { 2575 {
2431 pchanged = 1; 2576 pchanged = 1;
2432 if (TermWin.pixmap != None) 2577 if (pixmap != None)
2433 { 2578 {
2434 XFreePixmap (display->display, TermWin.pixmap); 2579 XFreePixmap (disp, pixmap);
2435 TermWin.pixmap = None; 2580 pixmap = None;
2436 } 2581 }
2437 } 2582 }
2438 2583
2439 am_pixmap_trans = 0; 2584 am_pixmap_trans = 0;
2440 } 2585 }
2441 else 2586 else
2442 { 2587 {
2443 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2444 XFreePixmap (display->display, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
2445 2590
2446#if TINTING 2591#if TINTING
2447 if (ISSET_PIXCOLOR (Color_tint)) 2592 if (ISSET_PIXCOLOR (Color_tint))
2448 { 2593 {
2449 unsigned short rm, gm, bm; 2594 unsigned short rm, gm, bm;
… …
2453 2598
2454 ShadeXImage (display, image, shade, rm, gm, bm); 2599 ShadeXImage (display, image, shade, rm, gm, bm);
2455 } 2600 }
2456#endif 2601#endif
2457 2602
2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2603 pixmap = XCreatePixmap (disp, vt,
2459 szHint.width, szHint.height, image->depth); 2604 szHint.width, szHint.height, image->depth);
2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2462 nx, ny, image->width, image->height); 2607 nx, ny, image->width, image->height);
2463 XFreeGC (display->display, gc); 2608 XFreeGC (disp, gc);
2464 XDestroyImage (image); 2609 XDestroyImage (image);
2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]); 2611 XClearWindow (disp, parent[0]);
2467 2612
2468 if (!am_transparent || !am_pixmap_trans) 2613 if (!am_transparent || !am_pixmap_trans)
2469 pchanged = 1; 2614 pchanged = 1;
2470 2615
2471 am_transparent = am_pixmap_trans = 1; 2616 am_transparent = am_pixmap_trans = 1;
2472 } 2617 }
2473 } 2618 }
2474 2619
2475 if (!am_pixmap_trans) 2620 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2622 else
2476 { 2623 {
2477 unsigned int n; 2624 unsigned int n;
2478 /* 2625 /*
2479 * InheritPixmap transparency 2626 * InheritPixmap transparency
2480 */ 2627 */
2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2482 { 2629 {
2483 oldp = TermWin.parent[i]; 2630 oldp = parent[i];
2484 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2631 XQueryTree (disp, parent[i - 1], &root,
2485 &TermWin.parent[i], &list, &n); 2632 &parent[i], &list, &n);
2486 XFree (list); 2633 XFree (list);
2487 2634
2488 if (TermWin.parent[i] == display->root) 2635 if (parent[i] == display->root)
2489 { 2636 {
2490 if (oldp != None) 2637 if (oldp != None)
2491 pchanged = 1; 2638 pchanged = 1;
2492 2639
2493 break; 2640 break;
2494 } 2641 }
2495 2642
2496 if (oldp != TermWin.parent[i]) 2643 if (oldp != parent[i])
2497 pchanged = 1; 2644 pchanged = 1;
2498 } 2645 }
2499 2646
2500 n = 0; 2647 n = 0;
2501 2648
2502 if (pchanged) 2649 if (pchanged)
2503 { 2650 {
2504 for (; n < (unsigned int)i; n++) 2651 for (; n < (unsigned int)i; n++)
2505 { 2652 {
2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2653 XGetWindowAttributes (disp, parent[n], &wattr);
2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508 { 2655 {
2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2510 break; 2657 break;
2511 } 2658 }
2512 } 2659 }
2513 } 2660 }
2514 2661
2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2516 { 2663 {
2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2519 am_transparent = 0; 2666 am_transparent = 0;
2520 /* XXX: also turn off Opt_transparent? */ 2667 /* XXX: also turn off Opt_transparent? */
2521 } 2668 }
2522 else 2669 else
2523 { 2670 {
… …
2526 * needed for fvwm2.2.2 (and before?) */ 2673 * needed for fvwm2.2.2 (and before?) */
2527 sleep (1); 2674 sleep (1);
2528#endif 2675#endif
2529 for (n = 0; n < (unsigned int)i; n++) 2676 for (n = 0; n < (unsigned int)i; n++)
2530 { 2677 {
2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]); 2679 XClearWindow (disp, parent[n]);
2533 } 2680 }
2534 2681
2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2536 am_transparent = 1; 2683 am_transparent = 1;
2537 } 2684 }
2538 2685
2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2540 TermWin.parent[i] = None; 2687 parent[i] = None;
2541 } 2688 }
2542 2689
2543 if (scrollBar.win) 2690 if (scrollBar.win)
2544 { 2691 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle (); 2693 scrollBar.setIdle ();
2547 scrollbar_show (0); 2694 scrollbar_show (0);
2548 } 2695 }
2549 2696
2697 if (am_transparent)
2698 {
2699 want_refresh = want_full_refresh = 1;
2700 if (am_pixmap_trans)
2701 flush ();
2702 }
2703
2550 return pchanged; 2704 return pchanged;
2551} 2705}
2552#endif 2706#endif
2553 2707
2554/*}}} */ 2708/*}}} */
… …
2556bool 2710bool
2557rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2558{ 2712{
2559 bool flag = false; 2713 bool flag = false;
2560 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2562 2716
2563 for (;;) 2717 for (;;)
2564 { 2718 {
2565 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2566 { 2720 {
… …
2581 // some window managers resize the window early, and these programs 2735 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2736 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2737 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2738 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2739 // resized.
2586 if (seen_resize) 2740 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2741 kill (-cmd_pid, SIGWINCH);
2588 } 2742 }
2589 2743
2590 /* Read a text string from the input buffer */ 2744 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2745 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2746 bool refreshnow = false;
2593 int nlines = 0; 2747 int nlines = 0;
2594 unicode_t *str = buf; 2748 unicode_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ);
2595 2750
2596 for (;;) 2751 for (;;)
2597 { 2752 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2754 break;
2600 2755
2601 *str++ = ch; 2756 *str++ = ch;
2602 2757
2603 if (ch == C0_LF) 2758 if (ch == C0_LF || str >= eol)
2604 { 2759 {
2760 if (ch == C0_LF)
2605 nlines++; 2761 nlines++;
2762
2606 refresh_count++; 2763 refresh_count++;
2607 2764
2608 if (!(options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2767 {
2611 refreshnow = true; 2768 refreshnow = true;
2769 refresh_count = 0;
2612 ch = NOCHAR; 2770 ch = NOCHAR;
2613 break; 2771 break;
2614 } 2772 }
2615 2773
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2775 if (nlines >= nrow - 1)
2618 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2619 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2620 nlines = 0; 2780 nlines = 0;
2621 str = buf; 2781 str = buf;
2782 eol = str + min (ncol, UBUFSIZ);
2622 } 2783 }
2623 }
2624 2784
2625 if (str >= buf + UBUFSIZ) 2785 if (str >= eol)
2626 { 2786 {
2787 if (eol >= buf + UBUFSIZ)
2788 {
2627 ch = NOCHAR; 2789 ch = NOCHAR;
2628 break; 2790 break;
2791 }
2792 else
2793 eol = min (eol + ncol, buf + UBUFSIZ);
2794 }
2795
2629 } 2796 }
2630 2797
2631 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2799 ch = next_char ();
2633 } 2800 }
2634 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2635 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2636 2804
2637 /* 2805 /*
2638 * If there have been a lot of new lines, then update the screen 2806 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full. 2807 * What the heck I'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2810 */
2643 if (refreshnow) 2811 if (refreshnow)
2644 { 2812 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2814 refresh_limit++;
2647 else 2815 else
2648 { 2816 {
2649 flag = true; 2817 flag = true;
2650 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2651 } 2820 }
2652 } 2821 }
2653 2822
2654 } 2823 }
2655 else 2824 else
… …
2686rxvt_term::next_char () 2855rxvt_term::next_char ()
2687{ 2856{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2858 {
2690 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2693 2862
2694 wchar_t wc; 2863 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2865
2697 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2698 { 2867 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2704 if (len == (size_t)-1) 2873 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2875
2707 // assume wchar == unicode 2876 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2877 cmdbuf_ptr += len;
2709 return wc; 2878 return wc & UNICODE_MASK;
2710 } 2879 }
2711 2880
2712 return NOCHAR; 2881 return NOCHAR;
2713} 2882}
2714 2883
… …
2839 case C0_ESC: 3008 case C0_ESC:
2840 process_escape_seq (); 3009 process_escape_seq ();
2841 break; 3010 break;
2842 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 3014 else
2847 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 3016 break;
2850 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2851 scr_bell (); 3018 scr_bell ();
2852 break; 3019 break;
2853 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
3041 process_dcs_seq (); 3208 process_dcs_seq ();
3042 break; 3209 break;
3043 3210
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
3049 3215
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3051 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 3218 process_csi_seq ();
… …
3177 { 3343 {
3178 switch (priv) 3344 switch (priv)
3179 { 3345 {
3180 case '>': 3346 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3347 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3349 break;
3184 case '?': 3350 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3352 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3353 break;
… …
3292 3458
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3459 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3460 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3461 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3464 break;
3299 3465
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 3468 break;
3304 3469
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3307 break; 3472 break;
… …
3314 break; 3479 break;
3315 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
3316 scr_report_position (); 3481 scr_report_position ();
3317 break; 3482 break;
3318 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3486 break;
3322 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3489 break;
… …
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3581rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3582{
3418 int x, y; 3583 int x, y;
3419 XWindowAttributes wattr; 3584 XWindowAttributes wattr;
3420 Window wdummy; 3585 Window wdummy;
3586 dDisp;
3421 3587
3422 if (nargs == 0) 3588 if (nargs == 0)
3423 return; 3589 return;
3424 3590
3425 switch (args[0]) 3591 switch (args[0])
3426 { 3592 {
3427 /* 3593 /*
3428 * commands 3594 * commands
3429 */ 3595 */
3430 case 1: /* deiconify window */ 3596 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3597 XMapWindow (disp, parent[0]);
3432 break; 3598 break;
3433 case 2: /* iconify window */ 3599 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3600 XIconifyWindow (disp, parent[0], display->screen);
3435 DefaultScreen (display->display));
3436 break; 3601 break;
3437 case 3: /* set position (pixels) */ 3602 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3603 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3604 break;
3440 case 4: /* set size (pixels) */ 3605 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3607 break;
3443 case 5: /* raise window */ 3608 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3609 XRaiseWindow (disp, parent[0]);
3445 break; 3610 break;
3446 case 6: /* lower window */ 3611 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3612 XLowerWindow (disp, parent[0]);
3448 break; 3613 break;
3449 case 7: /* refresh window */ 3614 case 7: /* refresh window */
3450 scr_touch (true); 3615 scr_touch (true);
3451 break; 3616 break;
3452 case 8: /* set size (chars) */ 3617 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3618 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3619 (unsigned int) (args[1] * fheight));
3455 break; 3620 break;
3456 3621
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3622 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3623 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3624 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3625 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3626 (unsigned int) (args[1] * fheight));
3462 break; 3627 break;
3463 3628
3464 3629
3465 /* 3630 /*
3466 * reports - some output format copied from XTerm 3631 * reports - some output format copied from XTerm
3467 */ 3632 */
3468 case 11: /* report window state */ 3633 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3636 break;
3472 case 13: /* report window position */ 3637 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3638 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3639 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3640 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3641 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3642 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3643 break;
3479 case 14: /* report window size (pixels) */ 3644 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3647 break;
3483 case 18: /* report text area size (chars) */ 3648 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3649 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3650 break;
3486 case 19: /* report window size (chars) */ 3651 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3653 break;
3489 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3490 { 3655 {
3491 char *s; 3656 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3659 XFree (s);
3495 } 3660 }
3496 break; 3661 break;
3497 case 21: /* report window title */ 3662 case 21: /* report window title */
3498 { 3663 {
3499 char *s; 3664 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3501 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 */
3502 XFree (s); 3667 XFree (s);
3503 } 3668 }
3504 break; 3669 break;
3505 } 3670 }
3506} 3671}
… …
3509/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3510/* 3675/*
3511 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3513 */ 3678 */
3514unsigned char * 3679char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3681{
3517 unicode_t seen_esc = 0, ch; 3682 unicode_t ch;
3683 bool seen_esc = false;
3518 unsigned int n = 0; 3684 unsigned int n = 0;
3519 unsigned char *s;
3520 unsigned char string[STRING_MAX]; 3685 wchar_t string[STRING_MAX];
3521 3686
3522 while ((ch = cmd_getc ()) != NOCHAR) 3687 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3688 {
3524 if (seen_esc) 3689 if (seen_esc)
3525 { 3690 {
… …
3528 else 3693 else
3529 return NULL; 3694 return NULL;
3530 } 3695 }
3531 else if (ch == C0_ESC) 3696 else if (ch == C0_ESC)
3532 { 3697 {
3533 seen_esc = 1; 3698 seen_esc = true;
3534 continue; 3699 continue;
3535 } 3700 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3701 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3702 break;
3538 else if (ch < 0x20) 3703 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3704 return NULL; /* other control character - exit */
3540 3705
3541 seen_esc = 0; 3706 seen_esc = false;
3542 3707
3543 if (n >= sizeof (string) - 1) 3708 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3709 // stop at some sane length
3545 return NULL; 3710 return NULL;
3546 3711
3547 if (ch == C0_SYN) 3712 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3713 string[n++] = cmd_get8 ();
… …
3550 string[n++] = ch; 3715 string[n++] = ch;
3551 } 3716 }
3552 3717
3553 string[n++] = '\0'; 3718 string[n++] = '\0';
3554 3719
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3721
3560 return s; 3722 return rxvt_wcstombs (string);
3561} 3723}
3562 3724
3563/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3564/* 3726/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3566 */ 3728 */
3567void 3729void
3568rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3569{ 3731{
3570 unsigned char *s; 3732 char *s;
3571 unicode_t eh; 3733 unicode_t eh;
3572 3734
3573 /* 3735 /*
3574 * Not handled yet 3736 * Not handled yet
3575 */ 3737 */
… …
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3596 3758
3597 if (ch == ';') 3759 if (ch == ';')
3598 { 3760 {
3599 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3600 3762
3601 if (s) 3763 if (s)
3602 { 3764 {
3603 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3604 free (s); 3766 free (s);
3605 } 3767 }
3606 } 3768 }
3607} 3769}
3608 3770
3609void 3771void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3611{ 3773{
3612 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3613 { 3775 {
3614 unsigned short r, g, b; 3776 unsigned short r, g, b;
3615 pix_colors_focused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
… …
3619 set_window_color (color, str); 3781 set_window_color (color, str);
3620} 3782}
3621 3783
3622/* 3784/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3786 */
3647void 3787void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3649{ 3789{
3650 int changed = 0; 3790 int changed = 0;
3651 int color; 3791 int color;
3652 char *buf, *name; 3792 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3794 int saveop = op;
3795 dDisp;
3655 3796
3656 assert (str != NULL); 3797 assert (str != NULL);
3657 switch (op) 3798 switch (op)
3658 { 3799 {
3659 case XTerm_name: 3800 case XTerm_name:
… …
3666 set_title (str); 3807 set_title (str);
3667 break; 3808 break;
3668 case XTerm_property: 3809 case XTerm_property:
3669 if (str[0] == '?') 3810 if (str[0] == '?')
3670 { 3811 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3812 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3813 Atom actual_type;
3673 int actual_format; 3814 int actual_format;
3674 unsigned long nitems; 3815 unsigned long nitems;
3675 unsigned long bytes_after; 3816 unsigned long bytes_after;
3676 unsigned char *value = 0; 3817 unsigned char *value = 0;
3677 const char *str = ""; 3818 const char *str = "";
3678 3819
3679 if (prop 3820 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3821 && XGetWindowProperty (disp, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3822 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3823 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3824 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3825 && actual_type != None
3685 && actual_format == 8) 3826 && actual_format == 8)
… …
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3835 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695 3836
3696 if (eq) 3837 if (eq)
3697 { 3838 {
3698 *eq = 0; 3839 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3840 set_utf8_property (display->atom (str), eq + 1);
3700 display->atom (str), XA_STRING, 8,
3701 PropModeReplace, (unsigned char *)eq + 1,
3702 strlen (eq + 1));
3703 } 3841 }
3704 else 3842 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3843 XDeleteProperty (disp, parent[0],
3706 display->atom (str)); 3844 display->atom (str));
3707 } 3845 }
3708 break; 3846 break;
3709 3847
3710 case XTerm_Color: 3848 case XTerm_Color:
… …
3751 break; 3889 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE 3890#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD: 3891 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break; 3893 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL: 3894 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break; 3896 break;
3762 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3764 break; 3899 break;
3900 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902 break;
3765#endif 3903#endif
3766#if TRANSPARENT || TINTING 3904#if TRANSPARENT && TINTING
3767 case XTerm_Color_tint: 3905 case URxvt_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3769 check_our_parents (); 3907 check_our_parents ();
3770 if (am_transparent) 3908 if (am_transparent)
3771 want_full_refresh = want_refresh = 1; 3909 want_full_refresh = want_refresh = 1;
3772 break; 3910 break;
3773#endif 3911#endif
… …
3785 { 3923 {
3786 str++; 3924 str++;
3787#if XPM_BACKGROUND 3925#if XPM_BACKGROUND
3788 changed += scale_pixmap (str); 3926 changed += scale_pixmap (str);
3789#endif 3927#endif
3790
3791 } 3928 }
3929
3792 if (changed) 3930 if (changed)
3793 { 3931 {
3794#ifdef XPM_BACKGROUND 3932#ifdef XPM_BACKGROUND
3795 resize_pixmap (); 3933 resize_pixmap ();
3796#endif 3934#endif
… …
3807 3945
3808 case XTerm_logfile: 3946 case XTerm_logfile:
3809 // TODO, when secure mode? 3947 // TODO, when secure mode?
3810 break; 3948 break;
3811 3949
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0
3957 case XTerm_dumpscreen: /* no error notices */
3958 {
3959 int fd;
3960 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3961 {
3962 scr_dump (fd);
3963 close (fd);
3964 }
3965 }
3966 break;
3967#endif
3812 case XTerm_font: 3968 case XTerm_font:
3813 op = URxvt_font; 3969 op = URxvt_font;
3814 case URxvt_font: 3970 case URxvt_font:
3815#if ENABLE_STYLES 3971#if ENABLE_STYLES
3816 case URxvt_boldFont: 3972 case URxvt_boldFont:
3817 case URxvt_italicFont: 3973 case URxvt_italicFont:
3818 case URxvt_boldItalicFont: 3974 case URxvt_boldItalicFont:
3819#endif 3975#endif
3820 if (query) 3976 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop, 3977 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3979 ? fontset[op - URxvt_font]->fontdesc : "",
3824 resp); 3980 resp);
3825 else 3981 else
3826 { 3982 {
3827 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3983 const char *&res = rs[Rs_font + (op - URxvt_font)];
3828 3984
… …
3831 set_fonts (); 3987 set_fonts ();
3832 } 3988 }
3833 break; 3989 break;
3834 3990
3835#if ENABLE_FRILLS 3991#if ENABLE_FRILLS
3836 case XTerm_locale: 3992 case URxvt_locale:
3837 if (query) 3993 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3839 else 3995 else
3840 { 3996 {
3841 set_locale (str); 3997 set_locale (str);
3842# ifdef USE_XIM 3998 pty.set_utf8_mode (enc_utf8);
3843 im_cb (); 3999 init_xlocale ();
3844# endif
3845 } 4000 }
3846 break; 4001 break;
3847#endif
3848 4002
3849#ifdef MENUBAR 4003 case URxvt_view_up:
3850 case XTerm_Menu: 4004 case URxvt_view_down:
3851 if (options & Opt_insecure) 4005 {
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4006 int lines = atoi (str);
4007
4008 if (lines)
4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
4010 else
4011 scr_erase_savelines ();
4012 }
4013
3853 break; 4014 break;
3854#endif 4015#endif
3855#if 0 4016
3856 case XTerm_dumpscreen: /* no error notices */ 4017#if ENABLE_PERL
3857 { 4018 case URxvt_perl:
3858 int fd; 4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4020 ; // no responses yet
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break; 4021 break;
3866#endif 4022#endif
3867 } 4023 }
3868} 4024}
3869/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
3978 } 4134 }
3979 4135
3980 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
3981 switch (arg[i]) 4137 switch (arg[i])
3982 { 4138 {
4139#if ENABLE_STYLES
4140 case 1021:
4141 if (mode)
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145
4146 scr_touch (true);
4147 break;
4148#endif
3983 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
3984 case 1049: 4150 case 1049:
3985 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
3986 if (mode == 0) 4152 if (mode == 0)
3987 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
3988 else if (mode == 1) 4154 else if (mode == 1)
3989 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
3990 break; 4156 break;
… …
4002 */ 4168 */
4003 PrivMode (1, PrivMode_vt52); 4169 PrivMode (1, PrivMode_vt52);
4004 break; 4170 break;
4005 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
4006 if (priv_modes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
4008 break; 4174 break;
4009 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
4010 if (state) 4176 if (!state)
4011 options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
4012 else 4178 else
4013 options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
4014 break; 4180 break;
4015 case 5: /* reverse video */ 4181 case 5: /* reverse video */
4016 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
4017 break; 4183 break;
4018 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
4059#if 0 4225#if 0
4060 case 1001: 4226 case 1001:
4061 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
4062#endif 4228#endif
4063 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
4064 if (state) 4230 if (!state)
4065 options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
4066 else 4232 else
4067 options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
4068 break; 4234 break;
4069 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4070 if (state) 4236 if (state)
4071 options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
4072 else 4238 else
4073 options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
4074 break; 4240 break;
4075 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
4076 if (options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
4077 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
4078 scr_erase_screen (2); 4244 scr_erase_screen (2);
4079 scr_change_screen (state); 4245 scr_change_screen (state);
4080 break; 4246 break;
4081 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
4082 scr_change_screen (state); 4248 scr_change_screen (state);
4083 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4084 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4085 scr_erase_screen (2); 4251 scr_erase_screen (2);
4086 break; 4252 break;
4087 default: 4253 default:
4088 break; 4254 break;
… …
4216 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4217 break; 4383 break;
4218 4384
4219 //case 50: // not variable spacing 4385 //case 50: // not variable spacing
4220 4386
4221#ifndef NO_BRIGHTCOLOR 4387#if ENABLE_FRILLS
4222 case 90: 4388 case 90:
4223 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4224 case 92: 4390 case 92:
4225 case 93: 4391 case 93:
4226 case 94: 4392 case 94:
… …
4238 case 106: 4404 case 106:
4239 case 107: 4405 case 107:
4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4241 break; 4407 break;
4242#endif 4408#endif
4243
4244 } 4409 }
4245 } 4410 }
4246} 4411}
4247/*}}} */ 4412/*}}} */
4248 4413
… …
4272 */ 4437 */
4273void 4438void
4274rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4275{ 4440{
4276 va_list arg_ptr; 4441 va_list arg_ptr;
4277 unsigned char buf[256]; 4442 char buf[256];
4278 4443
4279 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4281 va_end (arg_ptr); 4446 va_end (arg_ptr);
4282 tt_write (buf, strlen (buf)); 4447 tt_write (buf, strlen (buf));
… …
4284 4449
4285/* ---------------------------------------------------------------------- */ 4450/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 4451/* Write data to the pty as typed by the user, pasted with the mouse,
4287 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
4288 */ 4453 */
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455
4289void 4456void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4291{ 4458{
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459 if (v_buflen == 0)
4460 {
4461 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4293 4462
4294 if (len) 4463 if ((unsigned int)written == len)
4464 return;
4465
4466 data += written;
4467 len -= written;
4295 { 4468 }
4469
4470 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4471
4472 memcpy (v_buffer + v_buflen, data, len);
4473 v_buflen += len;
4474
4475 pty_ev.set (EVENT_READ | EVENT_WRITE);
4476}
4477
4478void rxvt_term::pty_write ()
4479{
4480 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4481
4482 if (written > 0)
4483 {
4484 v_buflen -= written;
4485
4296 if (v_buflen == 0) 4486 if (v_buflen == 0)
4297 { 4487 {
4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300 if ((unsigned int)written == len)
4301 return;
4302
4303 data += written;
4304 len -= written;
4305 }
4306
4307
4308 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310 memcpy (v_buffer + v_buflen, data, len);
4311 v_buflen += len;
4312 }
4313
4314 for (;;)
4315 {
4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318 if (written > 0)
4319 {
4320 v_buflen -= written;
4321
4322 if (v_buflen == 0)
4323 {
4324 free (v_buffer); 4488 free (v_buffer);
4325 v_buffer = 0; 4489 v_buffer = 0;
4326 v_buflen = 0; 4490 v_buflen = 0;
4327 4491
4328 pty_ev.set (EVENT_READ); 4492 pty_ev.set (EVENT_READ);
4329 return;
4330 }
4331
4332 memmove (v_buffer, v_buffer + written, v_buflen);
4333 }
4334 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335 // original code just ignores this...
4336 destroy ();
4337 else
4338 {
4339 pty_ev.set (EVENT_READ | EVENT_WRITE);
4340 return; 4493 return;
4341 } 4494 }
4495
4496 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 4497 }
4498 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4499 pty_ev.set (EVENT_READ);
4343} 4500}
4344 4501
4345/*----------------------- end-of-file (C source) -----------------------*/ 4502/*----------------------- end-of-file (C source) -----------------------*/
4346 4503

Diff Legend

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