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

Diff Legend

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