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

Diff Legend

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