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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.404 by root, Sat Feb 2 15:19:55 2008 UTC

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

Diff Legend

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