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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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