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

Diff Legend

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