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

Diff Legend

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