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

Diff Legend

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