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

Diff Legend

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