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

Diff Legend

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