ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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