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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 2006 UTC

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

Diff Legend

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