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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

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

Diff Legend

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