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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

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

Diff Legend

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