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

Diff Legend

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