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

Diff Legend

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