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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC

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

Diff Legend

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