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

Diff Legend

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