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.48 by pcg, Sat Feb 21 21:15:03 2004 UTC vs.
Revision 1.488 by sf-exg, Mon May 30 18:39:03 2011 UTC

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

Diff Legend

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