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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

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

Diff Legend

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