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

Diff Legend

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