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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.370 by ayin, Fri Nov 30 10:57:04 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
63void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
64rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
65{ 304{
66 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
67 unsigned int newlen; 306 unsigned int newlen;
68 KeySym keysym; 307 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 308 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
74 315
75 /* 316 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
78 * 319 *
79 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
80 */ 321 */
81 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
84 325
85 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
86 { 327 {
87 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 337 Status status_return;
97 338
98#if 0 339#if 0
99#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
103 else 344 else
104#endif 345#endif
105#endif 346#endif
106 { 347 {
… …
108 349
109 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
113 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
116 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 360 SET_LOCALE (locale);
118 361
119 if (status_return == XLookupChars 362 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
142 } 385 }
143 else 386 else
144#endif 387#endif
145 { 388 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
148 } 391 }
149 392
150 if (valid_keysym) 393 if (valid_keysym)
151 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
152 if (TermWin.saveLines) 400 if (saveLines)
153 { 401 {
154#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 403 if (!ctrl && !meta)
156 {
157#else 404#else
158 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
159 { 407 {
160#endif
161 int lnsppg; 408 int lnsppg;
162 409
163#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 412#else
166 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
167#endif 414#endif
168 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
169 { 416 {
170 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
171 return; 418 return;
… …
199 scr_move_to (0, 1); 446 scr_move_to (0, 1);
200 return; 447 return;
201 } 448 }
202 else if (keysym == XK_End) 449 else if (keysym == XK_End)
203 { 450 {
204 scr_move_to (1, 0); 451 scr_move_to (1, 1);
205 return; 452 return;
206 } 453 }
207 } 454 }
208#endif 455#endif
209 } 456 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 462 {
216 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
218 } 465 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 467 {
221 switch (keysym) 468 switch (keysym)
222 { 469 {
223 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
226 return; 473 return;
474#if TODO
227 /* rxvt extras */ 475 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 477 change_font (FONT_UP);
230 return; 478 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 480 change_font (FONT_DN);
233 return; 481 return;
482#endif
234 } 483 }
235 } 484 }
236 } 485 }
237#ifdef PRINTPIPE 486
238 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
239 { 488 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
241 return;
242 } 490 {
243#endif 491 int hv;
244 492
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 493 if (iso14755buf & ISO_14755_51
246 { 494 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 495 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 496 {
250 unsigned int l; 497 commit_iso14755 ();
251 const unsigned char *kbuf0; 498 iso14755buf = ISO_14755_51;
252 499# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 500 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 501# endif
261 ) 502 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 503 }
266 504 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
268 return; 519 return;
269 } 520 }
270 else 521 else
271#endif
272 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
273 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
274 switch (keysym) 584 switch (keysym)
275 { 585 {
276#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 587 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
279 { 589 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
283 } 593 }
284 else 594 else
285 STRCPY (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
286 break; 596 break;
287#endif 597#endif
288#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
289 case XK_Delete: 599 case XK_Delete:
290 STRCPY (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
291 break; 601 break;
292#endif 602#endif
293 case XK_Tab: 603 case XK_Tab:
294 if (shft) 604 if (shft)
295 STRCPY (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
296 else 606 else
297 { 607 {
298#ifdef CTRL_TAB_MAKES_META 608#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 609 if (ctrl)
300 meta = 1; 610 meta = 1;
… …
305#endif 615#endif
306 newlen = 0; 616 newlen = 0;
307 } 617 }
308 break; 618 break;
309 619
310#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
316 {
317 STRCPY (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break;
320 }
321 else
322 /* translate to std. cursor key */
323 keysym = XK_Left + (keysym - XK_KP_Left);
324 /* FALLTHROUGH */
325#endif
326 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 625 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 626 /* do Shift first */
333 if (shft) 627 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 629 else if (ctrl)
336 { 630 {
337 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 632 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 633 }
340 else if (PrivateModes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
342 break; 636 break;
343 637
344#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior
346 case XK_KP_Prior: 639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
347 /* allow shift to override */ 647 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
349 { 649 {
350 STRCPY (kbuf, "\033Oy"); 650 strcpy (kbuf, "\033OM");
351 break; 651 break;
352 } 652 }
653
353 /* FALLTHROUGH */ 654 /* FALLTHROUGH */
354# endif 655
355 case XK_Prior:
356 STRCPY (kbuf, "\033[5~");
357 break;
358# ifdef XK_KP_Next
359 case XK_KP_Next: 656 case XK_Return:
360 /* allow shift to override */ 657 if (priv_modes & PrivMode_LFNL)
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
362 { 658 {
363 STRCPY (kbuf, "\033Os"); 659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
364 break; 661 kbuf[2] = '\0';
365 }
366 /* FALLTHROUGH */
367# endif
368 case XK_Next:
369 STRCPY (kbuf, "\033[6~");
370 break;
371#endif
372 case XK_KP_Enter:
373 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
375 {
376 STRCPY (kbuf, "\033OM");
377 } 662 }
378 else 663 else
379 { 664 {
380 kbuf[0] = '\r'; 665 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
382 } 667 }
383 break; 668 break;
384 669
385#ifdef XK_KP_Begin
386 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou");
388 break;
389
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif
398 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 675 kbuf[2] += (keysym - XK_KP_F1);
404 break; 676 break;
405 677
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 678 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 679 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 694 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
424 { 696 {
425 STRCPY (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 699 }
428 else 700 else
429 { 701 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 703 kbuf[1] = '\0';
432 } 704 }
433 break; 705 break;
434 706
435 case XK_Find: 707 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
437 break; 709 break;
710
438 case XK_Insert: 711 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
440 break; 713 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 715 case DXK_Remove:
443 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
444#endif 717#endif
445 case XK_Execute: 718 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
447 break; 720 break;
448 case XK_Select: 721 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
450 break; 723 break;
451#ifdef XK_KP_End
452 case XK_KP_End:
453 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 {
456 STRCPY (kbuf, "\033Oq");
457 break;
458 }
459 /* FALLTHROUGH */
460#endif
461 case XK_End: 724 case XK_End:
462 STRCPY (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
463 break; 726 break;
464#ifdef XK_KP_Home
465 case XK_KP_Home:
466 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
468 {
469 STRCPY (kbuf, "\033Ow");
470 break;
471 }
472 /* FALLTHROUGH */
473#endif
474 case XK_Home: 727 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
476 break; 729 break;
477 730
478#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 733
… …
532#undef FKEY 785#undef FKEY
533 default: 786 default:
534 newlen = 0; 787 newlen = 0;
535 break; 788 break;
536 } 789 }
790
537 if (newlen) 791 if (newlen)
538 len = STRLEN (kbuf); 792 len = strlen (kbuf);
539 } 793 }
540 794
541 /* 795 /*
542 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
543 */ 797 */
… …
550 else if (ctrl && keysym == XK_minus) 804 else if (ctrl && keysym == XK_minus)
551 { 805 {
552 len = 1; 806 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
555 else 814 else
556 { 815 {
557#ifdef META8_OPTION 816#ifdef META8_OPTION
558 /* set 8-bit on */ 817 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
560 { 819 {
561 unsigned char *ch; 820 char *ch;
562 821
563 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 823 *ch |= 0x80;
565 824
566 meta = 0; 825 meta = 0;
… …
568#endif 827#endif
569 /* nil */ ; 828 /* nil */ ;
570 } 829 }
571 } 830 }
572 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
573 if (len <= 0) 835 if (len <= 0)
574 return; /* not mapped */ 836 return; /* not mapped */
575 837
576 if (Options & Opt_scrollTtyKeypress) 838 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 839 if (view_start)
578 { 840 {
579 TermWin.view_start = 0; 841 view_start = 0;
580 want_refresh = 1; 842 want_refresh = 1;
581 } 843 }
582 844
583 /* 845 /*
584 * these modifications only affect the static keybuffer 846 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 861#ifdef META8_OPTION
600 && meta_char == C0_ESC 862 && meta_char == C0_ESC
601#endif 863#endif
602 ) 864 )
603 { 865 {
604 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
605 tt_write (&ch, 1); 867 tt_write (&ch, 1);
606 } 868 }
607 869
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
619} 871}
620/*}}} */
621 872
622#if (MENUBAR_MAX) 873void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 874rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
950#if defined (KEYSYM_RESOURCE)
625unsigned int 951unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 953{
628 unsigned int n, s; 954 unsigned int n, s;
629 955
630 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 958
633 if (n > 0 && s < count) 959 if (n > 0 && s < count)
634 { 960 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 961 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 963 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 964 cmdbuf_endp -= n;
639 s += n; 965 s += n;
640 } 966 }
… …
650 976
651 cmd_parse (); 977 cmd_parse ();
652 978
653 return 0; 979 return 0;
654} 980}
655#endif /* MENUBAR_MAX */ 981#endif
656 982
657void 983void
658rxvt_term::flush () 984rxvt_term::flush ()
659{ 985{
660#ifdef TRANSPARENT 986 flush_ev.stop ();
661 if (want_full_refresh) 987
988#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ())
662 { 990 {
663 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
664 scr_clear ();
665 scr_touch (false); 992 scr_touch (false);
666 } 993 }
667#endif 994#endif
668 995
669 if (want_refresh) 996 if (want_refresh)
670 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
671 scr_refresh (refresh_type); 1036 scr_refresh ();
672 scrollbar_show (1); 1037 scrollbar_show (1);
673#ifdef USE_XIM 1038#ifdef USE_XIM
674 IMSendSpot (); 1039 IMSendSpot ();
675#endif 1040#endif
676 } 1041 }
677 1042
678 display->flush (); 1043 display->flush ();
679
680 flush_ev.stop ();
681} 1044}
682 1045
683void 1046void
684rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
685{ 1048{
686 SET_R (this); 1049 make_current ();
687 SET_LOCALE (locale);
688 1050
689 display->flush (); 1051 display->flush ();
690 1052
691 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
693} 1055}
694 1056
695void 1057void
696rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
697{ 1059{
698 SET_R (this); 1060 make_current ();
699 SET_LOCALE (locale);
700 1061
701 refresh_limit = 1;
702 refresh_count = 0; 1062 refresh_count = 0;
703 flush (); 1063 flush ();
704} 1064}
705 1065
706#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
707void 1067void
708rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
709{ 1069{
710 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1071 want_refresh = 1;
712
713 w.start (w.at + BLINK_INTERVAL);
714} 1072}
715#endif 1073#endif
716 1074
717#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
718void 1076void
719rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
720{ 1078{
721 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
722 { 1080 {
723 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
724 want_refresh = 1; 1082 want_refresh = 1;
725 w.start (w.at + TEXT_BLINK_INTERVAL);
726 } 1083 }
727} 1084}
728#endif 1085#endif
729 1086
730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
731void 1088void
732rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
733{ 1090{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1093 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
740 } 1095 w.stop ();
741} 1096}
742#endif 1097#endif
743 1098
744#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
745void 1100void
746rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
747{ 1102{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1104 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1106 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1107 }
1108 else
1109 w.stop ();
755} 1110}
756#endif 1111#endif
757 1112
758#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
759void 1114void
760rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
761{ 1116{
762 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1120 {
766 refresh_type |= SMOOTH_REFRESH; 1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
767 want_refresh = 1; 1124 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 }
1126 else
1127 w.stop ();
1128}
1129#endif
1130
1131#if LINUX_YIELD_HACK
1132static struct event_handler
1133{
1134 ev::prepare yield_ev;
1135
1136 void yield_cb (ev::prepare &w, int revents)
1137 {
1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
769 } 1147 }
770} 1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
771#endif 1154#endif
772 1155
773bool 1156bool
774rxvt_term::pty_fill () 1157rxvt_term::pty_fill ()
775{ 1158{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1160
778 if (CBUFSIZ == n) 1161 if (CBUFSIZ == n)
779 { 1162 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1164 n = 0;
782 } 1165 }
783 1166
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
787 1170
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1172
790 if (n > 0) 1173 if (r > 0)
791 { 1174 {
792 cmdbuf_endp += n; 1175 cmdbuf_endp += r;
793 return true; 1176 return true;
794 } 1177 }
795 else if (n < 0 && errno != EAGAIN) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1179 {
1180#if LINUX_YIELD_HACK
1181 if (display->is_local)
1182 event_handler.yield_ev.start ();
1183#endif
1184 }
1185 else
1186 {
1187 pty_ev.stop ();
1188
1189 if (!option (Opt_hold))
796 destroy (); 1190 destroy ();
797 1191 }
1192
798 return false; 1193 return false;
799} 1194}
800 1195
801void 1196void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
803{ 1198{
804 SET_R (this); 1199 make_current ();
805 SET_LOCALE (locale);
806 1200
807 if (revents & EVENT_WRITE) 1201 if (revents & ev::READ)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1203 while (pty_fill ())
812 if (cmd_parse ()) 1204 if (cmd_parse ())
813 break; 1205 break;
1206
1207 if (revents & ev::WRITE)
1208 pty_write ();
814} 1209}
815 1210
816void 1211void
817rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
818{ 1213{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
820 recolour_cursor (); 1215 recolour_cursor ();
821 1216
822#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1218 hidden_pointer = 0;
824 1219
825 if (Options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
827#endif 1222#endif
828} 1223}
829 1224
830#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
831void 1226void
832rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
833{ 1228{
834 if (! (Options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
835 return; 1230 return;
836 1231
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
838 XFlush (display->display); 1233 XFlush (dpy);
839 1234
840 hidden_pointer = 1; 1235 hidden_pointer = 1;
841} 1236}
842 1237
843void 1238void
844rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
845{ 1240{
846 SET_R (this); 1241 make_current ();
847 SET_LOCALE (locale);
848 1242
849 pointer_blank (); 1243 pointer_blank ();
850} 1244}
851#endif 1245#endif
852 1246
853void 1247void
854rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
855{ 1249{
856 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
857 int x, y; 1251 int x, y;
1252 int code = 32;
858 1253
859 x = ev.x; 1254 x = Pixel2Col (ev.x);
860 y = ev.y; 1255 y = Pixel2Row (ev.y);
861 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
862 1264
863 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1266 button_number = 3;
866 }
867 else 1267 else
868 { 1268 {
869 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1271 if (button_number >= 3)
872 button_number += (64 - 3); 1272 button_number += (64 - 3);
873 } 1273 }
874 1274
875 if (PrivateModes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
876 { 1276 {
877 /* 1277 /*
878 * do not report ButtonRelease 1278 * do not report ButtonRelease
879 * no state info allowed 1279 * no state info allowed
880 */ 1280 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1295 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1296 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1297#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1298 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1299#endif
900
901 } 1300 }
902 1301
903#ifdef DEBUG_MOUSEREPORT 1302#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1303 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1304 if (key_state & 16)
906 fputc ('C', stderr); 1305 fputc ('C', stderr);
907 if (key_state & 4) 1306 if (key_state & 4)
908 fputc ('S', stderr); 1307 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1311 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1313 button_number,
915 x + 1, 1314 x + 1,
916 y + 1); 1315 y + 1);
917#else 1316#endif
1317
918 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1319 (code + button_number + key_state),
920 (32 + x + 1), 1320 (32 + x + 1),
921 (32 + y + 1)); 1321 (32 + y + 1));
922#endif
923} 1322}
924
925#ifdef USING_W11LIB
926void
927rxvt_W11_process_x_event (XEvent *ev)
928{
929 rxvt_t *r = rxvt_get_r ();
930
931 x_cb (*ev);
932}
933#endif
934 1323
935/*{{{ process an X event */ 1324/*{{{ process an X event */
936void 1325void
937rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
938{ 1327{
939 SET_R (this); 1328 make_current ();
940 SET_LOCALE (locale);
941 1329
942#if defined(CURSOR_BLINK) 1330 dLocal (Display *, dpy);
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
944 {
945 if (hidden_cursor)
946 {
947 hidden_cursor = 0;
948 want_refresh = 1;
949 }
950 1331
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1332 if (ev.xany.window == vt
952 } 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
954
955#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 {
958 if (ev.type == MotionNotify
959 || ev.type == ButtonPress
960 || ev.type == ButtonRelease)
961 if (hidden_pointer)
962 pointer_unblank ();
963
964 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank ();
966 }
967#endif
968
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return; 1335 return;
972#endif
973 1336
1337 // for XQueryPointer
974 Window unused_root, unused_child; 1338 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1339 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1340 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1025#endif
1026 1341
1027 switch (ev.type) 1342 switch (ev.type)
1028 { 1343 {
1029 case KeyPress: 1344 case KeyPress:
1030 lookup_key (ev.xkey); 1345 key_press (ev.xkey);
1031 break; 1346 break;
1032 1347
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease: 1348 case KeyRelease:
1035 { 1349 key_release (ev.xkey);
1036 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0;
1045 }
1046 break; 1350 break;
1047 }
1048#endif
1049 1351
1050 case ButtonPress: 1352 case ButtonPress:
1051 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1052 break; 1354 break;
1053 1355
… …
1055 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1056 break; 1358 break;
1057 1359
1058 case ClientMessage: 1360 case ClientMessage:
1059 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1061 destroy ();
1062#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink))
1068 { 1363 {
1069 /* Get Dnd data */ 1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1365 {
1071 int ActualFormat; 1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1367 {
1073 unsigned long Size, RemainingBytes; 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1369 {
1075 XGetWindowProperty (display->display, display->root, 1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1371 destroy ();
1077 0L, 1000000L, 1372 }
1078 False, AnyPropertyType, 1373#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1377 &ev);
1082 XChangeProperty (display->display, display->root, 1378#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1379 }
1084 8, PropModeReplace, 1380 }
1085 data, STRLEN (data)); 1381#if ENABLE_XEMBED
1086 XFree (data); 1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1389#endif
1089 } 1390 }
1090#endif /* OFFIX_DND */
1091 break;
1092
1093 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1391 break;
1096 1392
1097 /* 1393 /*
1098 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1099 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1118 break; 1414 break;
1119 } 1415 }
1120 break; 1416 break;
1121 1417
1122 case FocusIn: 1418 case FocusIn:
1123 if (!TermWin.focus) 1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1422 focus_in ();
1423 break;
1424
1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1429 focus_out ();
1430 break;
1431
1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0])
1124 { 1437 {
1125 TermWin.focus = 1; 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1439 ;
1127#ifdef USE_XIM 1440
1128 if (Input_Context != NULL) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 { 1442 {
1138 PixColors = PixColorsFocused; 1443 seen_resize = 1;
1139 set_colorfgbg (); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1445 }
1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1143#endif 1451#endif
1144 1452 }
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1145 } 1454 }
1146 break; 1455 break;
1147 1456
1148 case FocusOut:
1149 if (TermWin.focus)
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break;
1174
1175 case ConfigureNotify: 1457 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1462
1180 do
1181 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187
1188 if (szHint.width != width || szHint.height != height)
1189 resize_all_windows (width, height, 1);
1190
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent)
1193 {
1194 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif
1199 }
1200 break; 1463 break;
1201 1464
1202 case SelectionClear: 1465 case SelectionClear:
1203 selection_clear (); 1466 selection_clear ();
1204 break; 1467 break;
1205 1468
1206 case SelectionNotify: 1469 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1472 break;
1211 1473
1212 case SelectionRequest: 1474 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1214 break; 1476 break;
1215 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1216 case UnmapNotify: 1486 case UnmapNotify:
1217 TermWin.mapped = 0; 1487 mapped = 0;
1218#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1220#endif 1490#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1221 break; 1492 break;
1222
1223 case MapNotify:
1224 TermWin.mapped = 1;
1225#ifdef TEXT_BLINK
1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1227#endif
1228 break;
1229
1230#ifdef TRANSPARENT
1231 case ReparentNotify:
1232 rootwin_cb (ev);
1233 break;
1234#endif /* TRANSPARENT */
1235 1493
1236 case GraphicsExpose: 1494 case GraphicsExpose:
1237 case Expose: 1495 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1496 if (ev.xany.window == vt)
1239 { 1497 {
1240 do 1498 do
1499 {
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1504
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1506
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1250 1511 }
1251 scr_refresh (refresh_type); 1512 want_refresh = 1;
1252 } 1513 }
1253 else 1514 else
1254 { 1515 {
1255 XEvent unused_event; 1516 XEvent unused_event;
1256 1517
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1519 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1521 ;
1261 1522
1262 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1263 { 1524 {
1264 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1265 scrollbar_show (0); 1526 scrollbar_show (0);
1266 } 1527 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271
1272#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window);
1275#endif
1276 } 1528 }
1277 break; 1529 break;
1278 1530
1279 case MotionNotify: 1531 case MotionNotify:
1280#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1533 if (hidden_pointer)
1282 pointer_unblank (); 1534 pointer_unblank ();
1283#endif 1535#endif
1284#if MENUBAR 1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1285 if (isMenuBarWindow (ev.xany.window)) 1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1540 break;
1541
1542 if (ev.xany.window == vt)
1286 { 1543 {
1287 menubar_control (ev.xbutton); 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1546 ; // nop
1290#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1292 break;
1293
1294 if (ev.xany.window == TermWin.vt)
1295 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1548 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1550 ;
1300 1551
1301 XQueryPointer (display->display, TermWin.vt, 1552 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1555 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1556 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1558 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1559 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1560 {
1310#endif 1561#endif
1562#if ISO_14755
1563 // 5.4
1564 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1565 {
1566 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1567 break;
1568 }
1569#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1570 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1571 ev.xbutton.state & Button3Mask ? 2 : 0);
1572
1313#ifdef SELECTION_SCROLLING 1573#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1574 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1575 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1576 {
1317 int dist; 1577 int dist;
1318 1578
1319 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1321 */ 1581 */
1322 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.active)
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1324 1584
1325 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1327 */ 1587 */
1328 selection_save_x=ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1589 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1590 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1591
1333 /* calc number of lines to scroll */ 1592 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1593 if (ev.xbutton.y < int_bwidth)
1335 { 1594 {
1336 scroll_selection_dir = UP; 1595 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1596 dist = int_bwidth - ev.xbutton.y;
1338 } 1597 }
1339 else 1598 else
1340 { 1599 {
1341 scroll_selection_dir = DN; 1600 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1601 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1602 }
1603
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1604 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1605 / SELECTION_SCROLL_LINE_SPEEDUP
1606 + 1;
1347 MIN_IT (scroll_selection_lines, 1607 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1608 SELECTION_SCROLL_MAX_LINES);
1349 } 1609 }
1350 else 1610 else
1351 { 1611 {
1352 /* we are within the text window, so we 1612 /* we are within the text window, so we
1353 * shouldn't be scrolling 1613 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1615 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1616 sel_scroll_ev.stop();
1357 } 1617 }
1358#endif 1618#endif
1359#ifdef MOUSE_THRESHOLD 1619#ifdef MOUSE_THRESHOLD
1360
1361 } 1620 }
1362#endif 1621#endif
1363
1364 } 1622 }
1365 } 1623 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1625 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1627 MotionNotify, &ev))
1628 ;
1629
1370 XQueryPointer (display->display, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1633 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1634 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1636 scrollbar_size ());
1377 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1637 want_refresh = 1;
1379 scrollbar_show (1); 1638 scrollbar_show (1);
1380 } 1639 }
1381 break; 1640 break;
1382 } 1641 }
1383}
1384 1642
1643#if defined(CURSOR_BLINK)
1644 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1645 {
1646 if (hidden_cursor)
1647 {
1648 hidden_cursor = 0;
1649 want_refresh = 1;
1650 }
1651
1652 cursor_blink_ev.again ();
1653 }
1654#endif
1655
1656#if defined(POINTER_BLANK)
1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1658 {
1659 if (ev.type == MotionNotify
1660 || ev.type == ButtonPress
1661 || ev.type == ButtonRelease)
1662 if (hidden_pointer)
1663 pointer_unblank ();
1664
1665 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank ();
1667 }
1668#endif
1669}
1670
1671void
1672rxvt_term::focus_in ()
1673{
1674 if (!focus)
1675 {
1676 focus = 1;
1677 want_refresh = 1;
1678
1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681#if USE_XIM
1682 if (Input_Context != NULL)
1683 {
1684 IMSetPosition ();
1685 XSetICFocus (Input_Context);
1686 }
1687#endif
1688#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1691#endif
1692#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade])
1694 {
1695 pix_colors = pix_colors_focused;
1696 scr_recolour ();
1697 }
1698#endif
1699#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell))
1701 {
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif
1709 }
1710}
1711
1712void
1713rxvt_term::focus_out ()
1714{
1715 if (focus)
1716 {
1717 focus = 0;
1718 want_refresh = 1;
1719
1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1721
1722#if ENABLE_FRILLS || ISO_14755
1723 if (iso14755buf)
1724 {
1725 iso14755buf = 0;
1726# if ISO_14755
1727 scr_overlay_off ();
1728# endif
1729 }
1730#endif
1731#if USE_XIM
1732 if (Input_Context != NULL)
1733 XUnsetICFocus (Input_Context);
1734#endif
1735#if CURSOR_BLINK
1736 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.stop ();
1738
1739 hidden_cursor = 0;
1740#endif
1741#if OFF_FOCUS_FADING
1742 if (rs[Rs_fade])
1743 {
1744 pix_colors = pix_colors_unfocused;
1745 scr_recolour ();
1746 }
1747#endif
1748 }
1749}
1750
1751void
1752rxvt_term::update_fade_color (unsigned int idx)
1753{
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 rgba c;
1758 pix_colors [Color_fade].get (c);
1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1760 }
1761#endif
1762}
1763
1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1385void 1765void
1386rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1767{
1388 SET_R (this); 1768 make_current ();
1389 SET_LOCALE (locale);
1390 1769
1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1772 return;
1773
1774# if ENABLE_TRANSPARENCY
1391 switch (ev.type) 1775 switch (ev.type)
1392 { 1776 {
1393 case PropertyNotify: 1777 case PropertyNotify:
1778 /*
1779 * if user used some Esetroot compatible prog to set the root bg,
1780 * use the property to determine the pixmap. We use it later on.
1781 */
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1395 { 1784 {
1396 if (ev.xproperty.state == PropertyNewValue) 1785 bgPixmap.set_root_pixmap ();
1397 selection_property (ev.xproperty.window, ev.xproperty.atom); 1786 update_background ();
1398 break;
1399 } 1787 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /*
1404 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on.
1406 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1411 return;
1412 }
1413
1414 /* FALLTHROUGH */
1415 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1;
1418 break; 1788 break;
1789 }
1419#endif 1790# endif
1420 }
1421} 1791}
1792#endif
1422 1793
1423void 1794void
1424rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1425{ 1796{
1426 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1427 1798
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1429 if (!bypass_keystate) 1801 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1803
1431 /* 1804 /*
1432 * VT window processing of button press 1805 * VT window processing of button press
1433 */ 1806 */
1434 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1435 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1812#if ISO_14755
1813 // 5.4
1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1815 {
1816 iso14755_54 (ev.x, ev.y);
1817 return;
1818 }
1819#endif
1820
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1821 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1822
1437 if (reportmode) 1823 if (reportmode)
1438 { 1824 {
1439 /* mouse report from vt window */ 1825 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1826 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1827 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1828#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1829 if (ev.button == MEvent.button && clickintime)
1444 { 1830 {
1445 /* same button, within alloted time */ 1831 /* same button, within alloted time */
1446 MEvent.clicks++; 1832 MEvent.clicks++;
1833
1447 if (MEvent.clicks > 1) 1834 if (MEvent.clicks > 1)
1448 { 1835 {
1449 /* only report double clicks */ 1836 /* only report double clicks */
1450 MEvent.clicks = 2; 1837 MEvent.clicks = 2;
1451 mouse_report (ev); 1838 mouse_report (ev);
… …
1463 mouse_report (ev); 1850 mouse_report (ev);
1464 } 1851 }
1465#else 1852#else
1466 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1467 mouse_report (ev); 1854 mouse_report (ev);
1468#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1469 1856
1470 } 1857 }
1471 else 1858 else
1472 { 1859 {
1473 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1862
1475 switch (ev.button) 1863 switch (ev.button)
1476 { 1864 {
1477 case Button1: 1865 case Button1:
1866 /* allow meta + click to select rectangular areas */
1867 /* should be done in screen.C */
1868#if ENABLE_FRILLS
1869 selection.rect = !!(ev.state & ModMetaMask);
1870#else
1871 selection.rect = false;
1872#endif
1873
1478 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1876 {
1481 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1483 else 1879 else
1484 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1895 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1502 else 1898 else
1503 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1900
1504 MEvent.button = Button3; 1901 MEvent.button = Button3;
1505 break; 1902 break;
1506 } 1903 }
1507 } 1904 }
1905
1508 MEvent.time = ev.time; 1906 MEvent.time = ev.time;
1509 return; 1907 return;
1510 } 1908 }
1511 1909
1512 /* 1910 /*
… …
1556 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
1557 break; 1955 break;
1558 } 1956 }
1559 } 1957 }
1560 else 1958 else
1561#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
1562 1960
1563 { 1961 {
1564 char upordown = 0; 1962 char upordown = 0;
1565 1963
1566 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
… …
1578 upordown = 1; /* down */ 1976 upordown = 1; /* down */
1579 } 1977 }
1580 if (upordown) 1978 if (upordown)
1581 { 1979 {
1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584#endif 1982#endif
1585 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
1586 { 1984 {
1587 if (upordown < 0) 1985 if (upordown < 0)
1588 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
1623 case Button3: 2021 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2022 if (scrollBar.style != R_SB_XTERM)
1625 { 2023 {
1626 if (scrollbar_above_slider (ev.y)) 2024 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2026 scr_page (UP, nrow - 1);
1629# else 2027# else
1630 scr_page (UP, TermWin.nrow / 4); 2028 scr_page (UP, nrow / 4);
1631# endif 2029# endif
1632 else if (scrollbar_below_slider (ev.y)) 2030 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2031# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2032 scr_page (DN, nrow - 1);
1635# else 2033# else
1636 scr_page (DN, TermWin.nrow / 4); 2034 scr_page (DN, nrow / 4);
1637# endif 2035# endif
1638 else 2036 else
1639 scrollBar.setMotion (); 2037 scrollBar.setMotion ();
1640 } 2038 }
1641 else 2039 else
1642 { 2040 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2041 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2042 (nrow
1645 * scrollbar_position (ev.y) 2043 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2044 / scrollbar_size ()));
1647 } 2045 }
1648 2046
1649 break; 2047 break;
1650 } 2048 }
1651 } 2049 }
2050
1652 return; 2051 return;
1653 } 2052 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2053}
1662 2054
1663void 2055void
1664rxvt_term::button_release (XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
1665{ 2057{
1666 int reportmode = 0; 2058 int reportmode = 0;
1667 2059
1668 csrO = 0; /* reset csr Offset */ 2060 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2061 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2062 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2063
1672 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
1673 { 2065 {
1674 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
1675 scrollbar_show (0); 2067 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2068 }
2069
1681#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2071 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
1684#endif 2073#endif
2074
1685 if (ev.window == TermWin.vt) 2075 if (ev.window == vt)
1686 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2080#if ISO_14755
2081 // 5.4
2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2083 return;
2084#endif
2085
1687 if (reportmode) 2086 if (reportmode)
1688 { 2087 {
1689 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1702 mouse_report (ev); 2101 mouse_report (ev);
1703 } 2102 }
1704#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
1705 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1706 mouse_report (ev); 2105 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2107 return;
1709 } 2108 }
2109
1710 /* 2110 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2112 * when overriding mouse reporting
1713 */ 2113 */
1714 if (PrivateModes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2115 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
1718 2118
1719 switch (ev.button) 2119 switch (ev.button)
1720 { 2120 {
1721 case Button1: 2121 case Button1:
1722 case Button3: 2122 case Button3:
1723 selection_make (ev.time); 2123 selection_make (ev.time);
1724 break; 2124 break;
2125
1725 case Button2: 2126 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1727 break; 2129 break;
2130
1728#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
1729 case Button4: 2132 case Button4:
1730 case Button5: 2133 case Button5:
1731 { 2134 {
1732 int i; 2135 int i;
… …
1734 2137
1735 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
1736 2139
1737 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
1738 i = 1; 2141 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2142 else if (option (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2143 i = nrow - 1;
1741 else 2144 else
1742 i = 5; 2145 i = 5;
1743 2146
1744# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
1746 { 2149 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2153
1751 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753
1754 slip_wheel_ev.start ();
1755 } 2155 }
1756 else 2156 else
1757 { 2157 {
1758# endif 2158# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2159 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2160 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
1772 } 2162 }
1773#endif 2163# endif
1774 } 2164 }
1775 break; 2165 break;
1776#endif 2166#endif
1777 } 2167 }
1778 } 2168 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2169}
1784
1785#ifdef TRANSPARENT
1786#if TINTING
1787/* taken from aterm-0.4.2 */
1788
1789typedef uint32_t RUINT32T;
1790
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{
1793 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i;
1799
1800 Visual* visual = display->visual;
1801
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803
1804 /* for convenience */
1805 mask_r = visual->red_mask;
1806 mask_g = visual->green_mask;
1807 mask_b = visual->blue_mask;
1808
1809 /* boring lookup table pre-initialization */
1810 switch (srcImage->bits_per_pixel) {
1811 case 15:
1812 if ((mask_r != 0x7c00) ||
1813 (mask_g != 0x03e0) ||
1814 (mask_b != 0x001f))
1815 return;
1816 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1817 lookup_r = lookup;
1818 lookup_g = lookup+32;
1819 lookup_b = lookup+32+32;
1820 sh_r = 10;
1821 sh_g = 5;
1822 sh_b = 0;
1823 break;
1824 case 16:
1825 if ((mask_r != 0xf800) ||
1826 (mask_g != 0x07e0) ||
1827 (mask_b != 0x001f))
1828 return;
1829 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1830 lookup_r = lookup;
1831 lookup_g = lookup+32;
1832 lookup_b = lookup+32+64;
1833 sh_r = 11;
1834 sh_g = 5;
1835 sh_b = 0;
1836 break;
1837 case 24:
1838 if ((mask_r != 0xff0000) ||
1839 (mask_g != 0x00ff00) ||
1840 (mask_b != 0x0000ff))
1841 return;
1842 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1843 lookup_r = lookup;
1844 lookup_g = lookup+256;
1845 lookup_b = lookup+256+256;
1846 sh_r = 16;
1847 sh_g = 8;
1848 sh_b = 0;
1849 break;
1850 case 32:
1851 if ((mask_r != 0xff0000) ||
1852 (mask_g != 0x00ff00) ||
1853 (mask_b != 0x0000ff))
1854 return;
1855 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1856 lookup_r = lookup;
1857 lookup_g = lookup+256;
1858 lookup_b = lookup+256+256;
1859 sh_r = 16;
1860 sh_g = 8;
1861 sh_b = 0;
1862 break;
1863 default:
1864 return; /* we do not support this color depth */
1865 }
1866
1867 /* prepare limits for color transformation (each channel is handled separately) */
1868 if (shade < 0) {
1869 shade = -shade;
1870 if (shade < 0) shade = 0;
1871 if (shade > 100) shade = 100;
1872
1873 lower_lim_r = 65535-rm;
1874 lower_lim_g = 65535-gm;
1875 lower_lim_b = 65535-bm;
1876
1877 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1878 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1879 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1880
1881 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1882 } else {
1883 if (shade < 0) shade = 0;
1884 if (shade > 100) shade = 100;
1885
1886 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1887
1888 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1889 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1890 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1891 }
1892
1893 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1894 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1895 {
1896 unsigned int tmp;
1897
1898 tmp = lower_lim_r;
1899 lower_lim_r = lower_lim_b;
1900 lower_lim_b = tmp;
1901
1902 tmp = upper_lim_r;
1903 upper_lim_r = upper_lim_b;
1904 upper_lim_b = tmp;
1905 }
1906
1907 /* fill our lookup tables */
1908 for (i = 0; i <= mask_r>>sh_r; i++)
1909 {
1910 RUINT32T tmp;
1911 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1912 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1913 lookup_r[i] = (tmp/65535)<<sh_r;
1914 }
1915 for (i = 0; i <= mask_g>>sh_g; i++)
1916 {
1917 RUINT32T tmp;
1918 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1919 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1920 lookup_g[i] = (tmp/65535)<<sh_g;
1921 }
1922 for (i = 0; i <= mask_b>>sh_b; i++)
1923 {
1924 RUINT32T tmp;
1925 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1926 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1927 lookup_b[i] = (tmp/65535)<<sh_b;
1928 }
1929
1930 /* apply table to input image (replacing colors by newly calculated ones) */
1931 switch (srcImage->bits_per_pixel)
1932 {
1933 case 15:
1934 {
1935 unsigned short *p1, *pf, *p, *pl;
1936 p1 = (unsigned short *) srcImage->data;
1937 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1938 while (p1 < pf)
1939 {
1940 p = p1;
1941 pl = p1 + srcImage->width;
1942 for (; p < pl; p++)
1943 {
1944 *p = lookup_r[(*p & 0x7c00)>>10] |
1945 lookup_g[(*p & 0x03e0)>> 5] |
1946 lookup_b[(*p & 0x001f)];
1947 }
1948 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1949 }
1950 break;
1951 }
1952 case 16:
1953 {
1954 unsigned short *p1, *pf, *p, *pl;
1955 p1 = (unsigned short *) srcImage->data;
1956 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1957 while (p1 < pf)
1958 {
1959 p = p1;
1960 pl = p1 + srcImage->width;
1961 for (; p < pl; p++)
1962 {
1963 *p = lookup_r[(*p & 0xf800)>>11] |
1964 lookup_g[(*p & 0x07e0)>> 5] |
1965 lookup_b[(*p & 0x001f)];
1966 }
1967 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1968 }
1969 break;
1970 }
1971 case 24:
1972 {
1973 unsigned char *p1, *pf, *p, *pl;
1974 p1 = (unsigned char *) srcImage->data;
1975 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1976 while (p1 < pf)
1977 {
1978 p = p1;
1979 pl = p1 + srcImage->width * 3;
1980 for (; p < pl; p += 3)
1981 {
1982 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1983 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1984 p[2] = lookup_r[(p[2] & 0x0000ff)];
1985 }
1986 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1987 }
1988 break;
1989 }
1990 case 32:
1991 {
1992 RUINT32T *p1, *pf, *p, *pl;
1993 p1 = (RUINT32T *) srcImage->data;
1994 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1995
1996 while (p1 < pf)
1997 {
1998 p = p1;
1999 pl = p1 + srcImage->width;
2000 for (; p < pl; p++)
2001 {
2002 *p = lookup_r[(*p & 0xff0000)>>16] |
2003 lookup_g[(*p & 0x00ff00)>> 8] |
2004 lookup_b[(*p & 0x0000ff)] |
2005 (*p & ~0xffffff);
2006 }
2007 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2008 }
2009 break;
2010 }
2011 }
2012
2013 free (lookup);
2014}
2015#endif
2016
2017/*
2018 * Check our parents are still who we think they are.
2019 * Do transparency updates if required
2020 */
2021int
2022rxvt_term::check_our_parents ()
2023{
2024 int i, pchanged, aformat, have_pixmap, rootdepth;
2025 unsigned long nitems, bytes_after;
2026 Atom atype;
2027 unsigned char *prop = NULL;
2028 Window root, oldp, *list;
2029 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr;
2031
2032 pchanged = 0;
2033
2034 if (!(Options & Opt_transparent))
2035 return pchanged; /* Don't try any more */
2036
2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth;
2039
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
2042 if (rootdepth != wattr.depth)
2043 {
2044 if (am_transparent)
2045 {
2046 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0;
2049 }
2050
2051 return pchanged; /* Don't try any more */
2052 }
2053
2054 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False);
2056
2057 /*
2058 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that.
2061 */
2062 i = (xa[XA_XROOTPMAPID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success);
2066
2067 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success);
2072
2073 if (!i || prop == NULL
2074#if TINTING
2075 || !rs[Rs_color + Color_tint]
2076#endif
2077 )
2078 have_pixmap = 0;
2079 else
2080 {
2081 have_pixmap = 1;
2082 rootpixmap = *(Pixmap *)prop;
2083 XFree (prop);
2084 }
2085
2086 if (have_pixmap)
2087 {
2088 /*
2089 * Copy display->root pixmap transparency
2090 */
2091 int sx, sy, nx, ny;
2092 unsigned int nw, nh;
2093 Window cr;
2094 XImage *image;
2095 GC gc;
2096 XGCValues gcvalue;
2097
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2099 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height;
2102 nx = ny = 0;
2103
2104 if (sx < 0)
2105 {
2106 nw += sx;
2107 nx = -sx;
2108 sx = 0;
2109 }
2110
2111 if (sy < 0)
2112 {
2113 nh += sy;
2114 ny = -sy;
2115 sy = 0;
2116 }
2117
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2120 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */
2125 allowedxerror = 0;
2126
2127 if (image == NULL)
2128 {
2129 if (am_transparent && am_pixmap_trans)
2130 {
2131 pchanged = 1;
2132 if (TermWin.pixmap != None)
2133 {
2134 XFreePixmap (display->display, TermWin.pixmap);
2135 TermWin.pixmap = None;
2136 }
2137 }
2138
2139 am_pixmap_trans = 0;
2140 }
2141 else
2142 {
2143 if (TermWin.pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap);
2145
2146#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint))
2148 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2153
2154 ShadeXImage (display, image, shade, rm, gm, bm);
2155 }
2156#endif
2157
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2159 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc);
2164 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]);
2167
2168 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1;
2170
2171 am_transparent = am_pixmap_trans = 1;
2172 }
2173 }
2174
2175 if (!am_pixmap_trans)
2176 {
2177 unsigned int n;
2178 /*
2179 * InheritPixmap transparency
2180 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 {
2184 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n);
2187 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2190 if (TermWin.parent[i] == display->root)
2191 {
2192 if (oldp != None)
2193 pchanged = 1;
2194
2195 break;
2196 }
2197
2198 if (oldp != TermWin.parent[i])
2199 pchanged = 1;
2200 }
2201
2202 n = 0;
2203
2204 if (pchanged)
2205 {
2206 for (; n < (unsigned int)i; n++)
2207 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break;
2214 }
2215 }
2216 }
2217
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2223 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */
2225 }
2226 else
2227 {
2228#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1);
2232#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2241 am_transparent = 1;
2242 }
2243
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None;
2246 }
2247
2248 // this is experimental
2249 if (scrollBar.win)
2250 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle ();
2254 scrollbar_show (0);
2255 }
2256
2257 return pchanged;
2258}
2259#endif
2260 2170
2261/*}}} */ 2171/*}}} */
2262 2172
2263bool 2173bool
2264rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
2265{ 2175{
2266 bool flag = false; 2176 bool flag = false;
2267 unicode_t ch = NOCHAR; 2177 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2178 char *seq_begin; // remember start of esc-sequence here
2269 2179
2270 for (;;) 2180 for (;;)
2271 { 2181 {
2272 if (ch == NOCHAR) 2182 if (ch == NOCHAR)
2273 { 2183 {
2274 seq_begin = cmdbuf_ptr; 2184 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2185 ch = next_char ();
2276 }
2277 2186
2278 if (ch == NOCHAR) // TODO: improve 2187 if (ch == NOCHAR)
2279 break; 2188 break;
2189 }
2280 2190
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2192 {
2193 if (!seen_input)
2194 {
2195 seen_input = 1;
2196 // many badly-written programs (e.g. jed) contain a race condition:
2197 // they first read the screensize and then install a SIGWINCH handler.
2198 // some window managers resize the window early, and these programs
2199 // then sometimes get the size wrong.
2200 // unfortunately other programs are even more buggy and dislike
2201 // being sent SIGWINCH, so only do it when we were in fact being
2202 // resized.
2203 if (seen_resize && cmd_pid)
2204 kill (-cmd_pid, SIGWINCH);
2205 }
2206
2283 /* Read a text string from the input buffer */ 2207 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2208 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2209 bool refreshnow = false;
2286 int nlines = 0; 2210 int nlines = 0;
2287 unicode_t *str = buf; 2211 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2213
2289 for (;;) 2214 for (;;)
2290 { 2215 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2217 break;
2293 2218
2294 *str++ = ch; 2219 *str++ = ch;
2295 2220
2296 if (ch == C0_LF) 2221 if (ch == C0_LF || str >= eol)
2297 { 2222 {
2223 if (ch == C0_LF)
2298 nlines++; 2224 nlines++;
2225
2299 refresh_count++; 2226 refresh_count++;
2300 2227
2301 if (!(Options & Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2229 {
2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2304 refreshnow = true; 2234 refreshnow = true;
2305 ch = NOCHAR; 2235 ch = NOCHAR;
2306 break; 2236 break;
2237 }
2307 } 2238 }
2308 2239
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2241 if (nlines >= nrow - 1)
2311 { 2242 {
2243 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2244 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2245 scr_add_lines (buf, str - buf, nlines);
2246
2313 nlines = 0; 2247 nlines = 0;
2314 str = buf; 2248 str = buf;
2249 eol = str + min (ncol, UBUFSIZ);
2315 } 2250 }
2316 }
2317 2251
2318 if (str >= buf + UBUFSIZ) 2252 if (str >= eol)
2319 { 2253 {
2254 if (eol >= buf + UBUFSIZ)
2255 {
2320 ch = NOCHAR; 2256 ch = NOCHAR;
2321 break; 2257 break;
2258 }
2259 else
2260 eol = min (eol + ncol, buf + UBUFSIZ);
2261 }
2262
2322 } 2263 }
2323 2264
2324 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2266 ch = next_char ();
2326 } 2267 }
2327 2268
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2329 2272
2330 /* 2273 /*
2331 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2277 */
2336 if (refreshnow) 2278 if (refreshnow)
2337 { 2279 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true; 2280 flag = true;
2343 scr_refresh (refresh_type); 2281 scr_refresh ();
2344 } 2282 want_refresh = 1;
2345 } 2283 }
2346 2284
2347 } 2285 }
2348 else 2286 else
2349 { 2287 {
… …
2363 } 2301 }
2364 2302
2365 return flag; 2303 return flag;
2366} 2304}
2367 2305
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character 2306// read the next character
2378unicode_t 2307wchar_t
2379rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2380{ 2309{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2311 {
2383 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2314 return *cmdbuf_ptr++;
2386 2315
2387 wchar_t wc; 2316 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2317 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2318
2390 if (len == (size_t)-2) 2319 if (len == (size_t)-2)
2391 { 2320 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2321 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2322 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2323 break;
2395 } 2324 }
2396 2325
2397 if (len == (size_t)-1) 2326 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2328
2400 // assume wchar == unicode 2329 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2330 cmdbuf_ptr += len;
2402 return wc; 2331 return wc & UNICODE_MASK;
2403 } 2332 }
2404 2333
2405 return NOCHAR; 2334 return NOCHAR;
2406} 2335}
2336
2337// read the next octet
2338uint32_t
2339rxvt_term::next_octet () NOTHROW
2340{
2341 return cmdbuf_ptr < cmdbuf_endp
2342 ? (unsigned char)*cmdbuf_ptr++
2343 : NOCHAR;
2344}
2345
2346static class out_of_input out_of_input;
2407 2347
2408/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2409/* 2349/*
2410 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2411 * to the command. 2351 * to the command.
2412 */ 2352 */
2413unicode_t 2353wchar_t
2414rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2355{
2416 unicode_t c = next_char (); 2356 wchar_t c = next_char ();
2417 2357
2418 if (c == NOCHAR) 2358 if (c == NOCHAR)
2419 throw out_of_input; 2359 throw out_of_input;
2420 2360
2421 return c; 2361 return c;
2422} 2362}
2423 2363
2424unicode_t 2364uint32_t
2425rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2366{
2427 unicode_t c = next_octet (); 2367 uint32_t c = next_octet ();
2428 2368
2429 if (c == NOCHAR) 2369 if (c == NOCHAR)
2430 throw out_of_input; 2370 throw out_of_input;
2431 2371
2432 return c; 2372 return c;
… …
2496 { 2436 {
2497 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2498 break; /* done = 1 */ 2438 break; /* done = 1 */
2499 } 2439 }
2500 } 2440 }
2501 2441
2502 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2503 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2504 { 2444 {
2505 done = 1; 2445 done = 1;
2506 break; 2446 break;
… …
2508 } 2448 }
2509 } 2449 }
2510 2450
2511 pclose_printer (fd); 2451 pclose_printer (fd);
2512} 2452}
2513#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2514/*}}} */ 2454/*}}} */
2515 2455
2516/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2517enum { 2457enum {
2518 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2532 case C0_ESC: 2472 case C0_ESC:
2533 process_escape_seq (); 2473 process_escape_seq ();
2534 break; 2474 break;
2535 case C0_ENQ: /* terminal Status */ 2475 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2476 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2477 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2478 else
2540 tt_write ((unsigned char *)VT100_ANS, 2479 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2480 break;
2543 case C0_BEL: /* bell */ 2481 case C0_BEL: /* bell */
2544 scr_bell (); 2482 scr_bell ();
2545 break; 2483 break;
2546 case C0_BS: /* backspace */ 2484 case C0_BS: /* backspace */
… …
2570 process_dcs_seq (); 2508 process_dcs_seq ();
2571 break; 2509 break;
2572 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
2573 process_csi_seq (); 2511 process_csi_seq ();
2574 break; 2512 break;
2575 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
2576 process_osc_seq (); 2514 process_osc_seq ();
2577 break; 2515 break;
2578#endif 2516#endif
2579 } 2517 }
2580} 2518}
… …
2645void 2583void
2646rxvt_term::process_escape_seq () 2584rxvt_term::process_escape_seq ()
2647{ 2585{
2648 unicode_t ch = cmd_getc (); 2586 unicode_t ch = cmd_getc ();
2649 2587
2650 if (PrivateModes & PrivMode_vt52) 2588 if (priv_modes & PrivMode_vt52)
2651 { 2589 {
2652 process_escape_vt52 (ch); 2590 process_escape_vt52 (ch);
2653 return; 2591 return;
2654 } 2592 }
2655 2593
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2609 break;
2672 case '+': 2610 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 2612 break;
2675#ifndef NO_FRILLS 2613#if !ENABLE_MINIMAL
2676 case '6': 2614 case '6':
2677 scr_backindex (); 2615 scr_backindex ();
2678 break; 2616 break;
2679#endif 2617#endif
2680 case '7': 2618 case '7':
2681 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
2682 break; 2620 break;
2683 case '8': 2621 case '8':
2684 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
2685 break; 2623 break;
2686#ifndef NO_FRILLS 2624#if !ENABLE_MINIMAL
2687 case '9': 2625 case '9':
2688 scr_forwardindex (); 2626 scr_forwardindex ();
2689 break; 2627 break;
2690#endif 2628#endif
2691 case '=': 2629 case '=':
… …
2701 break; 2639 break;
2702 2640
2703 /* 8.3.87: NEXT LINE */ 2641 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2642 case C1_NEL: /* ESC E */
2705 { 2643 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 2644 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 2646 }
2709 break; 2647 break;
2710 2648
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2649 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2650 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 2672 process_dcs_seq ();
2735 break; 2673 break;
2736 2674
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2676 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 2678 break; /* steal obsolete ESC [ c */
2742 2679
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 2681 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 2682 process_csi_seq ();
… …
2807rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
2808{ 2745{
2809 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
2810 unsigned int nargs, p; 2747 unsigned int nargs, p;
2811 int n, ndef; 2748 int n, ndef;
2812 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
2813 2750
2814 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
2815 arg[--nargs] = 0;
2816 2752
2817 priv = 0; 2753 priv = 0;
2818 ch = cmd_getc (); 2754 ch = cmd_getc ();
2819 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
2820 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
2821 priv = ch; 2758 priv = ch;
2822 ch = cmd_getc (); 2759 ch = cmd_getc ();
2823 } 2760 }
2824 2761
2825 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 2793 if (arg[p] == -1)
2857 arg[p] = ndef; 2794 arg[p] = ndef;
2858 2795
2859#ifdef DEBUG_CMD
2860 fprintf (stderr, "CSI ");
2861 for (p = 0; p < nargs; p++)
2862 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2863 fprintf (stderr, "%c\n", ch);
2864#endif
2865
2866 /* 2796 /*
2867 * private mode handling 2797 * private mode handling
2868 */ 2798 */
2869 if (priv) 2799 if (priv)
2870 { 2800 {
2871 switch (priv) 2801 switch (priv)
2872 { 2802 {
2873 case '>': 2803 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
2876 break; 2815 break;
2877 case '?': 2816 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 2819 break;
… …
2985 2924
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2925 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 2926 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 2927 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2928 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2929 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 2930 break;
2992 2931
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2932 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 2933 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 2934 break;
2997 2935
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2936 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 2937 process_sgr_mode (nargs, arg);
3000 break; 2938 break;
… …
3007 break; 2945 break;
3008 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3009 scr_report_position (); 2947 scr_report_position ();
3010 break; 2948 break;
3011 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 2950 if (option (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 2952 break;
3015 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 2955 break;
3018 } 2956 }
… …
3054 break; 2992 break;
3055 2993
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 2994 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 2995 if (arg[0] == 4)
3058 scr_insert_mode (0); 2996 scr_insert_mode (0);
2997 else if (arg[0] == 20)
2998 priv_modes &= ~PrivMode_LFNL;
3059 break; 2999 break;
3060 3000
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3001 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3002 if (arg[0] == 4)
3063 scr_insert_mode (1); 3003 scr_insert_mode (1);
3004 else if (arg[0] == 20)
3005 priv_modes |= PrivMode_LFNL;
3064 break; 3006 break;
3065 3007
3066 /* 3008 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3009 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3010 */
… …
3080 break; 3022 break;
3081 case CSI_75: 3023 case CSI_75:
3082 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3083 break; 3025 break;
3084 3026
3085#ifndef NO_FRILLS 3027#if !ENABLE_MINIMAL
3086 case CSI_74: 3028 case CSI_74:
3087 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3088 break; 3030 break;
3089#endif 3031#endif
3090 3032
… …
3097 break; 3039 break;
3098 } 3040 }
3099} 3041}
3100/*}}} */ 3042/*}}} */
3101 3043
3102#ifndef NO_FRILLS 3044#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3045/* ARGSUSED */
3104void 3046void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3048{
3107 int x, y; 3049 int x, y;
3108 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3109 Window wdummy; 3051 Window wdummy;
3052
3053 dLocal (Display *, dpy);
3110 3054
3111 if (nargs == 0) 3055 if (nargs == 0)
3112 return; 3056 return;
3113 3057
3114 switch (args[0]) 3058 switch (args[0])
3115 { 3059 {
3116 /* 3060 /*
3117 * commands 3061 * commands
3118 */ 3062 */
3119 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3064 XMapWindow (dpy, parent[0]);
3121 break; 3065 break;
3122 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3067 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3068 break;
3126 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3071 break;
3129 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3074 break;
3132 case 5: /* raise window */ 3075 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3134 break; 3077 break;
3135 case 6: /* lower window */ 3078 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3137 break; 3080 break;
3138 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3139 scr_touch (true); 3082 scr_touch (true);
3140 break; 3083 break;
3141 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3085 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3086 (unsigned int) (args[1] * fheight));
3144 break; 3087 break;
3145 3088
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3089 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3090 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3092 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3093 (unsigned int) (args[1] * fheight));
3151 break; 3094 break;
3152
3153 3095
3154 /* 3096 /*
3155 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3156 */ 3098 */
3157 case 11: /* report window state */ 3099 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3102 break;
3161 case 13: /* report window position */ 3103 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3109 break;
3168 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3113 break;
3172 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3116 break;
3175 case 19: /* report window size (chars) */ 3117 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3119 break;
3178 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3121 {
3181 char *s; 3122 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3125 XFree (s);
3184 } 3126 }
3185 break; 3127 break;
3186 case 21: /* report window title */ 3128 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3129 {
3189 char *s; 3130 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3133 XFree (s);
3192 } 3134 }
3193 break; 3135 break;
3194 } 3136 }
3195} 3137}
3196#endif 3138#endif
3197 3139
3198/*----------------------------------------------------------------------*/ 3140/*----------------------------------------------------------------------*/
3199/* 3141/*
3200 * get input up until STRING TERMINATOR (or BEL) 3142 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3143 * ends_how is terminator used. returned input must be free()'d
3202 */ 3144 */
3203unsigned char * 3145char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3146rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3147{
3206 unicode_t prev = 0, ch; 3148 unicode_t ch;
3149 bool seen_esc = false;
3207 unsigned int n = 0; 3150 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3151 wchar_t string[STRING_MAX];
3210 3152
3211 while ((ch = cmd_getc ()) != NOCHAR) 3153 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3154 {
3213 if (prev == C0_ESC) 3155 if (seen_esc)
3214 { 3156 {
3215 if (ch == 0x5c) /* 7bit ST */ 3157 if (ch == 0x5c) /* 7bit ST */
3216 break; 3158 break;
3217 else 3159 else
3218 return NULL; 3160 return NULL;
3219 } 3161 }
3162 else if (ch == C0_ESC)
3163 {
3164 seen_esc = true;
3165 continue;
3166 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3222 else if (ch < 0x20) 3171 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3224 3173
3225 if (n >= sizeof (string) - 1) 3174 seen_esc = false;
3175
3176 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3177 // stop at some sane length
3227 return NULL; 3178 return NULL;
3228 3179
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
3235 string[n++] = prev = ch; 3180 string[n++] = ch;
3236 } 3181 }
3237 3182
3238 string[n++] = '\0'; 3183 string[n++] = '\0';
3239 3184
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3186
3245 return s; 3187 return rxvt_wcstombs (string);
3246} 3188}
3247 3189
3248/*----------------------------------------------------------------------*/ 3190/*----------------------------------------------------------------------*/
3249/* 3191/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3192 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3193 */
3252void 3194void
3253rxvt_term::process_dcs_seq () 3195rxvt_term::process_dcs_seq ()
3254{ 3196{
3255 unsigned char *s; 3197 char *s;
3256 unicode_t eh; 3198 unicode_t eh;
3257 3199
3258 /* 3200 /*
3259 * Not handled yet 3201 * Not handled yet
3260 */ 3202 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3221 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3222 arg = arg * 10 + (ch - '0');
3281 3223
3282 if (ch == ';') 3224 if (ch == ';')
3283 { 3225 {
3284 unsigned char *s = get_to_st (eh); 3226 char *s = get_to_st (eh);
3285 3227
3286 if (s) 3228 if (s)
3287 { 3229 {
3288 process_xterm_seq (arg, (char *)s, eh); 3230 process_xterm_seq (arg, s, eh);
3289 free (s); 3231 free (s);
3290 } 3232 }
3291 } 3233 }
3292} 3234}
3293 3235
3294void 3236void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3238{
3297 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3298 { 3240 {
3299 if (Options & Opt_insecure) 3241 rgba c;
3300 { 3242 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3243
3302 PixColorsFocused[color].get (display, r, g, b); 3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3250 }
3306 else 3251 else
3307 set_window_color (color, str); 3252 set_window_color (color, str);
3308} 3253}
3309 3254
3310/* 3255/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3256 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3257 */
3335void 3258void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3259rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3260{
3338 int changed = 0;
3339 int color; 3261 int color;
3340 char *buf, *name; 3262 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3264 int saveop = op;
3265
3266 dLocal (Display *, dpy);
3342 3267
3343 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3344 switch (op) 3273 switch (op)
3345 { 3274 {
3346 case XTerm_name: 3275 case XTerm_name:
3347 set_title (str); 3276 set_title (str);
3348 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3353 set_title (str); 3282 set_title (str);
3354 break; 3283 break;
3355 case XTerm_property: 3284 case XTerm_property:
3356 if (str[0] == '?') 3285 if (str[0] == '?')
3357 { 3286 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3287 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3288 Atom actual_type;
3360 int actual_format; 3289 int actual_format;
3361 unsigned long nitems; 3290 unsigned long nitems;
3362 unsigned long bytes_after; 3291 unsigned long bytes_after;
3363 unsigned char *value = 0; 3292 unsigned char *value = 0;
3364 const char *str = ""; 3293 const char *str = "";
3365 3294
3366 if (prop 3295 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3300 && actual_type != None
3372 && actual_format == 8) 3301 && actual_format == 8)
3373 str = (const char *)(value); 3302 str = (const char *)(value);
3374 3303
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3305
3377 XFree (value); 3306 XFree (value);
3378 } 3307 }
3379 else 3308 else
3380 { 3309 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3310 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3311
3383 if (eq) 3312 if (eq)
3384 { 3313 {
3385 *eq = 0; 3314 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3315 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3316 }
3391 else 3317 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3318 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3319 display->atom (str));
3394 } 3320 }
3395 break; 3321 break;
3396 3322
3397 case XTerm_Color: 3323 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3324 for (buf = (char *)str; buf && *buf;)
3399 { 3325 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3326 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3327 break;
3402 3328
3403 *name++ = '\0'; 3329 *name++ = '\0';
3404 color = atoi (buf); 3330 color = atoi (buf) + minCOLOR;
3405 3331
3406 if (color < 0 || color >= TOTAL_COLORS) 3332 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3333 break;
3408 3334
3409 if ((buf = STRCHR (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3336 *buf++ = '\0';
3411 3337
3412 if (name[0] == '?' && !name[1]) 3338 process_color_seq (op, color, name, resp);
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3422 set_window_color (color + minCOLOR, name);
3423 } 3339 }
3424 break; 3340 break;
3425 case XTerm_Color00: 3341 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3427 break; 3343 break;
3428 case XTerm_Color01: 3344 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3430 break; 3346 break;
3431#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3350 break;
3435#endif 3351#endif
3436 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3354 break;
3439 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3357 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break;
3446 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break;
3449 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3451 break; 3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp);
3365 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp);
3369 break;
3370 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp);
3372 break;
3452#endif 3373#endif
3374#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp);
3377 {
3378 bool changed = false;
3379 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3453 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3454 case XTerm_Pixmap: 3391 case Rxvt_Pixmap:
3455 if (*str != ';') 3392 if (!strcmp (str, "?"))
3456 { 3393 {
3457#if XPM_BACKGROUND 3394 char str[256];
3458 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true);
3462 }
3463 while ((str = STRCHR (str, ';')) != NULL)
3464 {
3465 str++;
3466#if XPM_BACKGROUND
3467 changed += scale_pixmap (str);
3468#endif
3469 3395
3470 } 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3471 if (changed) 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3472 { 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3473#ifdef XPM_BACKGROUND 3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3474 resize_pixmap ();
3475#endif
3476 scr_touch (true);
3477 }
3478 break;
3479
3480 case XTerm_restoreFG:
3481 set_window_color (Color_fg, str);
3482 break;
3483 case XTerm_restoreBG:
3484 set_window_color (Color_bg, str);
3485 break;
3486
3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3489 break;
3490
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 } 3400 }
3512 else 3401 else
3513 { 3402 {
3403 int changed = 0;
3404
3405 if (*str != ';')
3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3514 set_locale (str); 3415 while (str)
3515# ifdef USE_XIM 3416 {
3516 im_cb (); 3417 str++;
3517# endif 3418 if (bgPixmap.set_geometry (str))
3419 changed++;
3420 str = strchr (str, ';');
3421 }
3422 if (changed)
3423 update_background ();
3518 } 3424 }
3519 break; 3425 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif 3426#endif
3530 3427
3531#ifdef MENUBAR 3428 case Rxvt_restoreFG:
3532 case XTerm_Menu: 3429 set_window_color (Color_fg, str);
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3430 break;
3536#endif 3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434
3435 case XTerm_logfile:
3436 // TODO, when secure mode?
3437 break;
3438
3537#if 0 3439#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3440 case Rxvt_dumpscreen: /* no error notices */
3539 { 3441 {
3540 int fd; 3442 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3443 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3444 {
3543 scr_dump (fd); 3445 scr_dump (fd);
3544 close (fd); 3446 close (fd);
3545 } 3447 }
3546 } 3448 }
3449 break;
3450#endif
3451 case XTerm_font:
3452 op = URxvt_font;
3453 case URxvt_font:
3454#if ENABLE_STYLES
3455 case URxvt_boldFont:
3456 case URxvt_italicFont:
3457 case URxvt_boldItalicFont:
3458#endif
3459 if (query)
3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3462 ? fontset[op - URxvt_font]->fontdesc : "",
3463 resp);
3464 else
3465 {
3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
3467
3468 res = strdup (str);
3469 allocated.push_back ((void *)res);
3470 set_fonts ();
3471 }
3472 break;
3473
3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3483 case URxvt_locale:
3484 if (query)
3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3486 else
3487 {
3488 set_locale (str);
3489 pty->set_utf8_mode (enc_utf8);
3490 init_xlocale ();
3491 }
3492 break;
3493
3494 case URxvt_view_up:
3495 case URxvt_view_down:
3496 {
3497 int lines = atoi (str);
3498
3499 if (lines)
3500 scr_page (op == URxvt_view_up ? UP : DN, lines);
3501 else
3502 scr_erase_savelines ();
3503 }
3504
3505 break;
3506#endif
3507
3508#if ENABLE_PERL
3509 case URxvt_perl:
3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3511 ; // no responses yet
3547 break; 3512 break;
3548#endif 3513#endif
3549 } 3514 }
3550} 3515}
3551/*----------------------------------------------------------------------*/ 3516/*----------------------------------------------------------------------*/
… …
3565{ 3530{
3566 int state; 3531 int state;
3567 3532
3568 if (mode == 's') 3533 if (mode == 's')
3569 { 3534 {
3570 SavedModes |= (PrivateModes & bit); 3535 SavedModes |= (priv_modes & bit);
3571 return -1; 3536 return -1;
3572 } 3537 }
3573 else 3538 else
3574 { 3539 {
3575 if (mode == 'r') 3540 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3541 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3542 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3543 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3544 PrivMode (state, bit);
3580 } 3545 }
3581 3546
3582 return state; 3547 return state;
3583} 3548}
3584 3549
3585/* we're not using priv _yet_ */ 3550/* we're not using priv _yet_ */
3586void 3551void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 3553{
3589 unsigned int i, j; 3554 unsigned int i, j;
3590 int state; 3555 int state;
3591 3556
3592 static const struct 3557 static const struct
3593 { 3558 {
3594 const int argval; 3559 const int argval;
3595 const unsigned long bit; 3560 const unsigned long bit;
3596 }
3597
3598 argtopriv[] = { 3561 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
3600 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
3601 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3567 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3568 { 7, PrivMode_Autowrap },
3569 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3570 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3571 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 3572 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 3573#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3574 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3575#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3576 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3577 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3578 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3579 // 45 margin bell NYI
3620 // 46 start logging 3580 // 46 start logging
… …
3622 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3623#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3624 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3625#endif 3585#endif
3626 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3627 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3628 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3629 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3631 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3632 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
3660 } 3619 }
3661 3620
3662 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3622 switch (arg[i])
3664 { 3623 {
3624#if ENABLE_STYLES
3625 case 1021:
3626 set_option (Opt_intensityStyles, mode);
3627
3628 scr_touch (true);
3629 break;
3630#endif
3665 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
3632 case 1049:
3666 if (Options & Opt_secondaryScreen) 3633 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 3634 if (mode == 0)
3668 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
3669 else if (mode == 1) 3636 else if (mode == 1)
3670 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
3671 break; 3638 break;
… …
3682 * within VT52 mode 3649 * within VT52 mode
3683 */ 3650 */
3684 PrivMode (1, PrivMode_vt52); 3651 PrivMode (1, PrivMode_vt52);
3685 break; 3652 break;
3686 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 3656 break;
3690 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
3691 if (state) 3658 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 3659 break;
3696 case 5: /* reverse video */ 3660 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
3698 break; 3662 break;
3699 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 3667 scr_autowrap (state);
3704 break; 3668 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3709 break; 3673 break;
3710#ifdef menuBar_esc
3711 case menuBar_esc:
3712#ifdef MENUBAR
3713 map_menuBar (state);
3714#endif
3715 break;
3716#endif
3717#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3718 case scrollBar_esc: 3675 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
3720 { 3677 {
3721 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
3733 break; 3690 break;
3734 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3696 break;
3740#if 0
3741 case 1001: 3697 case 1002:
3742 break; /* X11 mouse highlighting */ 3698 case 1003:
3743#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 3710 set_option (Opt_scrollTtyOutput, !state);
3749 break; 3711 break;
3750 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 3713 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 3714 break;
3756 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 3716 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 3718 scr_erase_screen (2);
3760 scr_change_screen (state); 3719 scr_change_screen (state);
3761 break; 3720 break;
3762 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 3722 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 3723 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 3725 scr_erase_screen (2);
3767 break; 3726 break;
3768 default: 3727 default:
3769 break; 3728 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 3754 rendset = 0, rendstyle = ~RS_None;
3796 break; 3755 break;
3797 case 1: 3756 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 3757 rendset = 1, rendstyle = RS_Bold;
3799 break; 3758 break;
3800 //case 2: // faint or second colour 3759 //case 2: // low intensity
3760 case 3:
3761 rendset = 1, rendstyle = RS_Italic;
3762 break;
3801 case 4: 3763 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 3764 rendset = 1, rendstyle = RS_Uline;
3803 break; 3765 break;
3804 case 5: // slowly blinking 3766 case 5: // slowly blinking
3805 case 6: // rapidly blinking 3767 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 3779 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 3780 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 3781 //...
3820 //case 19: // ninth alt font 3782 //case 19: // ninth alt font
3821 //case 20: // gothic 3783 //case 20: // gothic
3822 case 21: // disable bold, faint 3784 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 3785 rendset = 0, rendstyle = RS_Bold;
3824 break; 3786 break;
3825 case 22: 3787 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 3788 rendset = 0, rendstyle = RS_Bold;
3827 break; 3789 break;
3828 //case 23: disable italic 3790 case 23: // disable italic
3791 rendset = 0, rendstyle = RS_Italic;
3792 break;
3829 case 24: 3793 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 3794 rendset = 0, rendstyle = RS_Uline;
3831 break; 3795 break;
3832 case 25: 3796 case 25:
3797 rendset = 0, rendstyle = RS_Blink;
3798 break;
3799 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 3800 rendset = 0, rendstyle = RS_Blink;
3834 break; 3801 break;
3835 case 27: 3802 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 3803 rendset = 0, rendstyle = RS_RVid;
3837 break; 3804 break;
… …
3855 case 35: 3822 case 35:
3856 case 36: 3823 case 36:
3857 case 37: 3824 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3825 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 3826 break;
3860#ifdef TTY_256COLOR 3827 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 3828 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 3829 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3830 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 3831 i += 2;
3866 } 3832 }
3867 break; 3833 break;
3868#endif
3869 case 39: /* default fg */ 3834 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 3835 scr_color (Color_fg, Color_fg);
3871 break; 3836 break;
3872 3837
3873 case 40: 3838 case 40:
… …
3878 case 45: 3843 case 45:
3879 case 46: 3844 case 46:
3880 case 47: 3845 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3846 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 3847 break;
3883#ifdef TTY_256COLOR 3848 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 3849 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 3850 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3851 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 3852 i += 2;
3889 } 3853 }
3890 break; 3854 break;
3891#endif
3892 case 49: /* default bg */ 3855 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
3894 break; 3857 break;
3895 3858
3896#ifndef NO_BRIGHTCOLOR 3859 //case 50: // not variable spacing
3860
3861#if !ENABLE_MINIMAL
3897 case 90: 3862 case 90:
3898 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
3899 case 92: 3864 case 92:
3900 case 93: 3865 case 93:
3901 case 94: 3866 case 94:
3902 case 95: 3867 case 95:
3903 case 96: 3868 case 96:
3904 case 97: 3869 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3870 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 3871 break;
3908 case 100: 3872 case 100:
3909 case 101: /* set bright bg color */ 3873 case 101: /* set bright bg color */
3910 case 102: 3874 case 102:
3911 case 103: 3875 case 103:
3912 case 104: 3876 case 104:
3913 case 105: 3877 case 105:
3914 case 106: 3878 case 106:
3915 case 107: 3879 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3880 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 3881 break;
3919#endif 3882#endif
3920
3921 } 3883 }
3922 } 3884 }
3923} 3885}
3924/*}}} */ 3886/*}}} */
3925 3887
… …
3928rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
3929{ 3891{
3930 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
3931 3893
3932 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
3933 { /* query graphics */ 3896 /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 3898 return;
3936 } 3899 }
3937 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
3938 do 3901 do
3939 ch = cmd_getc (); 3902 ch = cmd_getc ();
… …
3949 */ 3912 */
3950void 3913void
3951rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
3952{ 3915{
3953 va_list arg_ptr; 3916 va_list arg_ptr;
3954 unsigned char buf[256]; 3917 char buf[256];
3955 3918
3956 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 3921 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 3922 tt_write (buf, strlen (buf));
3960} 3923}
3961 3924
3962/* ---------------------------------------------------------------------- */ 3925/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 3926/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 3927 * or generated by us in response to a query ESC sequence.
3965 */ 3928 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930
3966void 3931void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 3933{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
3970 3936
3971 if (len) 3937 if (pty->pty < 0)
3938 return;
3939
3940 if (v_buflen == 0)
3941 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943
3944 if ((unsigned int)written == len)
3945 return;
3946
3947 data += written;
3948 len -= written;
3972 { 3949 }
3950
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3952
3953 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len;
3955
3956 pty_ev.set (ev::READ | ev::WRITE);
3957}
3958
3959void rxvt_term::pty_write ()
3960{
3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3962
3963 if (written > 0)
3964 {
3965 v_buflen -= written;
3966
3973 if (v_buflen == 0) 3967 if (v_buflen == 0)
3974 { 3968 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 3969 free (v_buffer);
4002 v_buffer = 0; 3970 v_buffer = 0;
4003 v_buflen = 0;
4004 3971
4005 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 3973 return;
4018 } 3974 }
3975
3976 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 3977 }
3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3979 pty_ev.set (ev::READ);
4020} 3980}
4021 3981
4022/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4023 3983

Diff Legend

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