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.107 by root, Sat Jul 31 00:01:12 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} 1002}
681 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
682void 1005void
683rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
684{ 1007{
685 SET_R (this); 1008 if (want_refresh && !flush_ev.is_active ())
686 SET_LOCALE (locale); 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
687 1010
1011 display->flush ();
1012}
1013
1014void
1015rxvt_term::flush_cb (ev::timer &w, int revents)
1016{
1017 make_current ();
1018
1019 refresh_count = 0;
688 flush (); 1020 flush ();
689} 1021}
690 1022
691#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
692void 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
693rxvt_term::cursor_blink_cb (time_watcher &w) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
694{ 1041{
695 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1043 want_refresh = 1;
697 1044 refresh_check ();
698 w.start (w.at + BLINK_INTERVAL);
699} 1045}
700#endif 1046#endif
701 1047
702#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
703void 1049void
704rxvt_term::text_blink_cb (time_watcher &w) 1050rxvt_term::text_blink_cb (ev::timer &w, int revents)
705{ 1051{
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 1053 {
708 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
709 want_refresh = 1; 1055 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1056 refresh_check ();
711 } 1057 }
1058 else
1059 w.stop ();
712} 1060}
713#endif 1061#endif
714 1062
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void 1064void
717rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
718{ 1066{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
721 { 1069 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1070 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
725 } 1072 }
1073 else
1074 w.stop ();
726} 1075}
727#endif 1076#endif
728 1077
729#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
730void 1079void
731rxvt_term::sel_scroll_cb (time_watcher &w) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
732{ 1081{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1083 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1085 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
739 } 1087 }
1088 else
1089 w.stop ();
740} 1090}
741#endif 1091#endif
742 1092
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void 1094void
745rxvt_term::slip_wheel_cb (time_watcher &w) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
746{ 1096{
747 if (mouse_slip_wheel_speed == 0 1097 if (scr_page (mouse_slip_wheel_speed))
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1098 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1099 want_refresh = 1;
753 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)
754 } 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 ();
755} 1169}
756#endif 1170#endif
757 1171
758bool 1172bool
759rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
760{ 1174{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
762 1176
763 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
764 { 1178
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
766 n = 0;
767 } 1180 {
768 1181 // normally this indicates a "too long" command sequence - just drop the data we have
769 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
772 1186
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
774 1188
775 if (n > 0) 1189 if (r > 0)
776 { 1190 {
777 cmdbuf_endp += n; 1191 cmdbuf_endp += r;
778 return true; 1192 return true;
779 } 1193 }
780 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))
781 destroy (); 1206 destroy ();
782 1207 }
1208
783 return false; 1209 return false;
784} 1210}
785 1211
786void 1212void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1213rxvt_term::pty_cb (ev::io &w, int revents)
788{ 1214{
789 SET_R (this); 1215 make_current ();
790 SET_LOCALE (locale);
791 1216
792 if (revents & EVENT_WRITE) 1217 if (revents & ev::READ)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
797 if (cmd_parse ()) 1220 cmd_parse ();
798 break;
799}
800 1221
801void 1222 if (revents & ev::WRITE)
1223 pty_write ();
1224
1225 refresh_check ();
1226}
1227
1228void ecb_cold
802rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
803{ 1230{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
805 recolour_cursor (); 1232 recolour_cursor ();
806 1233
807#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1235 hidden_pointer = 0;
809 1236
810 if (Options & Opt_pointerBlank) 1237 if (option (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
812#endif 1239#endif
813} 1240}
814 1241
815#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
816void 1243void ecb_cold
817rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
818{ 1245{
819 if (! (Options & Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
820 return; 1247 return;
821 1248
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1249 XDefineCursor (dpy, vt, display->blank_cursor);
823 XFlush (display->display); 1250 XFlush (dpy);
824 1251
825 hidden_pointer = 1; 1252 hidden_pointer = 1;
826} 1253}
827 1254
828void 1255void ecb_cold
829rxvt_term::pointer_cb (time_watcher &w) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
830{ 1257{
831 SET_R (this); 1258 make_current ();
832 SET_LOCALE (locale);
833 1259
834 pointer_blank (); 1260 pointer_blank ();
835} 1261}
836#endif 1262#endif
837 1263
838void 1264void
839rxvt_term::mouse_report (XButtonEvent &ev) 1265rxvt_term::mouse_report (XButtonEvent &ev)
840{ 1266{
841 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
842 int x, y; 1268 int x, y;
1269 int code = 32;
843 1270
844 x = ev.x; 1271 x = Pixel2Col (ev.x) + 1;
845 y = ev.y; 1272 y = Pixel2Row (ev.y) + 1;
846 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 }
847 1283
848 if (MEvent.button == AnyButton) 1284 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1285 button_number = 3;
851 }
852 else 1286 else
853 { 1287 {
854 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1290 if (button_number >= 3)
857 button_number += (64 - 3); 1291 button_number += 64 - 3;
858 } 1292 }
859 1293
860 if (PrivateModes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
861 { 1295 {
862 /* 1296 /*
863 * do not report ButtonRelease 1297 * do not report ButtonRelease
864 * no state info allowed 1298 * no state info allowed
865 */ 1299 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1314 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1315 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1316#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1317 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1318#endif
885
886 } 1319 }
887 1320
888#ifdef DEBUG_MOUSEREPORT 1321#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1322 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1323 if (key_state & 16)
891 fputc ('C', stderr); 1324 fputc ('C', stderr);
892 if (key_state & 4) 1325 if (key_state & 4)
893 fputc ('S', stderr); 1326 fputc ('S', stderr);
… …
895 fputc ('A', stderr); 1328 fputc ('A', stderr);
896 if (key_state & 32) 1329 if (key_state & 32)
897 fputc ('2', stderr); 1330 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1332 button_number,
900 x + 1, 1333 x,
901 y + 1); 1334 y);
902#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
903 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1351 code + button_number + key_state,
905 (32 + x + 1), 1352 32 + x,
906 (32 + y + 1)); 1353 32 + y);
907#endif
908} 1354}
909
910#ifdef USING_W11LIB
911void
912rxvt_W11_process_x_event (XEvent *ev)
913{
914 rxvt_t *r = rxvt_get_r ();
915
916 x_cb (*ev);
917}
918#endif
919 1355
920/*{{{ process an X event */ 1356/*{{{ process an X event */
921void 1357void ecb_hot
922rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
923{ 1359{
924 SET_R (this); 1360 make_current ();
925 SET_LOCALE (locale);
926 1361
927#if defined(CURSOR_BLINK) 1362 dLocal (Display *, dpy);
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
929 {
930 if (hidden_cursor)
931 {
932 hidden_cursor = 0;
933 want_refresh = 1;
934 }
935 1363
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1364 if (ev.xany.window == vt
937 } 1365 && SHOULD_INVOKE (HOOK_X_EVENT)
938#endif 1366 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
939
940#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 {
943 if (ev.type == MotionNotify
944 || ev.type == ButtonPress
945 || ev.type == ButtonRelease)
946 if (hidden_pointer)
947 pointer_unblank ();
948
949 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank ();
951 }
952#endif
953
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return; 1367 return;
957#endif
958 1368
1369 // for XQueryPointer
959 Window unused_root, unused_child; 1370 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1371 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1372 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011 1373
1012 switch (ev.type) 1374 switch (ev.type)
1013 { 1375 {
1014 case KeyPress: 1376 case KeyPress:
1015 lookup_key (ev.xkey); 1377 key_press (ev.xkey);
1016 break; 1378 break;
1017 1379
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease: 1380 case KeyRelease:
1020 { 1381 key_release (ev.xkey);
1021 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0;
1030 }
1031 break; 1382 break;
1032 }
1033#endif
1034 1383
1035 case ButtonPress: 1384 case ButtonPress:
1036 button_press (ev.xbutton); 1385 button_press (ev.xbutton);
1037 break; 1386 break;
1038 1387
… …
1040 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1041 break; 1390 break;
1042 1391
1043 case ClientMessage: 1392 case ClientMessage:
1044 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1394 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1046 destroy ();
1047#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink))
1053 { 1395 {
1054 /* Get Dnd data */ 1396 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1055 Atom ActualType; 1397 {
1056 int ActualFormat; 1398 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1057 unsigned char *data; 1399 {
1058 unsigned long Size, RemainingBytes; 1400 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1059 1401 {
1060 XGetWindowProperty (display->display, display->root, 1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1061 xa[XA_DNDSELECTION], 1403 destroy ();
1062 0L, 1000000L, 1404 }
1063 False, AnyPropertyType, 1405#if ENABLE_EWMH
1064 &ActualType, &ActualFormat, 1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1065 &Size, &RemainingBytes, 1407 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1066 &data); 1409 &ev);
1067 XChangeProperty (display->display, display->root, 1410#endif
1068 XA_CUT_BUFFER0, XA_STRING, 1411 }
1069 8, PropModeReplace, 1412 }
1070 data, STRLEN (data)); 1413#if ENABLE_XEMBED
1071 XFree (data); 1414 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1415 {
1073 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
1074 } 1422 }
1075#endif /* OFFIX_DND */
1076 break;
1077
1078 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping));
1080 break; 1423 break;
1081 1424
1082 /* 1425 /*
1083 * XXX: this is not the _current_ arrangement 1426 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1427 * Here's my conclusion:
… …
1103 break; 1446 break;
1104 } 1447 }
1105 break; 1448 break;
1106 1449
1107 case FocusIn: 1450 case FocusIn:
1108 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)
1109 { 1466 {
1110 TermWin.focus = 1; 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1468 ;
1112#ifdef USE_XIM 1469
1113 if (Input_Context != NULL) 1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1114 XSetICFocus (Input_Context); 1471
1115#endif 1472 bool moved = false;
1116#ifdef CURSOR_BLINK 1473#ifdef HAVE_BG_PIXMAP
1117 if (Options & Opt_cursorBlink) 1474 if (bg_window_position_sensitive ())
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 { 1475 {
1123 PixColors = PixColorsFocused; 1476 want_position_change = true;
1124 set_colorfgbg (); 1477 if (bg_img == 0)
1125 scr_clear (); 1478 moved = true;
1126 scr_touch (true);
1127 } 1479 }
1128#endif 1480#endif
1129 1481
1130 } 1482 if (want_position_change)
1131 break;
1132
1133 case FocusOut:
1134 if (TermWin.focus)
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 { 1483 {
1150 PixColors = PixColorsUnFocused; 1484 int x, y;
1151 set_colorfgbg (); 1485
1152 scr_clear (); 1486 if (ev.xconfigure.send_event)
1153 scr_touch (true); 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 }
1154 } 1501 }
1155#endif
1156 1502
1157 } 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1158 break;
1159
1160 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0])
1162 { 1504 {
1163 int height, width; 1505 seen_resize = 1;
1164 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1165 do
1166 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 } 1507 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172
1173 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1);
1177 }
1178#ifdef DEBUG_SIZE
1179 else 1508 else
1180 { 1509 {
1181 D_SIZE ((stderr, "Size: Not resizing")); 1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1182 } 1514 }
1183#endif 1515
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1185 if (Options & Opt_transparent)
1186 {
1187 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif
1192 } 1517 }
1193 break; 1518 break;
1194 1519
1520 case PropertyNotify:
1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1195 case SelectionClear: 1524 case SelectionClear:
1196 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1197 break;
1198
1199 case SelectionNotify:
1200 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor,
1202 ev.xselection.property, True);
1203 break; 1526 break;
1204 1527
1205 case SelectionRequest: 1528 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1207 break; 1530 break;
1208 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
1209 case UnmapNotify: 1551 case UnmapNotify:
1210 TermWin.mapped = 0; 1552 mapped = 0;
1211#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1213#endif 1555#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1214 break; 1557 break;
1215
1216 case MapNotify:
1217 TermWin.mapped = 1;
1218#ifdef TEXT_BLINK
1219 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1220#endif
1221 break;
1222
1223#ifdef TRANSPARENT
1224 case ReparentNotify:
1225 rootwin_cb (ev);
1226 break;
1227#endif /* TRANSPARENT */
1228 1558
1229 case GraphicsExpose: 1559 case GraphicsExpose:
1230 case Expose: 1560 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1561 if (ev.xany.window == vt)
1232 { 1562 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1563 do
1564 {
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1236#else 1567 }
1237 // I don't understand this, so I changed it :) 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571
1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1240 //scr_expose (ev.xexpose.x, 0, 1576 }
1241 // ev.xexpose.width, TermWin.height, False); 1577
1242#endif
1243 want_refresh = 1; 1578 want_refresh = 1;
1244 } 1579 }
1245 else 1580 else
1246 { 1581 {
1247 XEvent unused_event; 1582 XEvent unused_event;
1248 1583
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1250 ; 1585 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1587 ;
1253 1588
1254 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1255 { 1590 {
1256 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1257 scrollbar_show (0); 1592 scrollBar.show (0);
1258 } 1593 }
1259#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose ();
1262#endif
1263 } 1594 }
1264 break; 1595 break;
1265 1596
1266 case MotionNotify: 1597 case MotionNotify:
1267#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1268 if (hidden_pointer) 1599 if (hidden_pointer)
1269 pointer_unblank (); 1600 pointer_unblank ();
1270#endif 1601#endif
1271#if MENUBAR 1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1272 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)
1273 { 1609 {
1274 menubar_control (ev.xbutton); 1610 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1275 break; 1611 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1276 } 1612 ; // nop
1277#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1279 break;
1280
1281 if (ev.xany.window == TermWin.vt)
1282 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1613 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1614 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1615 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1286 ; 1616 ;
1287 1617
1288 XQueryPointer (display->display, TermWin.vt, 1618 XQueryPointer (dpy, vt,
1289 &unused_root, &unused_child, 1619 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1620 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1621 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1622 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1623#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1624 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1626 {
1297#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
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1636 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1637 ev.xbutton.state & Button3Mask ? 2 : 0);
1638
1300#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1642 {
1304 int dist; 1643 int dist;
1305 1644
1306 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1308 */ 1647 */
1309 if (!sel_scroll_ev.active) 1648 if (!sel_scroll_ev.is_active ())
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1649 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1311 1650
1312 /* save the event params so we can highlight 1651 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1652 * the selection in the pending-scroll loop
1314 */ 1653 */
1315 selection_save_x=ev.xbutton.x; 1654 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1655 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1656 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1657
1320 /* calc number of lines to scroll */ 1658 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1659 if (ev.xbutton.y < int_bwidth)
1322 { 1660 {
1323 scroll_selection_dir = UP; 1661 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1325 } 1663 }
1326 else 1664 else
1327 { 1665 {
1328 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1668 }
1669
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1670 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1;
1334 MIN_IT (scroll_selection_lines, 1673 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1674 SELECTION_SCROLL_MAX_LINES);
1336 } 1675 }
1337 else 1676 else
1338 { 1677 {
1339 /* we are within the text window, so we 1678 /* we are within the text window, so we
1340 * shouldn't be scrolling 1679 * shouldn't be scrolling
1341 */ 1680 */
1342 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1681 sel_scroll_ev.stop();
1344 } 1682 }
1345#endif 1683#endif
1346#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1347
1348 } 1685 }
1349#endif 1686#endif
1350
1351 } 1687 }
1352 } 1688 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1354 { 1690 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1356 MotionNotify, &ev)) ; 1692 MotionNotify, &ev))
1693 ;
1694
1357 XQueryPointer (display->display, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1358 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1698 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1699 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1701 scrollBar.size ());
1364 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1702 want_refresh = 1;
1366 scrollbar_show (1); 1703 scrollBar.show (1);
1367 } 1704 }
1368 break; 1705 break;
1369 } 1706 }
1370}
1371 1707
1372void 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
1373rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1841{
1375 SET_R (this); 1842 make_current ();
1376 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;
1377 1847
1378 switch (ev.type) 1848 switch (ev.type)
1379 { 1849 {
1380 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 */
1381 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])
1382 { 1857 {
1383 if (ev.xproperty.state == PropertyNewValue) 1858#if BG_IMAGE_FROM_ROOT
1384 selection_property (ev.xproperty.window, ev.xproperty.atom); 1859 if (option (Opt_transparent))
1385 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));
1386 } 1866 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /*
1391 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on.
1393 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396 1867
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1398 return;
1399 }
1400
1401 /* FALLTHROUGH */
1402 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1;
1405 break; 1868 break;
1406#endif
1407 } 1869 }
1870
1871 refresh_check ();
1408} 1872}
1873#endif
1409 1874
1410void 1875void
1411rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
1412{ 1877{
1413 int reportmode = 0, clickintime; 1878 int reportmode = 0, clickintime;
1414 1879
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1880 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1881
1416 if (!bypass_keystate) 1882 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1883 reportmode = !! (priv_modes & PrivMode_mouse_report);
1884
1418 /* 1885 /*
1419 * VT window processing of button press 1886 * VT window processing of button press
1420 */ 1887 */
1421 if (ev.window == TermWin.vt) 1888 if (ev.window == vt)
1422 { 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
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1902 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1903
1424 if (reportmode) 1904 if (reportmode)
1425 { 1905 {
1426 /* mouse report from vt window */ 1906 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1429#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1430 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1431 { 1911 {
1432 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1433 MEvent.clicks++; 1913 MEvent.clicks++;
1914
1434 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1435 { 1916 {
1436 /* only report double clicks */ 1917 /* only report double clicks */
1437 MEvent.clicks = 2; 1918 MEvent.clicks = 2;
1438 mouse_report (ev); 1919 mouse_report (ev);
… …
1450 mouse_report (ev); 1931 mouse_report (ev);
1451 } 1932 }
1452#else 1933#else
1453 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1454 mouse_report (ev); 1935 mouse_report (ev);
1455#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1456 1937
1457 } 1938 }
1458 else 1939 else
1459 { 1940 {
1460 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1942 MEvent.clicks = 0;
1943
1462 switch (ev.button) 1944 switch (ev.button)
1463 { 1945 {
1464 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
1465 /* allow shift+left click to extend selection */ 1955 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1956 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1467 { 1957 {
1468 if (MEvent.button == Button1 && clickintime) 1958 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1959 selection_rotate (ev.x, ev.y);
1470 else 1960 else
1471 selection_extend (ev.x, ev.y, 1); 1961 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1976 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1977 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1978 selection_rotate (ev.x, ev.y);
1489 else 1979 else
1490 selection_extend (ev.x, ev.y, 1); 1980 selection_extend (ev.x, ev.y, 1);
1981
1491 MEvent.button = Button3; 1982 MEvent.button = Button3;
1492 break; 1983 break;
1493 } 1984 }
1494 } 1985 }
1986
1495 MEvent.time = ev.time; 1987 MEvent.time = ev.time;
1496 return; 1988 return;
1497 } 1989 }
1498 1990
1499 /* 1991 /*
1500 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1501 */ 1993 */
1502 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1503 { 1995 {
1504 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;
1505 /* 2004 /*
1506 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1507 * move up if mouse is above slider 2006 * move up if mouse is above slider
1508 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1509 * 2008 *
… …
1518 /* 2017 /*
1519 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1520 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1521 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1522 */ 2021 */
1523 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1524 && scrollbarnext_upButton (ev.y))
1525 || (scrollBar.style == R_SB_RXVT
1526 && scrollbarrxvt_upButton (ev.y)))
1527 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1528 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1529 && scrollbarnext_dnButton (ev.y))
1530 || (scrollBar.style == R_SB_RXVT
1531 && scrollbarrxvt_dnButton (ev.y)))
1532 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1533 else 2026 else
1534 switch (ev.button) 2027 switch (ev.button)
1535 { 2028 {
1536 case Button2: 2029 case Button2:
… …
1543 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1544 break; 2037 break;
1545 } 2038 }
1546 } 2039 }
1547 else 2040 else
1548#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
1549
1550 {
1551 char upordown = 0;
1552
1553 if (scrollBar.style == R_SB_NEXT)
1554 { 2042 {
1555 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
1556 upordown = -1; /* up */
1557 else if (scrollbarnext_dnButton (ev.y))
1558 upordown = 1; /* down */
1559 }
1560 else if (scrollBar.style == R_SB_RXVT)
1561 {
1562 if (scrollbarrxvt_upButton (ev.y))
1563 upordown = -1; /* up */
1564 else if (scrollbarrxvt_dnButton (ev.y))
1565 upordown = 1; /* down */
1566 }
1567 if (upordown)
1568 { 2044 {
1569#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
1570 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1571#endif 2048#endif
1572 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
1573 { 2050 {
1574 if (upordown < 0) 2051 if (direction == UP)
1575 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
1576 else 2053 else
1577 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
1578 } 2055 }
1579 } 2056 }
1580 else 2057 else
1581 switch (ev.button) 2058 switch (ev.button)
1582 { 2059 {
1583 case Button2: 2060 case Button2:
1584 switch (scrollbar_align) 2061 switch (scrollBar.align)
1585 { 2062 {
1586 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
1587 csrO = 0; 2064 csrO = 0;
1588 break; 2065 break;
1589 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
1590 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
1591 break; 2068 break;
1592 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
1594 break; 2071 break;
1595 } 2072 }
2073
1596 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
1597 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1600 scrollbar_size ()); 2078
1601 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
1602 break; 2080 break;
1603 2081
1604 case Button1: 2082 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
1606 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
1607 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
1608 2086
1609 case Button3: 2087 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
1611 { 2089 {
1612 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 2092 scr_page (UP, nrow - 1);
1615# else 2093# else
1616 scr_page (UP, TermWin.nrow / 4); 2094 scr_page (UP, nrow / 4);
1617# endif 2095# endif
1618 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 2098 scr_page (DN, nrow - 1);
1621# else 2099# else
1622 scr_page (DN, TermWin.nrow / 4); 2100 scr_page (DN, nrow / 4);
1623# endif 2101# endif
1624 else 2102 else
1625 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
1626 } 2104 }
1627 else 2105 else
1628 { 2106 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 2108 (nrow
1631 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
1632 / scrollbar_size ())); 2110 / scrollBar.size ()));
1633 } 2111 }
2112
1634 break; 2113 break;
1635 } 2114 }
1636 } 2115 }
2116
1637 return; 2117 return;
1638 } 2118 }
1639#if MENUBAR
1640 /*
1641 * Menubar window processing of button press
1642 */
1643 if (isMenuBarWindow (ev.window))
1644 menubar_control (ev);
1645#endif
1646} 2119}
1647 2120
1648void 2121void
1649rxvt_term::button_release (XButtonEvent &ev) 2122rxvt_term::button_release (XButtonEvent &ev)
1650{ 2123{
1651 int reportmode = 0; 2124 int reportmode = 0;
1652 2125
1653 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2127 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2129
1657 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1658 { 2131 {
1659 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
1660 scrollbar_show (0); 2133 scrollBar.show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH;
1663#endif
1664
1665 } 2134 }
2135
1666#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
1669#endif 2138#endif
2139
1670 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1671 { 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
1672 if (reportmode) 2151 if (reportmode)
1673 { 2152 {
1674 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
1687 mouse_report (ev); 2166 mouse_report (ev);
1688 } 2167 }
1689#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
1690 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
1691 mouse_report (ev); 2170 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2172 return;
1694 } 2173 }
2174
1695 /* 2175 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2177 * when overriding mouse reporting
1698 */ 2178 */
1699 if (PrivateModes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2180 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
1703 2183
1704 switch (ev.button) 2184 switch (ev.button)
1705 { 2185 {
1706 case Button1: 2186 case Button1:
1707 case Button3: 2187 case Button3:
1708 selection_make (ev.time); 2188 selection_make (ev.time);
1709 break; 2189 break;
2190
1710 case Button2: 2191 case Button2:
1711 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);
1712 break; 2194 break;
2195
1713#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
1714 case Button4: 2197 case Button4:
1715 case Button5: 2198 case Button5:
1716 { 2199 {
1717 int i; 2200 int lines;
1718 page_dirn v; 2201 page_dirn dirn;
1719 2202
1720 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
1721 2204
1722 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
1723 i = 1; 2206 lines = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
1725 i = TermWin.nrow - 1; 2208 lines = nrow - 1;
1726 else 2209 else
1727 i = 5; 2210 lines = 5;
1728 2211
1729# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
1731 { 2214 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2216 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1735 2217
1736 if (slip_wheel_ev.at < NOW) 2218 if (!slip_wheel_ev.is_active ())
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2219 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1738
1739 slip_wheel_ev.start ();
1740 } 2220 }
1741 else 2221 else
2222# endif
1742 { 2223 {
1743# endif
1744# ifdef JUMP_MOUSE_WHEEL
1745 scr_page (v, i); 2224 scr_page (dirn, lines);
1746 scr_refresh (SMOOTH_REFRESH);
1747 scrollbar_show (1); 2225 scrollBar.show (1);
1748# else
1749 while (i--)
1750 {
1751 scr_page (v, 1);
1752 scr_refresh (SMOOTH_REFRESH);
1753 scrollbar_show (1);
1754 }
1755# endif
1756# ifdef MOUSE_SLIP_WHEELING
1757 } 2226 }
1758#endif
1759 } 2227 }
1760 break; 2228 break;
1761#endif 2229#endif
1762 } 2230 }
1763 } 2231 }
1764#ifdef MENUBAR
1765 else if (isMenuBarWindow (ev.window))
1766 menubar_control (ev);
1767#endif
1768} 2232}
1769
1770#ifdef TRANSPARENT
1771#if TINTING
1772/* shading taken from eterm-0.9.2 */
1773/* RGB 15 */
1774
1775static void
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1783 /* No saturation */
1784 for (y = h; --y >= 0;) {
1785 for (x = -w; x < 0; x++) {
1786 int r, g, b;
1787
1788 b = ((uint16_t *) ptr)[x];
1789 r = (b & 0x7c00) * rm;
1790 g = (b & 0x3e0) * gm;
1791 b = (b & 0x1f) * bm;
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1793 | ((g >> 8) & 0x3e0)
1794 | ((b >> 8) & 0x1f);
1795 }
1796 ptr += bpl;
1797 }
1798 } else {
1799 for (y = h; --y >= 0;) {
1800 for (x = -w; x < 0; x++) {
1801 int r, g, b;
1802
1803 b = ((uint16_t *) ptr)[x];
1804 r = (b & 0x7c00) * rm;
1805 g = (b & 0x3e0) * gm;
1806 b = (b & 0x1f) * bm;
1807 r |= (!(r >> 15) - 1);
1808 g |= (!(g >> 10) - 1);
1809 b |= (!(b >> 5) - 1);
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1811 | ((g >> 8) & 0x3e0)
1812 | ((b >> 8) & 0x1f);
1813 }
1814 ptr += bpl;
1815 }
1816 }
1817}
1818
1819/* RGB 16 */
1820static void
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1822{
1823 unsigned char *ptr;
1824 int x, y;
1825
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1828 /* No saturation */
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 }
1843 } else {
1844 for (y = h; --y >= 0;) {
1845 for (x = -w; x < 0; x++) {
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 }
1859 ptr += bpl;
1860 }
1861 }
1862}
1863
1864/* RGB 24 */
1865static void
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1867{
1868 unsigned char *ptr;
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 }
1896 } else {
1897 for (y = h; --y >= 0;) {
1898 for (x = -(w * 3); x < 0; x += 3) {
1899 int r, g, b;
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 }
1927 ptr += bpl;
1928 }
1929 }
1930}
1931
1932/* RGB 32 */
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002}
2003
2004#endif
2005
2006/*
2007 * Check our parents are still who we think they are.
2008 * Do transparency updates if required
2009 */
2010int
2011rxvt_term::check_our_parents ()
2012{
2013 int i, pchanged, aformat, have_pixmap, rootdepth;
2014 unsigned long nitems, bytes_after;
2015 Atom atype;
2016 unsigned char *prop = NULL;
2017 Window root, oldp, *list;
2018 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr;
2020
2021 pchanged = 0;
2022
2023 if (!(Options & Opt_transparent))
2024 return pchanged; /* Don't try any more */
2025
2026 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth;
2028
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2030
2031 if (rootdepth != wattr.depth)
2032 {
2033 if (am_transparent)
2034 {
2035 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0;
2038 }
2039
2040 return pchanged; /* Don't try any more */
2041 }
2042
2043 /* Get all X ops out of the queue so that our information is up-to-date. */
2044 XSync (display->display, False);
2045
2046 /*
2047 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that.
2050 */
2051 i = (xa[XA_XROOTPMAPID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success);
2055
2056 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success);
2061
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint])
2063 have_pixmap = 0;
2064 else
2065 {
2066 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop;
2068 XFree (prop);
2069 }
2070
2071 if (have_pixmap)
2072 {
2073 /*
2074 * Copy display->root pixmap transparency
2075 */
2076 int sx, sy, nx, ny;
2077 unsigned int nw, nh;
2078 Window cr;
2079 XImage *image;
2080 GC gc;
2081 XGCValues gcvalue;
2082
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root,
2084 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height;
2087 nx = ny = 0;
2088
2089 if (sx < 0)
2090 {
2091 nw += sx;
2092 nx = -sx;
2093 sx = 0;
2094 }
2095
2096 if (sy < 0)
2097 {
2098 nh += sy;
2099 ny = -sy;
2100 sy = 0;
2101 }
2102
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2105 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */
2110 allowedxerror = 0;
2111
2112 if (image == NULL)
2113 {
2114 if (am_transparent && am_pixmap_trans)
2115 {
2116 pchanged = 1;
2117 if (TermWin.pixmap != None)
2118 {
2119 XFreePixmap (display->display, TermWin.pixmap);
2120 TermWin.pixmap = None;
2121 }
2122 }
2123
2124 am_pixmap_trans = 0;
2125 }
2126 else
2127 {
2128 if (TermWin.pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap);
2130
2131#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint))
2133 {
2134 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade])
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm);
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2139
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 }
2151#endif
2152
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc);
2159 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap);
2161
2162 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1;
2164
2165 am_transparent = am_pixmap_trans = 1;
2166 }
2167 }
2168
2169 if (!am_pixmap_trans)
2170 {
2171 unsigned int n;
2172 /*
2173 * InheritPixmap transparency
2174 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 {
2178 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n);
2181 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183
2184 if (TermWin.parent[i] == display->root)
2185 {
2186 if (oldp != None)
2187 pchanged = 1;
2188
2189 break;
2190 }
2191
2192 if (oldp != TermWin.parent[i])
2193 pchanged = 1;
2194 }
2195
2196 n = 0;
2197
2198 if (pchanged)
2199 {
2200 for (; n < (unsigned int)i; n++)
2201 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break;
2208 }
2209 }
2210 }
2211
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2217 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */
2219 }
2220 else
2221 {
2222#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1);
2226#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++)
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2230
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1;
2233 }
2234
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None;
2237 }
2238
2239 return pchanged;
2240}
2241#endif
2242 2233
2243/*}}} */ 2234/*}}} */
2244 2235
2245bool 2236void ecb_hot
2246rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2247{ 2238{
2248 bool flag = false;
2249 unicode_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2250 unsigned char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2251 2241
2252 for (;;) 2242 for (;;)
2253 { 2243 {
2254 if (ch == NOCHAR) 2244 if (ecb_unlikely (ch == NOCHAR))
2255 { 2245 {
2256 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2257 ch = next_char (); 2247 ch = next_char ();
2258 }
2259 2248
2260 if (ch == NOCHAR) // TODO: improve 2249 if (ch == NOCHAR)
2261 break; 2250 break;
2251 }
2262 2252
2263 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))
2264 { 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
2265 /* Read a text string from the input buffer */ 2269 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2270 wchar_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2271 bool refreshnow = false;
2268 int nlines = 0; 2272 int nlines = 0;
2269 unicode_t *str = buf; 2273 wchar_t *str = buf;
2270 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2275
2273 for (;;) 2276 for (;;)
2274 { 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
2275 seq_begin = cmdbuf_ptr; 2327 seq_begin = cmdbuf_ptr;
2276 ch = next_char (); 2328 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break;
2280
2281 *str++ = ch;
2282
2283 if (ch == C0_LF)
2284 {
2285 nlines++;
2286 refresh_count++;
2287
2288 if (! (Options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2290 {
2291 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR;
2294 break;
2295 }
2296
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1)
2299 {
2300 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0;
2302 str = buf;
2303 }
2304 }
2305
2306 if (str >= buf + UBUFSIZ)
2307 {
2308 ch = NOCHAR;
2309 break;
2310 }
2311 } 2329 }
2312 2330
2331 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2313 scr_add_lines (buf, nlines, str - buf); 2333 scr_add_lines (buf, str - buf, nlines);
2314 2334
2315 /* 2335 /*
2316 * 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
2317 * 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.
2318 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2319 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2339 */
2324 if (refreshnow) 2340 if (refreshnow)
2325 { 2341 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++;
2328 else
2329 scr_refresh (refresh_type); 2342 scr_refresh ();
2343 want_refresh = 1;
2330 } 2344 }
2331
2332 } 2345 }
2333 else 2346 else
2334 { 2347 {
2335 try 2348 try
2336 { 2349 {
… …
2344 } 2357 }
2345 2358
2346 ch = NOCHAR; 2359 ch = NOCHAR;
2347 } 2360 }
2348 } 2361 }
2349
2350 return flag;
2351}
2352
2353// read the next octet
2354unicode_t
2355rxvt_term::next_octet ()
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? *cmdbuf_ptr++
2359 : NOCHAR;
2360} 2362}
2361 2363
2362// read the next character 2364// read the next character
2363unicode_t 2365wchar_t ecb_hot
2364rxvt_term::next_char () 2366rxvt_term::next_char () NOTHROW
2365{ 2367{
2366 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2367 { 2369 {
2368 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
2369 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2370 return *cmdbuf_ptr++; 2372 return *cmdbuf_ptr++;
2371 2373
2372 wchar_t wc; 2374 wchar_t wc;
2373 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);
2374 2376
2375 if (len == (size_t)-2) 2377 if (len == (size_t)-2)
2376 { 2378 {
2377 // the mbstate stores incomplete sequences. didn't know this :/ 2379 // the mbstate stores incomplete sequences. didn't know this :/
2378 cmdbuf_ptr = cmdbuf_endp; 2380 cmdbuf_ptr = cmdbuf_endp;
2379 break; 2381 break;
2380 } 2382 }
2381 2383
2382 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.
2383 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 }
2384 2391
2385 // assume wchar == unicode 2392 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
2387 return wc; 2394 return wc & UNICODE_MASK;
2388 } 2395 }
2389 2396
2390 return NOCHAR; 2397 return NOCHAR;
2391} 2398}
2392 2399
2393/* rxvt_cmd_getc () - Return next input character */ 2400// read the next octet
2394/* 2401uint32_t ecb_hot
2395 * Return the next input character after first passing any keyboard input 2402rxvt_term::next_octet () NOTHROW
2396 * to the command.
2397 */
2398unicode_t
2399rxvt_term::cmd_getc ()
2400{ 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{
2401 unicode_t c = next_char (); 2414 wchar_t c = next_char ();
2402 2415
2403 if (c == NOCHAR) 2416 if (c == NOCHAR)
2404 throw out_of_input; 2417 throw out_of_input;
2405 2418
2406 return c; 2419 return c;
2407} 2420}
2408 2421
2409unicode_t 2422uint32_t ecb_hot
2410rxvt_term::cmd_get8 () 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2411{ 2424{
2412 unicode_t c = next_octet (); 2425 uint32_t c = next_octet ();
2413 2426
2414 if (c == NOCHAR) 2427 if (c == NOCHAR)
2415 throw out_of_input; 2428 throw out_of_input;
2416 2429
2417 return c; 2430 return c;
2418} 2431}
2419 2432
2420/*{{{ print pipe */ 2433/*{{{ print pipe */
2421/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2422#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2423FILE * 2436FILE * ecb_cold
2424rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2425{ 2438{
2426 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2427 2440
2428 if (stream == NULL) 2441 if (stream == NULL)
2429 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2430 2443
2431 return stream; 2444 return stream;
2432} 2445}
2433 2446
2434int 2447int ecb_cold
2435rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2436{ 2449{
2437 fflush (stream); 2450 fflush (stream);
2438 return pclose (stream); 2451 return pclose (stream);
2439} 2452}
2440 2453
2441/* 2454/*
2442 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2443 */ 2456 */
2444void 2457void ecb_cold
2445rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2446{ 2459{
2447 int done; 2460 FILE *fd = popen_printer ();
2448 FILE *fd;
2449 2461
2450 if ((fd = popen_printer ()) == NULL) 2462 if (!fd)
2451 return; 2463 return;
2452 2464
2453 /* 2465 /*
2454 * 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
2455 * is received. 2467 * is received.
2456 */ 2468 */
2457 for (done = 0; !done;) 2469 for (int done = 0; !done; )
2458 { 2470 {
2459 unsigned char buf[8]; 2471 unsigned char buf[8];
2460 unicode_t ch; 2472 unicode_t ch;
2461 unsigned int i, len; 2473 unsigned int i, len;
2462 2474
… …
2481 { 2493 {
2482 if ((buf[len++] = cmd_getc ()) == 'i') 2494 if ((buf[len++] = cmd_getc ()) == 'i')
2483 break; /* done = 1 */ 2495 break; /* done = 1 */
2484 } 2496 }
2485 } 2497 }
2486 2498
2487 for (i = 0; i < len; i++) 2499 for (i = 0; i < len; i++)
2488 if (putc (buf[i], fd) == EOF) 2500 if (putc (buf[i], fd) == EOF)
2489 { 2501 {
2490 done = 1; 2502 done = 1;
2491 break; 2503 break;
… …
2493 } 2505 }
2494 } 2506 }
2495 2507
2496 pclose_printer (fd); 2508 pclose_printer (fd);
2497} 2509}
2498#endif /* PRINTPIPE */ 2510#endif /* PRINTPIPE */
2499/*}}} */ 2511/*}}} */
2500 2512
2501/* *INDENT-OFF* */
2502enum { 2513enum {
2503 C1_40 = 0x40, 2514 C1_40 = 0x40,
2504 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,
2505 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,
2506 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,
2507 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,
2508}; 2519};
2509/* *INDENT-ON* */
2510 2520
2511/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2512void 2522void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2524{
2515 switch (ch) 2525 switch (ch)
2516 { 2526 {
2517 case C0_ESC: 2527 case C0_ESC:
2518 process_escape_seq (); 2528 process_escape_seq ();
2519 break; 2529 break;
2520 case C0_ENQ: /* terminal Status */ 2530 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2531 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2532 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2524 else 2533 else
2525 tt_write ((unsigned char *)VT100_ANS, 2534 tt_write (VT100_ANS, strlen (VT100_ANS));
2526 (unsigned int)STRLEN (VT100_ANS));
2527 break; 2535 break;
2528 case C0_BEL: /* bell */ 2536 case C0_BEL: /* bell */
2529 scr_bell (); 2537 scr_bell ();
2530 break; 2538 break;
2531 case C0_BS: /* backspace */ 2539 case C0_BS: /* backspace */
… …
2555 process_dcs_seq (); 2563 process_dcs_seq ();
2556 break; 2564 break;
2557 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
2558 process_csi_seq (); 2566 process_csi_seq ();
2559 break; 2567 break;
2560 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
2561 process_osc_seq (); 2569 process_osc_seq ();
2562 break; 2570 break;
2563#endif 2571#endif
2564 } 2572 }
2565} 2573}
2566/*}}} */ 2574/*}}} */
2567 2575
2568 2576
2569/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2570void 2578void ecb_cold
2571rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2572{ 2580{
2573 int row, col; 2581 int row, col;
2574 2582
2575 switch (ch) 2583 switch (ch)
… …
2609 break; 2617 break;
2610 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2611 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2612 break; 2620 break;
2613 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2614 PrivMode (0, PrivMode_vt52); 2622 priv_modes &= ~PrivMode_vt52;
2615 break; 2623 break;
2616 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2617 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2618 /* unimplemented */ 2626 /* unimplemented */
2619 break; 2627 break;
… …
2625} 2633}
2626/*}}} */ 2634/*}}} */
2627 2635
2628 2636
2629/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2630void 2638void ecb_hot
2631rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2632{ 2640{
2633 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2634 2642
2635 if (PrivateModes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
2636 { 2644 {
2637 process_escape_vt52 (ch); 2645 process_escape_vt52 (ch);
2638 return; 2646 return;
2639 } 2647 }
2640 2648
2641 switch (ch) 2649 switch (ch)
2642 { 2650 {
2643 /* case 1: do_tek_mode (); break; */
2644 case '#': 2651 case '#':
2645 if (cmd_getc () == '8') 2652 if (cmd_getc () == '8')
2646 scr_E (); 2653 scr_E ();
2647 break; 2654 break;
2648 case '(': 2655 case '(':
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2662 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2663 break;
2657 case '+': 2664 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2665 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2666 break;
2660#ifndef NO_FRILLS 2667#if !ENABLE_MINIMAL
2661 case '6': 2668 case '6':
2662 scr_backindex (); 2669 scr_backindex ();
2663 break; 2670 break;
2664#endif 2671#endif
2665 case '7': 2672 case '7':
2666 scr_cursor (SAVE); 2673 scr_cursor (SAVE);
2667 break; 2674 break;
2668 case '8': 2675 case '8':
2669 scr_cursor (RESTORE); 2676 scr_cursor (RESTORE);
2670 break; 2677 break;
2671#ifndef NO_FRILLS 2678#if !ENABLE_MINIMAL
2672 case '9': 2679 case '9':
2673 scr_forwardindex (); 2680 scr_forwardindex ();
2674 break; 2681 break;
2675#endif 2682#endif
2683 // DECPAM/DECPNM
2676 case '=': 2684 case '=':
2685 priv_modes |= PrivMode_aplKP;
2686 break;
2677 case '>': 2687 case '>':
2678 PrivMode ((ch == '='), PrivMode_aplKP); 2688 priv_modes &= ~PrivMode_aplKP;
2679 break; 2689 break;
2680 2690
2681 case C1_40: 2691 case C1_40:
2682 cmd_getc (); 2692 cmd_getc ();
2683 break; 2693 break;
… …
2686 break; 2696 break;
2687 2697
2688 /* 8.3.87: NEXT LINE */ 2698 /* 8.3.87: NEXT LINE */
2689 case C1_NEL: /* ESC E */ 2699 case C1_NEL: /* ESC E */
2690 { 2700 {
2691 unicode_t nlcr[] = { C0_LF, C0_CR }; 2701 wchar_t nlcr[] = { C0_LF, C0_CR };
2692 scr_add_lines (nlcr, 1, 2); 2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2693 } 2703 }
2694 break; 2704 break;
2695 2705
2696 /* kidnapped escape sequence: Should be 8.3.48 */ 2706 /* kidnapped escape sequence: Should be 8.3.48 */
2697 case C1_ESA: /* ESC G */ 2707 case C1_ESA: /* ESC G */
2698 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 */
2699 break; 2711 break;
2700 2712
2701 /* 8.3.63: CHARACTER TABULATION SET */ 2713 /* 8.3.63: CHARACTER TABULATION SET */
2702 case C1_HTS: /* ESC H */ 2714 case C1_HTS: /* ESC H */
2703 scr_set_tab (1); 2715 scr_set_tab (1);
… …
2707 case C1_RI: /* ESC M */ 2719 case C1_RI: /* ESC M */
2708 scr_index (DN); 2720 scr_index (DN);
2709 break; 2721 break;
2710 2722
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2723 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2724 /* case C1_SS2: break; */
2713 2725
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2726 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2727 /* case C1_SS3: break; */
2716 2728
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2729 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2730 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2731 process_dcs_seq ();
2720 break; 2732 break;
2721 2733
2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2734 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2723 case C1_SCI: /* ESC Z */ 2735 case C1_SCI: /* ESC Z */
2724 tt_write ((const unsigned char *)ESCZ_ANSWER, 2736 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2725 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2726 break; /* steal obsolete ESC [ c */ 2737 break; /* steal obsolete ESC [ c */
2727 2738
2728 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2739 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2729 case C1_CSI: /* ESC [ */ 2740 case C1_CSI: /* ESC [ */
2730 process_csi_seq (); 2741 process_csi_seq ();
2731 break; 2742 break;
2732 2743
2733 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2744 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2734 case C1_OSC: /* ESC ] */ 2745 case C1_OSC: /* ESC ] */
2735 process_osc_seq (); 2746 process_osc_seq ();
2736 break; 2747 break;
2737 2748
2738 /* 8.3.106: RESET TO INITIAL STATE */ 2749 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2739 case 'c': 2750 case 'c':
2740 mbstate.reset (); 2751 mbstate.reset ();
2741 scr_poweron (); 2752 scr_poweron ();
2742 scrollbar_show (1); 2753 scrollBar.show (1);
2743 break; 2754 break;
2744 2755
2745 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2756 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2746 case 'n': 2757 case 'n':
2747 scr_charset_choose (2); 2758 scr_charset_choose (2);
… …
2754 } 2765 }
2755} 2766}
2756/*}}} */ 2767/*}}} */
2757 2768
2758/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2769/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2759/* *INDENT-OFF* */
2760enum { 2770enum {
2761 CSI_ICH = 0x40, 2771 CSI_ICH = 0x40,
2762 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,
2763 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 ,
2764 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,
… …
2767 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,
2768 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 ,
2769 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
2770}; 2780};
2771 2781
2772#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2782#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2773 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2783 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2774 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2784 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2775#define get_byte_array_bit(array, bit) \ 2785#define get_byte_array_bit(array, bit) \
2776 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2786 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2777 2787
2778const unsigned char csi_defaults[] = 2788static const unsigned char csi_defaults[] =
2779 { 2789 {
2780 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, */
2781 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, */
2782 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, */
2783 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, [, \, ], ^, _, */
2784 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, */
2785 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, */
2786 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, */
2787 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, {, |, }, ~, */
2788 }; 2798 };
2789/* *INDENT-ON* */
2790 2799
2791void 2800void ecb_hot
2792rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2793{ 2802{
2794 unicode_t ch, priv, i; 2803 unicode_t ch, priv, prev_ch, i;
2795 unsigned int nargs, p; 2804 unsigned int nargs, p;
2796 int n, ndef; 2805 int n, ndef;
2797 int arg[ESC_ARGS]; 2806 int arg[ESC_ARGS] = { };
2798 2807
2799 for (nargs = ESC_ARGS; nargs > 0;) 2808 nargs = 0;
2800 arg[--nargs] = 0;
2801 2809
2802 priv = 0; 2810 priv = 0;
2803 ch = cmd_getc (); 2811 ch = cmd_getc ();
2804 if (ch >= '<' && ch <= '?') 2812 if ((ch >= '<' && ch <= '?') || ch == '!')
2813 {
2805 { /* '<' '=' '>' '?' */ 2814 /* '<' '=' '>' '?' '!' */
2806 priv = ch; 2815 priv = ch;
2807 ch = cmd_getc (); 2816 ch = cmd_getc ();
2808 } 2817 }
2809 2818
2819 prev_ch = 0;
2810 /* read any numerical arguments */ 2820 /* read any numerical arguments */
2811 for (n = -1; ch < CSI_ICH; ) 2821 for (n = -1; ch < CSI_ICH; )
2812 { 2822 {
2813 if (isdigit (ch)) 2823 if (isdigit (ch))
2814 { 2824 {
… …
2824 n = -1; 2834 n = -1;
2825 } 2835 }
2826 else if (IS_CONTROL (ch)) 2836 else if (IS_CONTROL (ch))
2827 process_nonprinting (ch); 2837 process_nonprinting (ch);
2828 2838
2839 prev_ch = ch;
2829 ch = cmd_getc (); 2840 ch = cmd_getc ();
2830 } 2841 }
2831 2842
2832 if (ch > CSI_7F) 2843 if (ch > CSI_7F)
2833 return; 2844 return;
… …
2839 ndef = get_byte_array_bit (csi_defaults, i); 2850 ndef = get_byte_array_bit (csi_defaults, i);
2840 for (p = 0; p < nargs; p++) 2851 for (p = 0; p < nargs; p++)
2841 if (arg[p] == -1) 2852 if (arg[p] == -1)
2842 arg[p] = ndef; 2853 arg[p] = ndef;
2843 2854
2844#ifdef DEBUG_CMD
2845 fprintf (stderr, "CSI ");
2846 for (p = 0; p < nargs; p++)
2847 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2848 fprintf (stderr, "%c\n", ch);
2849#endif
2850
2851 /* 2855 /*
2852 * private mode handling 2856 * private mode handling
2853 */ 2857 */
2854 if (priv) 2858 if (priv)
2855 { 2859 {
2856 switch (priv) 2860 switch (priv)
2857 { 2861 {
2858 case '>': 2862 case '>':
2859 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 //
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2872 tt_printf ("\033[>%d;95;0c", 'U');
2873 }
2861 break; 2874 break;
2875
2862 case '?': 2876 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2877 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 2878 process_terminal_mode (ch, priv, nargs, arg);
2865 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);
2866 } 2892 }
2893 break;
2894 }
2895
2867 return; 2896 return;
2868 } 2897 }
2869 2898
2870 switch (ch) 2899 switch (ch)
2871 { 2900 {
… …
2885 } 2914 }
2886 break; 2915 break;
2887#endif 2916#endif
2888 2917
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2918 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2919 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2920 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2921 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2922 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2923 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2924 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2925 break;
2897 2926
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2927 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2928 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
2970 2999
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3000 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 3001 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 3002 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3003 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3004 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 3005 break;
2977 3006
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3007 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3008 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2980 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3009 break;
2982 3010
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3011 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3012 process_sgr_mode (nargs, arg);
2985 break; 3013 break;
… …
2992 break; 3020 break;
2993 case 6: /* CPR requested */ 3021 case 6: /* CPR requested */
2994 scr_report_position (); 3022 scr_report_position ();
2995 break; 3023 break;
2996 case 7: /* unofficial extension */ 3024 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3025 if (option (Opt_insecure))
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3026 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3027 break;
3000 case 8: /* unofficial extension */ 3028 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3029 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3030 break;
3003 } 3031 }
… …
3039 break; 3067 break;
3040 3068
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3069 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3070 if (arg[0] == 4)
3043 scr_insert_mode (0); 3071 scr_insert_mode (0);
3072 else if (arg[0] == 20)
3073 priv_modes &= ~PrivMode_LFNL;
3044 break; 3074 break;
3045 3075
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3076 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3077 if (arg[0] == 4)
3048 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]);
3049 break; 3086 break;
3050 3087
3051 /* 3088 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3089 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3090 */
… …
3065 break; 3102 break;
3066 case CSI_75: 3103 case CSI_75:
3067 scr_cursor (RESTORE); 3104 scr_cursor (RESTORE);
3068 break; 3105 break;
3069 3106
3070#ifndef NO_FRILLS 3107#if !ENABLE_MINIMAL
3071 case CSI_74: 3108 case CSI_74:
3072 process_window_ops (arg, nargs); 3109 process_window_ops (arg, nargs);
3073 break; 3110 break;
3074#endif 3111#endif
3075 3112
… …
3082 break; 3119 break;
3083 } 3120 }
3084} 3121}
3085/*}}} */ 3122/*}}} */
3086 3123
3087#ifndef NO_FRILLS 3124#if !ENABLE_MINIMAL
3088/* ARGSUSED */
3089void 3125void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3126rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3127{
3092 int x, y; 3128 int x, y;
3093 XWindowAttributes wattr; 3129 XWindowAttributes wattr;
3094 Window wdummy; 3130 Window wdummy;
3131
3132 dLocal (Display *, dpy);
3095 3133
3096 if (nargs == 0) 3134 if (nargs == 0)
3097 return; 3135 return;
3098 3136
3099 switch (args[0]) 3137 switch (args[0])
3100 { 3138 {
3101 /* 3139 /*
3102 * commands 3140 * commands
3103 */ 3141 */
3104 case 1: /* deiconify window */ 3142 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3143 XMapWindow (dpy, parent);
3106 break; 3144 break;
3107 case 2: /* iconify window */ 3145 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3146 XIconifyWindow (dpy, parent, display->screen);
3109 DefaultScreen (display->display));
3110 break; 3147 break;
3111 case 3: /* set position (pixels) */ 3148 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3149 XMoveWindow (dpy, parent, args[1], args[2]);
3113 break; 3150 break;
3114 case 4: /* set size (pixels) */ 3151 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3152 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3153 break;
3117 case 5: /* raise window */ 3154 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3155 XRaiseWindow (dpy, parent);
3119 break; 3156 break;
3120 case 6: /* lower window */ 3157 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3158 XLowerWindow (dpy, parent);
3122 break; 3159 break;
3123 case 7: /* refresh window */ 3160 case 7: /* refresh window */
3124 scr_touch (true); 3161 scr_touch (true);
3125 break; 3162 break;
3126 case 8: /* set size (chars) */ 3163 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3164 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3165 (unsigned int) (args[1] * fheight));
3129 break; 3166 break;
3130 3167
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3168 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3169 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3170 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3171 set_widthheight ((unsigned int)vt_width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3172 (unsigned int) (args[1] * fheight));
3136 break; 3173 break;
3137
3138 3174
3139 /* 3175 /*
3140 * reports - some output format copied from XTerm 3176 * reports - some output format copied from XTerm
3141 */ 3177 */
3142 case 11: /* report window state */ 3178 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3180 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3181 break;
3146 case 13: /* report window position */ 3182 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3184 XTranslateCoordinates (dpy, parent, wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3185 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3186 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3187 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3188 break;
3153 case 14: /* report window size (pixels) */ 3189 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3190 XGetWindowAttributes (dpy, parent, &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3191 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3192 break;
3157 case 18: /* report text area size (chars) */ 3193 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3194 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3195 break;
3160 case 19: /* report window size (chars) */ 3196 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3197 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3198 break;
3163 case 20: /* report icon label */ 3199 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3200 {
3166 char *s; 3201 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3202 XGetIconName (dpy, parent, &s);
3168 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);
3169 } 3205 }
3170 break; 3206 break;
3171 case 21: /* report window title */ 3207 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3208 {
3174 char *s; 3209 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3210 XFetchName (dpy, parent, &s);
3176 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);
3177 } 3213 }
3178 break; 3214 break;
3179 } 3215 }
3180} 3216}
3181#endif 3217#endif
3182 3218
3183/*----------------------------------------------------------------------*/ 3219/*----------------------------------------------------------------------*/
3184/* 3220/*
3185 * get input up until STRING TERMINATOR (or BEL) 3221 * get input up until STRING TERMINATOR (or BEL)
3186 * ends_how is terminator used. returned input must be free()'d 3222 * ends_how is terminator used. returned input must be free()'d
3187 */ 3223 */
3188unsigned char * 3224char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3225rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3226{
3191 unicode_t prev = 0, ch; 3227 unicode_t ch;
3228 bool seen_esc = false;
3192 unsigned int n = 0; 3229 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3230 wchar_t string[STRING_MAX];
3195 3231
3196 while ((ch = cmd_getc ()) != NOCHAR) 3232 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3233 {
3198 if (prev == C0_ESC) 3234 if (seen_esc)
3199 { 3235 {
3200 if (ch == 0x5c) /* 7bit ST */ 3236 if (ch == 0x5c) /* 7bit ST */
3201 break; 3237 break;
3202 else 3238 else
3203 return NULL; 3239 return NULL;
3204 } 3240 }
3241 else if (ch == C0_ESC)
3242 {
3243 seen_esc = true;
3244 continue;
3245 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3246 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3247 break;
3248 else if (ch == C0_SYN)
3249 ch = cmd_get8 ();
3207 else if (ch < 0x20) 3250 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3251 return NULL; /* other control character - exit */
3209 3252
3210 if (n >= sizeof (string) - 1) 3253 seen_esc = false;
3254
3255 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3256 // stop at some sane length
3212 return NULL; 3257 return NULL;
3213 3258
3214 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else
3220 string[n++] = prev = ch; 3259 string[n++] = ch;
3221 } 3260 }
3222 3261
3223 string[n++] = '\0'; 3262 string[n++] = '\0';
3224 3263
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3264 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3265
3230 return s; 3266 return rxvt_wcstombs (string);
3231} 3267}
3232 3268
3233/*----------------------------------------------------------------------*/ 3269/*----------------------------------------------------------------------*/
3234/* 3270/*
3235 * 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)'
3236 */ 3272 */
3237void 3273void
3238rxvt_term::process_dcs_seq () 3274rxvt_term::process_dcs_seq ()
3239{ 3275{
3240 unsigned char *s;
3241 unicode_t eh;
3242
3243 /* 3276 /*
3244 * Not handled yet 3277 * Not handled yet
3245 */ 3278 */
3279
3280 unicode_t eh;
3246 s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3247 if (s) 3282 if (s)
3248 free (s); 3283 free (s);
3249 3284
3250 return; 3285 return;
3251} 3286}
… …
3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3290 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3256 */ 3291 */
3257void 3292void
3258rxvt_term::process_osc_seq () 3293rxvt_term::process_osc_seq ()
3259{ 3294{
3260 unicode_t ch, eh;
3261 int arg; 3295 int arg;
3262 3296
3263 ch = cmd_getc (); 3297 unicode_t ch = cmd_getc ();
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3298 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3299 arg = arg * 10 + (ch - '0');
3266 3300
3267 if (ch == ';') 3301 if (ch == ';')
3268 { 3302 {
3303 unicode_t eh;
3269 unsigned char *s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3270 3305
3271 if (s) 3306 if (s)
3272 { 3307 {
3273 process_xterm_seq (arg, (char *)s, eh); 3308 process_xterm_seq (arg, s, eh);
3274 free (s); 3309 free (s);
3275 } 3310 }
3276 } 3311 }
3277} 3312}
3278 3313
3279void 3314void
3280rxvt_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)
3281{ 3316{
3282 if (str[0] == '?' && !str[1]) 3317 if (str[0] == '?' && !str[1])
3283 { 3318 {
3284 if (Options & Opt_insecure) 3319 rgba c;
3285 { 3320 pix_colors_focused[color].get (c);
3286 unsigned short r, g, b; 3321
3287 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
3288 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);
3289 }
3290 } 3328 }
3291 else 3329 else
3292 set_window_color (color, str); 3330 set_window_color (color, str);
3293} 3331}
3294 3332
3295/* 3333/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3334 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3335 */
3320void 3336void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3337rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3338{
3323 int changed = 0;
3324 int color; 3339 int color;
3325 char *buf, *name; 3340 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3341 bool query = str[0] == '?' && !str[1];
3342 int saveop = op;
3343
3344 dLocal (Display *, dpy);
3327 3345
3328 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
3329 switch (op) 3351 switch (op)
3330 { 3352 {
3331 case XTerm_name: 3353 case XTerm_name:
3332 set_title (str); 3354 set_title (str);
3333 /* FALLTHROUGH */ 3355 /* FALLTHROUGH */
… …
3338 set_title (str); 3360 set_title (str);
3339 break; 3361 break;
3340 case XTerm_property: 3362 case XTerm_property:
3341 if (str[0] == '?') 3363 if (str[0] == '?')
3342 { 3364 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3365 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3366 Atom actual_type;
3345 int actual_format; 3367 int actual_format;
3346 unsigned long nitems; 3368 unsigned long nitems;
3347 unsigned long bytes_after; 3369 unsigned long bytes_after;
3348 unsigned char *value = 0; 3370 unsigned char *value = 0;
3349 const char *str = ""; 3371 const char *str = "";
3350 3372
3351 if (prop 3373 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3374 && XGetWindowProperty (dpy, parent,
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3375 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3376 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3377 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3378 && actual_type != None
3357 && actual_format == 8) 3379 && actual_format == 8)
3358 str = (const char *)(value); 3380 str = (const char *)(value);
3359 3381
3360 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3382 tt_printf ("\033]%d;%s%c", op, str, resp);
3361 3383
3362 XFree (value); 3384 XFree (value);
3363 } 3385 }
3364 else 3386 else
3365 { 3387 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3388 char *eq = strchr (str, '=');
3367 3389
3368 if (eq) 3390 if (eq)
3369 { 3391 {
3370 *eq = 0; 3392 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3393 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3394 }
3376 else 3395 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3396 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3397 display->atom (str));
3379 } 3398 }
3380 break; 3399 break;
3381 3400
3382 case XTerm_Color: 3401 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3402 for (buf = (char *)str; buf && *buf;)
3384 { 3403 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3404 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3405 break;
3387 3406
3388 *name++ = '\0'; 3407 *name++ = '\0';
3389 color = atoi (buf); 3408 color = atoi (buf) + minCOLOR;
3390 3409
3391 if (color < 0 || color >= TOTAL_COLORS) 3410 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3392 break; 3411 break;
3393 3412
3394 if ((buf = STRCHR (name, ';')) != NULL) 3413 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3414 *buf++ = '\0';
3396 3415
3397 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 != ';')
3398 { 3497 {
3399 if (Options & Opt_insecure) 3498 try
3400 { 3499 {
3401 unsigned short r, g, b; 3500 fimage.set_file_geometry (this, str);
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3501 changed = true;
3403 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 {
3404 } 3505 }
3405 } 3506 }
3406 else 3507 else
3407 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 }
3408 } 3525 }
3409 break; 3526 break;
3410 case XTerm_Color00:
3411 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3412 break;
3413 case XTerm_Color01:
3414 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3415 break;
3416#ifndef NO_CURSORCOLOR
3417 case XTerm_Color_cursor:
3418 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3419 break;
3420#endif 3527#endif
3421 case XTerm_Color_pointer_fg:
3422 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3423 break;
3424 case XTerm_Color_pointer_bg:
3425 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3426 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break;
3431 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break;
3434 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3436 break;
3437#endif
3438
3439 case XTerm_Pixmap:
3440 if (*str != ';')
3441 {
3442#if XPM_BACKGROUND
3443 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */
3445#endif
3446 scr_touch (true);
3447 }
3448 while ((str = STRCHR (str, ';')) != NULL)
3449 {
3450 str++;
3451#if XPM_BACKGROUND
3452 changed += scale_pixmap (str);
3453#endif
3454
3455 }
3456 if (changed)
3457 {
3458#ifdef XPM_BACKGROUND
3459 resize_pixmap ();
3460#endif
3461 scr_touch (true);
3462 }
3463 break;
3464
3465 case XTerm_restoreFG:
3466 set_window_color (Color_fg, str);
3467 break;
3468 case XTerm_restoreBG:
3469 set_window_color (Color_bg, str);
3470 break;
3471 3528
3472 case XTerm_logfile: 3529 case XTerm_logfile:
3473 // TODO, when secure mode? 3530 // TODO, when secure mode?
3474 break; 3531 break;
3475 3532
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR
3517 case XTerm_Menu:
3518 if (Options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break;
3521#endif
3522#if 0 3533#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3534 case Rxvt_dumpscreen: /* no error notices */
3524 { 3535 {
3525 int fd; 3536 int fd;
3526 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)
3527 { 3538 {
3528 scr_dump (fd); 3539 scr_dump (fd);
3529 close (fd); 3540 close (fd);
3530 } 3541 }
3531 } 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));
3532 break; 3605 break;
3533#endif 3606#endif
3534 } 3607 }
3535} 3608}
3536/*----------------------------------------------------------------------*/ 3609/*----------------------------------------------------------------------*/
… …
3543 * 's' = save 3616 * 's' = save
3544 * 'r' = restore 3617 * 'r' = restore
3545 * 't' = toggle 3618 * 't' = toggle
3546 * so no need for fancy checking 3619 * so no need for fancy checking
3547 */ 3620 */
3548int 3621int ecb_cold
3549rxvt_term::privcases (int mode, unsigned long bit) 3622rxvt_term::privcases (int mode, unsigned long bit)
3550{ 3623{
3551 int state; 3624 int state;
3552 3625
3553 if (mode == 's') 3626 if (mode == 's')
3554 { 3627 {
3555 SavedModes |= (PrivateModes & bit); 3628 if (priv_modes & bit)
3629 SavedModes |= bit;
3630 else
3631 SavedModes &= ~bit;
3556 return -1; 3632 return -1;
3557 } 3633 }
3558 else 3634 else
3559 { 3635 {
3560 if (mode == 'r') 3636 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3637 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3638 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3639 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3640
3641 if (state)
3642 priv_modes |= bit;
3643 else
3644 priv_modes &= ~bit;
3565 } 3645 }
3566 3646
3567 return state; 3647 return state;
3568} 3648}
3569 3649
3570/* we're not using priv _yet_ */ 3650/* we're not using priv _yet_ */
3571void 3651void
3572rxvt_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)
3573{ 3653{
3574 unsigned int i, j; 3654 unsigned int i, j;
3575 int state; 3655 int state;
3576 3656
3577 static const struct 3657 static const struct
3578 { 3658 {
3579 const int argval; 3659 const int argval;
3580 const unsigned long bit; 3660 const unsigned long bit;
3581 }
3582
3583 argtopriv[] = { 3661 } argtopriv[] = {
3584 { 1, PrivMode_aplCUR }, 3662 { 1, PrivMode_aplCUR }, // DECCKM
3585 { 2, PrivMode_vt52 }, 3663 { 2, PrivMode_vt52 }, // DECANM
3586 { 3, PrivMode_132 }, 3664 { 3, PrivMode_132 }, // DECCOLM
3587 { 4, PrivMode_smoothScroll }, 3665 { 4, PrivMode_smoothScroll }, // DECSCLM
3588 { 5, PrivMode_rVideo }, 3666 { 5, PrivMode_rVideo }, // DECSCNM
3589 { 6, PrivMode_relOrigin }, 3667 { 6, PrivMode_relOrigin }, // DECOM
3590 { 7, PrivMode_Autowrap }, 3668 { 7, PrivMode_Autowrap }, // DECAWM
3669 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3670 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3671 // 18 end FF to printer after print screen
3593 { menuBar_esc, PrivMode_menuBar }, 3672 // 19 Print screen prints full screen/scroll region
3594#endif 3673 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3595#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3675 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3676#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3677 { 35, PrivMode_ShiftKeys }, // rxvt extension
3678 // 38, tektronix mode // DECTEK
3602 { 40, PrivMode_132OK }, 3679 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3680 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3681 // 45 margin bell NYI
3605 // 46 start logging 3682 // 46 start logging
3606 { 47, PrivMode_Screen }, 3683 { 47, PrivMode_Screen },
3607 { 66, PrivMode_aplKP }, 3684 { 66, PrivMode_aplKP }, // DECNKM
3608#ifndef NO_BACKSPACE_KEY 3685#ifndef NO_BACKSPACE_KEY
3609 { 67, PrivMode_BackSpace }, 3686 { 67, PrivMode_BackSpace }, // DECBKM
3610#endif 3687#endif
3611 { 1000, PrivMode_MouseX11 }, 3688 { 1000, PrivMode_MouseX11 },
3612 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3689 { 1002, PrivMode_MouseBtnEvent },
3613 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3690 { 1003, PrivMode_MouseAnyEvent },
3614 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3691#if ENABLE_FRILLS
3692 { 1005, PrivMode_ExtModeMouse },
3693#endif
3615 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3694 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3616 { 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
3617 // 1035 enable modifiers for alt, numlock NYI 3699 // 1035 enable modifiers for alt, numlock NYI
3618 // 1036 send ESC for meta keys NYI 3700 // 1036 send ESC for meta keys NYI
3619 // 1037 send DEL for keypad delete NYI 3701 // 1037 send DEL for keypad delete NYI
3620 { 1047, PrivMode_Screen }, 3702 { 1047, PrivMode_Screen },
3621 // 1048 save and restore cursor 3703 // 1048 save and restore cursor, implemented in code
3622 { 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 */
3623 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3705 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3706 { 2004, PrivMode_BracketPaste },
3624 }; 3707 };
3625 3708
3626 if (nargs == 0) 3709 if (nargs == 0)
3627 return; 3710 return;
3628 3711
… …
3635 for (i = 0; i < nargs; i++) 3718 for (i = 0; i < nargs; i++)
3636 { 3719 {
3637 state = -1; 3720 state = -1;
3638 3721
3639 /* basic handling */ 3722 /* basic handling */
3640 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3723 for (j = 0; j < ecb_array_length (argtopriv); j++)
3641 if (argtopriv[j].argval == arg[i]) 3724 if (argtopriv[j].argval == arg[i])
3642 { 3725 {
3643 state = privcases (mode, argtopriv[j].bit); 3726 state = privcases (mode, argtopriv[j].bit);
3644 break; 3727 break;
3645 } 3728 }
3646 3729
3647 /* extra handling for values with state unkept */ 3730 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3731 switch (arg[i])
3649 { 3732 {
3733#if ENABLE_STYLES
3734 case 1021:
3735 set_option (Opt_intensityStyles, mode);
3736
3737 scr_touch (true);
3738 break;
3739#endif
3650 case 1048: /* alternative cursor save */ 3740 case 1048: /* alternative cursor save */
3651 if (Options & Opt_secondaryScreen) 3741 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3742 if (mode == 0)
3653 scr_cursor (RESTORE); 3743 scr_cursor (RESTORE);
3654 else if (mode == 1) 3744 else if (mode == 1)
3655 scr_cursor (SAVE); 3745 scr_cursor (SAVE);
3656 break; 3746 break;
… …
3664 case 2: /* VT52 mode */ 3754 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3755 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3756 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3757 * within VT52 mode
3668 */ 3758 */
3669 PrivMode (1, PrivMode_vt52); 3759 priv_modes |= PrivMode_vt52;
3670 break; 3760 break;
3671 case 3: /* 80/132 */ 3761 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 3762 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3763 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 break; 3764 break;
3675 case 4: /* smooth scrolling */ 3765 case 4: /* smooth scrolling */
3676 if (state) 3766 set_option (Opt_jumpScroll, !state);
3677 Options &= ~Opt_jumpScroll;
3678 else
3679 Options |= Opt_jumpScroll;
3680 break; 3767 break;
3681 case 5: /* reverse video */ 3768 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 3769 scr_rvideo_mode (state);
3683 break; 3770 break;
3684 case 6: /* relative/absolute origins */ 3771 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 3775 scr_autowrap (state);
3689 break; 3776 break;
3690 /* 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 */
3691 case 9: /* X10 mouse reporting */ 3778 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 3779 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 3780 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3781 break;
3695#ifdef menuBar_esc
3696 case menuBar_esc:
3697#ifdef MENUBAR
3698 map_menuBar (state);
3699#endif
3700 break;
3701#endif
3702#ifdef scrollBar_esc 3782#ifdef scrollBar_esc
3703 case scrollBar_esc: 3783 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3784 scrollBar.map (state);
3705 {
3706 resize_all_windows (0, 0, 0); 3785 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3786 scr_touch (true);
3708 }
3709 break; 3787 break;
3710#endif 3788#endif
3711 case 25: /* visible/invisible cursor */ 3789 case 25: /* visible/invisible cursor */
3712 scr_cursor_visible (state); 3790 scr_cursor_visible (state);
3713 break; 3791 break;
… …
3718 break; 3796 break;
3719 /* case 66: - application key pad */ 3797 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 3798 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 3799 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 3800 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3802 break;
3725#if 0
3726 case 1001: 3803 case 1002:
3727 break; /* X11 mouse highlighting */ 3804 case 1003:
3728#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;
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 3817 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state)
3731 Options &= ~Opt_scrollTtyOutput;
3732 else
3733 Options |= Opt_scrollTtyOutput; 3818 set_option (Opt_scrollTtyOutput, !state);
3734 break; 3819 break;
3735 case 1011: /* scroll to bottom on key press */ 3820 case 1011: /* scroll to bottom on key press */
3736 if (state)
3737 Options |= Opt_scrollTtyKeypress; 3821 set_option (Opt_scrollTtyKeypress, state);
3738 else
3739 Options &= ~Opt_scrollTtyKeypress;
3740 break; 3822 break;
3741 case 1047: /* secondary screen w/ clearing last */ 3823 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 3824 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3825 if (!state)
3744 scr_erase_screen (2); 3826 scr_erase_screen (2);
3827
3745 scr_change_screen (state); 3828 scr_change_screen (state);
3746 break; 3829 break;
3747 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
3748 scr_change_screen (state); 3835 scr_change_screen (state);
3836
3749 if (Options & Opt_secondaryScreen) 3837 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 3838 if (state)
3751 scr_erase_screen (2); 3839 scr_erase_screen (2);
3840 else
3841 scr_cursor (RESTORE);
3752 break; 3842 break;
3753 default: 3843 default:
3754 break; 3844 break;
3755 } 3845 }
3756 } 3846 }
3757} 3847}
3758/*}}} */ 3848/*}}} */
3759 3849
3760/*{{{ process sgr sequences */ 3850/*{{{ process sgr sequences */
3761void 3851void ecb_hot
3762rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3852rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3763{ 3853{
3764 unsigned int i; 3854 unsigned int i;
3765 short rendset; 3855 short rendset;
3766 int rendstyle; 3856 int rendstyle;
… …
3780 rendset = 0, rendstyle = ~RS_None; 3870 rendset = 0, rendstyle = ~RS_None;
3781 break; 3871 break;
3782 case 1: 3872 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 3873 rendset = 1, rendstyle = RS_Bold;
3784 break; 3874 break;
3785 //case 2: // faint or second colour 3875 //case 2: // low intensity
3876 case 3:
3877 rendset = 1, rendstyle = RS_Italic;
3878 break;
3786 case 4: 3879 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 3880 rendset = 1, rendstyle = RS_Uline;
3788 break; 3881 break;
3789 case 5: // slowly blinking 3882 case 5: // slowly blinking
3790 case 6: // rapidly blinking 3883 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 3895 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 3896 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 3897 //...
3805 //case 19: // ninth alt font 3898 //case 19: // ninth alt font
3806 //case 20: // gothic 3899 //case 20: // gothic
3807 case 21: // disable bold, faint 3900 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 3901 rendset = 0, rendstyle = RS_Bold;
3809 break; 3902 break;
3810 case 22: 3903 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 3904 rendset = 0, rendstyle = RS_Bold;
3812 break; 3905 break;
3813 //case 23: disable italic 3906 case 23: // disable italic
3907 rendset = 0, rendstyle = RS_Italic;
3908 break;
3814 case 24: 3909 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 3910 rendset = 0, rendstyle = RS_Uline;
3816 break; 3911 break;
3817 case 25: 3912 case 25:
3913 rendset = 0, rendstyle = RS_Blink;
3914 break;
3915 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 3916 rendset = 0, rendstyle = RS_Blink;
3819 break; 3917 break;
3820 case 27: 3918 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 3919 rendset = 0, rendstyle = RS_RVid;
3822 break; 3920 break;
… …
3840 case 35: 3938 case 35:
3841 case 36: 3939 case 36:
3842 case 37: 3940 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3941 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 3942 break;
3845#ifdef TTY_256COLOR 3943 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 3944 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 3945 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3946 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 3947 i += 2;
3851 } 3948 }
3852 break; 3949 break;
3853#endif
3854 case 39: /* default fg */ 3950 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 3951 scr_color (Color_fg, Color_fg);
3856 break; 3952 break;
3857 3953
3858 case 40: 3954 case 40:
… …
3863 case 45: 3959 case 45:
3864 case 46: 3960 case 46:
3865 case 47: 3961 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3962 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 3963 break;
3868#ifdef TTY_256COLOR 3964 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 3965 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 3966 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3967 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 3968 i += 2;
3874 } 3969 }
3875 break; 3970 break;
3876#endif
3877 case 49: /* default bg */ 3971 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 3972 scr_color (Color_bg, Color_bg);
3879 break; 3973 break;
3880 3974
3881#ifndef NO_BRIGHTCOLOR 3975 //case 50: // not variable spacing
3976
3977#if !ENABLE_MINIMAL
3882 case 90: 3978 case 90:
3883 case 91: /* set bright fg color */ 3979 case 91: /* set bright fg color */
3884 case 92: 3980 case 92:
3885 case 93: 3981 case 93:
3886 case 94: 3982 case 94:
3887 case 95: 3983 case 95:
3888 case 96: 3984 case 96:
3889 case 97: 3985 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3986 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 3987 break;
3893 case 100: 3988 case 100:
3894 case 101: /* set bright bg color */ 3989 case 101: /* set bright bg color */
3895 case 102: 3990 case 102:
3896 case 103: 3991 case 103:
3897 case 104: 3992 case 104:
3898 case 105: 3993 case 105:
3899 case 106: 3994 case 106:
3900 case 107: 3995 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3996 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 3997 break;
3904#endif 3998#endif
3905
3906 } 3999 }
3907 } 4000 }
3908} 4001}
3909/*}}} */
3910 4002
3911/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3912void 4003void
3913rxvt_term::process_graphics () 4004rxvt_term::set_cursor_style (int style)
3914{ 4005{
3915 unicode_t ch, cmd = cmd_getc (); 4006 if (!IN_RANGE_INC (style, 0, 4))
3916
3917 if (cmd == 'Q')
3918 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */
3920 return; 4007 return;
3921 } 4008
3922 /* swallow other graphics sequences until terminating ':' */ 4009 set_option (Opt_cursorUnderline, style >= 3);
3923 do 4010
3924 ch = cmd_getc (); 4011#ifdef CURSOR_BLINK
3925 while (ch != ':'); 4012 set_option (Opt_cursorBlink, !style || (style & 1));
4013 cursor_blink_reset ();
4014#endif
4015
4016 want_refresh = 1;
3926} 4017}
3927/*}}} */ 4018/*}}} */
3928 4019
3929/* ------------------------------------------------------------------------- */ 4020/* ------------------------------------------------------------------------- */
3930 4021
… …
3934 */ 4025 */
3935void 4026void
3936rxvt_term::tt_printf (const char *fmt,...) 4027rxvt_term::tt_printf (const char *fmt,...)
3937{ 4028{
3938 va_list arg_ptr; 4029 va_list arg_ptr;
3939 unsigned char buf[256]; 4030 char buf[256];
3940 4031
3941 va_start (arg_ptr, fmt); 4032 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4033 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4034 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4035 tt_write (buf, strlen (buf));
3945} 4036}
3946 4037
3947/* ---------------------------------------------------------------------- */ 4038/* ---------------------------------------------------------------------- */
3948/* 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,
3949 * or generated by us in response to a query ESC sequence. 4040 * or generated by us in response to a query ESC sequence.
3950 */ 4041 */
4042static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4043
3951void 4044void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4045rxvt_term::tt_write (const char *data, unsigned int len)
3953{ 4046{
3954 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;
3955 4049
3956 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;
3957 { 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
3958 if (v_buflen == 0) 4082 if (v_buflen == 0)
3959 { 4083 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4084 free (v_buffer);
3987 v_buffer = 0; 4085 v_buffer = 0;
3988 v_buflen = 0;
3989 4086
3990 pty_ev.set (EVENT_READ); 4087 pty_ev.set (ev::READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4088 return;
4003 } 4089 }
4090
4091 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4092 }
4093 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4094 pty_ev.set (ev::READ);
4005} 4095}
4006 4096
4007/*----------------------- end-of-file (C source) -----------------------*/ 4097/*----------------------- end-of-file (C source) -----------------------*/
4008 4098

Diff Legend

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