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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 UTC

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

Diff Legend

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