ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

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

Diff Legend

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