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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.330 by root, Mon Jun 18 12:53:25 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_count = 0;
688 flush (); 1116 flush ();
689} 1117}
690 1118
691#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
692void 1120void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
694{ 1122{
695 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1124 want_refresh = 1;
697 1125
698 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
699} 1127}
700#endif 1128#endif
701 1129
702#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
703void 1131void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1138 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 1139 }
712} 1140}
713#endif 1141#endif
714 1142
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void
1145rxvt_term::cont_scroll_cb (time_watcher &w)
1146{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1149 {
1150 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1152 }
1153}
1154#endif
1155
1156#ifdef SELECTION_SCROLLING
1157void
1158rxvt_term::sel_scroll_cb (time_watcher &w)
1159{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165 }
1166}
1167#endif
1168
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void
1171rxvt_term::slip_wheel_cb (time_watcher &w)
1172{
1173 if (mouse_slip_wheel_speed == 0
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182 }
1183}
1184#endif
1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
715bool 1211bool
716rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
717{ 1213{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1215
720 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
721 { 1217 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
723 n = 0; 1219 n = 0;
724 } 1220 }
725 1221
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
729 1225
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
731 1227
732 if (n > 0) 1228 if (r > 0)
733 { 1229 {
734 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
735 return true; 1231 return true;
736 } 1232 }
737 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
738 destroy (); 1245 destroy ();
739 1246 }
1247
740 return false; 1248 return false;
741} 1249}
742 1250
743void 1251void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1253{
746 SET_R (this); 1254 make_current ();
747 SET_LOCALE (locale);
748 1255
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1258 while (pty_fill ())
754 if (cmd_parse ()) 1259 if (cmd_parse ())
755 break; 1260 break;
1261
1262 if (revents & EVENT_WRITE)
1263 pty_write ();
1264}
1265
1266void
1267rxvt_term::pointer_unblank ()
1268{
1269 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor ();
1271
1272#ifdef POINTER_BLANK
1273 hidden_pointer = 0;
1274
1275 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay);
1277#endif
756} 1278}
757 1279
758#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
759void 1281void
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 () 1282rxvt_term::pointer_blank ()
773{ 1283{
774 if (! (Options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
775 return; 1285 return;
776 1286
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
778 XFlush (display->display); 1288 XFlush (dpy);
779 1289
780 hidden_pointer = 1; 1290 hidden_pointer = 1;
781} 1291}
782 1292
783void 1293void
784rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
785{ 1295{
786 SET_R (this); 1296 make_current ();
787 SET_LOCALE (locale);
788 1297
789 pointer_blank (); 1298 pointer_blank ();
790} 1299}
791#endif 1300#endif
792 1301
… …
799 x = ev.x; 1308 x = ev.x;
800 y = ev.y; 1309 y = ev.y;
801 pixel_position (&x, &y); 1310 pixel_position (&x, &y);
802 1311
803 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1313 button_number = 3;
806 }
807 else 1314 else
808 { 1315 {
809 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1318 if (button_number >= 3)
812 button_number += (64 - 3); 1319 button_number += (64 - 3);
813 } 1320 }
814 1321
815 if (PrivateModes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
816 { 1323 {
817 /* 1324 /*
818 * do not report ButtonRelease 1325 * do not report ButtonRelease
819 * no state info allowed 1326 * no state info allowed
820 */ 1327 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1342 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1343 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1344#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1345 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1346#endif
840
841 } 1347 }
842 1348
843#ifdef DEBUG_MOUSEREPORT 1349#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1350 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1351 if (key_state & 16)
846 fputc ('C', stderr); 1352 fputc ('C', stderr);
847 if (key_state & 4) 1353 if (key_state & 4)
848 fputc ('S', stderr); 1354 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1358 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1360 button_number,
855 x + 1, 1361 x + 1,
856 y + 1); 1362 y + 1);
857#else 1363#endif
1364
858 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
860 (32 + x + 1), 1367 (32 + x + 1),
861 (32 + y + 1)); 1368 (32 + y + 1));
862#endif
863} 1369}
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 1370
875/*{{{ process an X event */ 1371/*{{{ process an X event */
876void 1372void
877rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
878{ 1374{
879 SET_R (this); 1375 make_current ();
880 SET_LOCALE (locale);
881 1376
882#if defined(CURSOR_BLINK) 1377 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 1378
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
892 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
893#endif 1381 && 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; 1382 return;
912#endif
913 1383
1384 // for XQueryPointer
914 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1387 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 1388
967 switch (ev.type) 1389 switch (ev.type)
968 { 1390 {
969 case KeyPress: 1391 case KeyPress:
970 lookup_key (ev.xkey); 1392 key_press (ev.xkey);
971 break; 1393 break;
972 1394
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease: 1395 case KeyRelease:
975 { 1396 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; 1397 break;
987 }
988#endif
989 1398
990 case ButtonPress: 1399 case ButtonPress:
991 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
992 break; 1401 break;
993 1402
… …
995 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
996 break; 1405 break;
997 1406
998 case ClientMessage: 1407 case ClientMessage:
999 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !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 { 1410 {
1009 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1010 Atom ActualType; 1412 {
1011 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1012 unsigned char *data; 1414 {
1013 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1014 1416 {
1015 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1016 xa[XA_DNDSELECTION], 1418 destroy ();
1017 0L, 1000000L, 1419 }
1018 False, AnyPropertyType, 1420#if ENABLE_EWMH
1019 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1020 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1021 &data); 1424 &ev);
1022 XChangeProperty (display->display, display->root, 1425#endif
1023 XA_CUT_BUFFER0, XA_STRING, 1426 }
1024 8, PropModeReplace, 1427 }
1025 data, STRLEN (data)); 1428#if ENABLE_XEMBED
1026 XFree (data); 1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1430 {
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1029 } 1437 }
1030#endif /* OFFIX_DND */
1031 break; 1438 break;
1032 1439
1033 case MappingNotify: 1440 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1442 break;
1036 1443
1037 /* 1444 /*
1038 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1058 break; 1465 break;
1059 } 1466 }
1060 break; 1467 break;
1061 1468
1062 case FocusIn: 1469 case FocusIn:
1063 if (!TermWin.focus) 1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1473 focus_in ();
1474 break;
1475
1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1480 focus_out ();
1481 break;
1482
1483 case ConfigureNotify:
1484 if (ev.xconfigure.window == parent[0])
1064 { 1485 {
1065 TermWin.focus = 1; 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1487 ;
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 1488
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 {
1491 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1500 }
1501
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef TRANSPARENT
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1076 } 1508 }
1077 break; 1509 break;
1078 1510
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: 1511 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1099 { 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1100 int height, width; 1514 && ev.xproperty.state == PropertyNewValue)
1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1516
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; 1517 break;
1131 1518
1132 case SelectionClear: 1519 case SelectionClear:
1133 selection_clear (); 1520 selection_clear ();
1134 break; 1521 break;
1135 1522
1136 case SelectionNotify: 1523 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1524 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1526 break;
1141 1527
1142 case SelectionRequest: 1528 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1144 break; 1530 break;
1145 1531
1532 case MapNotify:
1533 mapped = 1;
1534#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1536#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break;
1539
1146 case UnmapNotify: 1540 case UnmapNotify:
1147 TermWin.mapped = 0; 1541 mapped = 0;
1148#ifdef TEXT_BLINK 1542#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1150#endif 1544#endif
1151 break; 1545 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; 1546 break;
1159 1547
1160#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1161 case ReparentNotify: 1549 case ReparentNotify:
1162 rootwin_cb (ev); 1550 rootwin_cb (ev);
1163 break; 1551 break;
1164#endif /* TRANSPARENT */ 1552#endif /* TRANSPARENT */
1165 1553
1166 case GraphicsExpose: 1554 case GraphicsExpose:
1167 case Expose: 1555 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1556 if (ev.xany.window == vt)
1169 { 1557 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1558 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1174 // I don't understand this, so I changed it :) 1562
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1568
1178 // ev.xexpose.width, TermWin.height, False);
1179#endif
1180 want_refresh = 1; 1569 want_refresh = 1;
1181 } 1570 }
1182 else 1571 else
1183 { 1572 {
1184 XEvent unused_event; 1573 XEvent unused_event;
1185 1574
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 ; 1576 ;
1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 ; 1578 ;
1190 1579
1191 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1192 { 1581 {
1193 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1194 scrollbar_show (0); 1583 scrollbar_show (0);
1195 } 1584 }
1196#ifdef MENUBAR 1585
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1586#ifdef TRANSPARENT
1198 menubar_expose (); 1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1199#endif 1589#endif
1200 } 1590 }
1201 break; 1591 break;
1202 1592
1203 case MotionNotify: 1593 case MotionNotify:
1204#ifdef POINTER_BLANK 1594#ifdef POINTER_BLANK
1205 if (hidden_pointer) 1595 if (hidden_pointer)
1206 pointer_unblank (); 1596 pointer_unblank ();
1207#endif 1597#endif
1208#if MENUBAR 1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1209 if (isMenuBarWindow (ev.xany.window)) 1599 break;
1600
1601 if (ev.xany.window == vt)
1210 { 1602 {
1211 menubar_control (ev.xbutton); 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1212 break; 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1213 } 1605 ; // nop
1214#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1216 break;
1217
1218 if (ev.xany.window == TermWin.vt)
1219 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1607 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1223 ; 1609 ;
1224 1610
1225 XQueryPointer (display->display, TermWin.vt, 1611 XQueryPointer (dpy, vt,
1226 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1614 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1615 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1617 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1618 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1619 {
1234#endif 1620#endif
1621#if ISO_14755
1622 // 5.4
1623 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1624 {
1625 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1626 break;
1627 }
1628#endif
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1629 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1630 ev.xbutton.state & Button3Mask ? 2 : 0);
1631
1237#ifdef SELECTION_SCROLLING 1632#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1633 if (ev.xbutton.y < int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1634 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1240 { 1635 {
1241 int dist; 1636 int dist;
1242
1243 pending_scroll_selection=1;
1244 1637
1245 /* don't clobber the current delay if we are 1638 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1639 * already in the middle of scrolling.
1247 */ 1640 */
1248 if (scroll_selection_delay<=0) 1641 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1643
1251 /* save the event params so we can highlight 1644 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1645 * the selection in the pending-scroll loop
1253 */ 1646 */
1254 selection_save_x=ev.xbutton.x; 1647 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1648 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1649 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1650
1259 /* calc number of lines to scroll */ 1651 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1652 if (ev.xbutton.y < int_bwidth)
1261 { 1653 {
1262 scroll_selection_dir = UP; 1654 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1655 dist = int_bwidth - ev.xbutton.y;
1264 } 1656 }
1265 else 1657 else
1266 { 1658 {
1267 scroll_selection_dir = DN; 1659 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y - 1660 dist = ev.xbutton.y - (int_bwidth + height);
1269 (TermWin.int_bwidth + TermWin.height);
1270 } 1661 }
1662
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1663 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1664 / SELECTION_SCROLL_LINE_SPEEDUP
1665 + 1;
1273 MIN_IT (scroll_selection_lines, 1666 min_it (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1667 SELECTION_SCROLL_MAX_LINES);
1275 } 1668 }
1276 else 1669 else
1277 { 1670 {
1278 /* we are within the text window, so we 1671 /* we are within the text window, so we
1279 * shouldn't be scrolling 1672 * shouldn't be scrolling
1280 */ 1673 */
1281 pending_scroll_selection = 0; 1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop();
1282 } 1676 }
1283#endif 1677#endif
1284#ifdef MOUSE_THRESHOLD 1678#ifdef MOUSE_THRESHOLD
1285
1286 } 1679 }
1287#endif 1680#endif
1288
1289 } 1681 }
1290 } 1682 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1684 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1294 MotionNotify, &ev)) ; 1686 MotionNotify, &ev))
1687 ;
1688
1295 XQueryPointer (display->display, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1296 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1692 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1693 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1695 scrollbar_size ());
1302 scr_refresh (refresh_type);
1303 refresh_limit = 0; 1696 want_refresh = 1;
1304 scrollbar_show (1); 1697 scrollbar_show (1);
1305 } 1698 }
1306 break; 1699 break;
1307 } 1700 }
1308}
1309 1701
1702#if defined(CURSOR_BLINK)
1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1704 {
1705 if (hidden_cursor)
1706 {
1707 hidden_cursor = 0;
1708 want_refresh = 1;
1709 }
1710
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1712 }
1713#endif
1714
1715#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 {
1718 if (ev.type == MotionNotify
1719 || ev.type == ButtonPress
1720 || ev.type == ButtonRelease)
1721 if (hidden_pointer)
1722 pointer_unblank ();
1723
1724 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank ();
1726 }
1727#endif
1728}
1729
1730void
1731rxvt_term::focus_in ()
1732{
1733 if (!focus)
1734 {
1735 focus = 1;
1736 want_refresh = 1;
1737
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM
1741 if (Input_Context != NULL)
1742 {
1743 IMSetPosition ();
1744 XSetICFocus (Input_Context);
1745 }
1746#endif
1747#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1750#endif
1751#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade])
1753 {
1754 pix_colors = pix_colors_focused;
1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif
1771 }
1772}
1773
1774void
1775rxvt_term::focus_out ()
1776{
1777 if (focus)
1778 {
1779 focus = 0;
1780 want_refresh = 1;
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783
1784#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf)
1786 {
1787 iso14755buf = 0;
1788# if ENABLE_OVERLAY
1789 scr_overlay_off ();
1790# endif
1791 }
1792#endif
1793#if USE_XIM
1794 if (Input_Context != NULL)
1795 XUnsetICFocus (Input_Context);
1796#endif
1797#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop ();
1800 hidden_cursor = 0;
1801#endif
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 pix_colors = pix_colors_unfocused;
1806 scr_recolour ();
1807 }
1808#endif
1809 }
1810}
1811
1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if TRANSPARENT || ENABLE_PERL
1310void 1826void
1311rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1828{
1313 SET_R (this); 1829 make_current ();
1314 SET_LOCALE (locale);
1315 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if TRANSPARENT
1316 switch (ev.type) 1836 switch (ev.type)
1317 { 1837 {
1318 case PropertyNotify: 1838 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1839 /*
1329 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
1330 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1331 */ 1842 */
1332 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334
1335 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1336 return; 1845 return;
1337 }
1338 1846
1339 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1340 case ReparentNotify: 1848 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1342 want_full_refresh = 1; 1850 check_our_parents ();
1343 break; 1851 break;
1852 }
1344#endif 1853# endif
1345 }
1346} 1854}
1855#endif
1347 1856
1348void 1857void
1349rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1350{ 1859{
1351 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1352 1861
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1354 if (!bypass_keystate) 1864 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1866
1356 /* 1867 /*
1357 * VT window processing of button press 1868 * VT window processing of button press
1358 */ 1869 */
1359 if (ev.window == TermWin.vt) 1870 if (ev.window == vt)
1360 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1875#if ISO_14755
1876 // 5.4
1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1878 {
1879 iso14755_54 (ev.x, ev.y);
1880 return;
1881 }
1882#endif
1883
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1884 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1885
1362 if (reportmode) 1886 if (reportmode)
1363 { 1887 {
1364 /* mouse report from vt window */ 1888 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1367#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1368 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1369 { 1893 {
1370 /* same button, within alloted time */ 1894 /* same button, within alloted time */
1371 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1372 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1373 { 1898 {
1374 /* only report double clicks */ 1899 /* only report double clicks */
1375 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1376 mouse_report (ev); 1901 mouse_report (ev);
… …
1395 } 1920 }
1396 else 1921 else
1397 { 1922 {
1398 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1925
1400 switch (ev.button) 1926 switch (ev.button)
1401 { 1927 {
1402 case Button1: 1928 case Button1:
1929 /* allow meta + click to select rectangular areas */
1930 /* should be done in screen.C */
1931#if ENABLE_FRILLS
1932 selection.rect = !!(ev.state & ModMetaMask);
1933#else
1934 selection.rect = false;
1935#endif
1936
1403 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1405 { 1939 {
1406 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1408 else 1942 else
1409 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1424 case Button3: 1958 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1427 else 1961 else
1428 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1963
1429 MEvent.button = Button3; 1964 MEvent.button = Button3;
1430 break; 1965 break;
1431 } 1966 }
1432 } 1967 }
1968
1433 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1434 return; 1970 return;
1435 } 1971 }
1436 1972
1437 /* 1973 /*
… …
1503 upordown = 1; /* down */ 2039 upordown = 1; /* down */
1504 } 2040 }
1505 if (upordown) 2041 if (upordown)
1506 { 2042 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 2045#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 2046 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 2047 {
1512 if (upordown < 0) 2048 if (upordown < 0)
1513 scrollBar.setUp (); 2049 scrollBar.setUp ();
… …
1529 break; 2065 break;
1530 case R_SB_ALIGN_BOTTOM: 2066 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
1532 break; 2068 break;
1533 } 2069 }
2070
1534 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 2072 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 2073 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 2075
1539 scrollBar.setMotion (); 2076 scrollBar.setMotion ();
1540 break; 2077 break;
1541 2078
1542 case Button1: 2079 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2080 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1547 case Button3: 2084 case Button3:
1548 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != R_SB_XTERM)
1549 { 2086 {
1550 if (scrollbar_above_slider (ev.y)) 2087 if (scrollbar_above_slider (ev.y))
1551# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
1552 scr_page (UP, TermWin.nrow - 1); 2089 scr_page (UP, nrow - 1);
1553# else 2090# else
1554 scr_page (UP, TermWin.nrow / 4); 2091 scr_page (UP, nrow / 4);
1555# endif 2092# endif
1556 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollbar_below_slider (ev.y))
1557# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
1558 scr_page (DN, TermWin.nrow - 1); 2095 scr_page (DN, nrow - 1);
1559# else 2096# else
1560 scr_page (DN, TermWin.nrow / 4); 2097 scr_page (DN, nrow / 4);
1561# endif 2098# endif
1562 else 2099 else
1563 scrollBar.setMotion (); 2100 scrollBar.setMotion ();
1564 } 2101 }
1565 else 2102 else
1566 { 2103 {
1567 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 2105 (nrow
1569 * scrollbar_position (ev.y) 2106 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 2107 / scrollbar_size ()));
1571 } 2108 }
2109
1572 break; 2110 break;
1573 } 2111 }
1574 } 2112 }
2113
1575 return; 2114 return;
1576 } 2115 }
1577#if MENUBAR
1578 /*
1579 * Menubar window processing of button press
1580 */
1581 if (isMenuBarWindow (ev.window))
1582 menubar_control (ev);
1583#endif
1584} 2116}
1585 2117
1586void 2118void
1587rxvt_term::button_release (XButtonEvent &ev) 2119rxvt_term::button_release (XButtonEvent &ev)
1588{ 2120{
1589 int reportmode = 0; 2121 int reportmode = 0;
1590 2122
1591 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 2124 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 2126
1595 if (scrollbar_isUpDn ()) 2127 if (scrollbar_isUpDn ())
1596 { 2128 {
1597 scrollBar.setIdle (); 2129 scrollBar.setIdle ();
1598 scrollbar_show (0); 2130 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH;
1601#endif
1602
1603 } 2131 }
2132
1604#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop();
1606#endif 2136#endif
2137
1607 if (ev.window == TermWin.vt) 2138 if (ev.window == vt)
1608 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
2143#if ISO_14755
2144 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return;
2147#endif
2148
1609 if (reportmode) 2149 if (reportmode)
1610 { 2150 {
1611 /* mouse report from vt window */ 2151 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 2153 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 2167 MEvent.button = AnyButton;
1628 mouse_report (ev); 2168 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 2169#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 2170 return;
1631 } 2171 }
2172
1632 /* 2173 /*
1633 * dumb hack to compensate for the failure of click-and-drag 2174 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 2175 * when overriding mouse reporting
1635 */ 2176 */
1636 if (PrivateModes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2178 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
1640 2181
1641 switch (ev.button) 2182 switch (ev.button)
1642 { 2183 {
1643 case Button1: 2184 case Button1:
1644 case Button3: 2185 case Button3:
1645 selection_make (ev.time); 2186 selection_make (ev.time);
1646 break; 2187 break;
2188
1647 case Button2: 2189 case Button2:
1648 selection_request (ev.time, ev.x, ev.y); 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1649 break; 2192 break;
2193
1650#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
1651 case Button4: 2195 case Button4:
1652 case Button5: 2196 case Button5:
1653 { 2197 {
1654 int i; 2198 int i;
1655 page_dirn v; 2199 page_dirn v;
1656 2200
1657 v = (ev.button == Button4) ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2202
1658 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
1659 i = 1; 2204 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
1661 i = TermWin.nrow - 1; 2206 i = nrow - 1;
1662 else 2207 else
1663 i = 5; 2208 i = 5;
2209
1664# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2211 if (ev.state & ControlMask)
1666 { 2212 {
1667 mouse_slip_wheel_speed += (v ? -1 : 1); 2213 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216
2217 if (slip_wheel_ev.at < NOW)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2219
2220 slip_wheel_ev.start ();
2221 }
2222 else
2223 {
2224# endif
2225 scr_page (v, i);
2226 scrollbar_show (1);
2227# ifdef MOUSE_SLIP_WHEELING
1669 } 2228 }
1670# endif 2229# endif
1671# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1);
1679 scr_refresh (SMOOTH_REFRESH);
1680 scrollbar_show (1);
1681 }
1682# endif
1683
1684 } 2230 }
1685 break; 2231 break;
1686#endif 2232#endif
1687
1688 }
1689 }
1690#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev);
1693#endif
1694}
1695
1696#ifdef TRANSPARENT
1697#if TINTING
1698/* shading taken from eterm-0.9.2 */
1699/* RGB 15 */
1700
1701static void
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1709 /* No saturation */
1710 for (y = h; --y >= 0;) {
1711 for (x = -w; x < 0; x++) {
1712 int r, g, b;
1713
1714 b = ((uint16_t *) ptr)[x];
1715 r = (b & 0x7c00) * rm;
1716 g = (b & 0x3e0) * gm;
1717 b = (b & 0x1f) * bm;
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1719 | ((g >> 8) & 0x3e0)
1720 | ((b >> 8) & 0x1f);
1721 }
1722 ptr += bpl;
1723 }
1724 } else {
1725 for (y = h; --y >= 0;) {
1726 for (x = -w; x < 0; x++) {
1727 int r, g, b;
1728
1729 b = ((uint16_t *) ptr)[x];
1730 r = (b & 0x7c00) * rm;
1731 g = (b & 0x3e0) * gm;
1732 b = (b & 0x1f) * bm;
1733 r |= (!(r >> 15) - 1);
1734 g |= (!(g >> 10) - 1);
1735 b |= (!(b >> 5) - 1);
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1737 | ((g >> 8) & 0x3e0)
1738 | ((b >> 8) & 0x1f);
1739 }
1740 ptr += bpl;
1741 }
1742 }
1743}
1744
1745/* RGB 16 */
1746static void
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 24 */
1791static void
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 }
1822 } else {
1823 for (y = h; --y >= 0;) {
1824 for (x = -(w * 3); x < 0; x += 3) {
1825 int r, g, b;
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 }
1853 ptr += bpl;
1854 }
1855 }
1856}
1857
1858/* RGB 32 */
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928}
1929
1930#endif
1931
1932/*
1933 * Check our parents are still who we think they are.
1934 * Do transparency updates if required
1935 */
1936int
1937rxvt_term::check_our_parents ()
1938{
1939 int i, pchanged, aformat, have_pixmap, rootdepth;
1940 unsigned long nitems, bytes_after;
1941 Atom atype;
1942 unsigned char *prop = NULL;
1943 Window root, oldp, *list;
1944 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr;
1946
1947 pchanged = 0;
1948
1949 if (!(Options & Opt_transparent))
1950 return pchanged; /* Don't try any more */
1951
1952 XGetWindowAttributes (display->display, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth;
1954
1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1956
1957 if (rootdepth != wattr.depth)
1958 {
1959 if (am_transparent)
1960 { 2233 }
1961 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0;
1964 }
1965
1966 return pchanged; /* Don't try any more */
1967 }
1968
1969 /* Get all X ops out of the queue so that our information is up-to-date. */
1970 XSync (display->display, False);
1971
1972 /*
1973 * Make the frame window set by the window manager have
1974 * the root background. Some window managers put multiple nested frame
1975 * windows for each client, so we have to take care about that.
1976 */
1977 i = (xa[XA_XROOTPMAPID]
1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1980 &nitems, &bytes_after, &prop) == Success);
1981
1982 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success);
1987
1988 if (!i || prop == NULL)
1989 have_pixmap = 0;
1990 else
1991 { 2234 }
1992 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop;
1994 XFree (prop);
1995 }
1996
1997 if (have_pixmap)
1998 {
1999 /*
2000 * Copy display->root pixmap transparency
2001 */
2002 int sx, sy, nx, ny;
2003 unsigned int nw, nh;
2004 Window cr;
2005 XImage *image;
2006 GC gc;
2007 XGCValues gcvalue;
2008
2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2010 0, 0, &sx, &sy, &cr);
2011 nw = (unsigned int)szHint.width;
2012 nh = (unsigned int)szHint.height;
2013 nx = ny = 0;
2014
2015 if (sx < 0)
2016 {
2017 nw += sx;
2018 nx = -sx;
2019 sx = 0;
2020 }
2021
2022 if (sy < 0)
2023 {
2024 nh += sy;
2025 ny = -sy;
2026 sy = 0;
2027 }
2028
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */
2036 allowedxerror = 0;
2037
2038 if (image == NULL)
2039 {
2040 if (am_transparent && am_pixmap_trans)
2041 {
2042 pchanged = 1;
2043 if (TermWin.pixmap != None)
2044 {
2045 XFreePixmap (display->display, TermWin.pixmap);
2046 TermWin.pixmap = None;
2047 }
2048 }
2049
2050 am_pixmap_trans = 0;
2051 }
2052 else
2053 {
2054 if (TermWin.pixmap != None)
2055 XFreePixmap (display->display, TermWin.pixmap);
2056
2057#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint))
2059 {
2060 unsigned short shade, rm, gm, bm;
2061
2062 PixColors[Color_tint].get (display, rm, gm, bm);
2063
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 }
2075#endif
2076
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2078 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc);
2083 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2085 TermWin.pixmap);
2086
2087 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1;
2089
2090 am_transparent = am_pixmap_trans = 1;
2091 }
2092 }
2093
2094 if (!am_pixmap_trans)
2095 {
2096 unsigned int n;
2097 /*
2098 * InheritPixmap transparency
2099 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2102 {
2103 oldp = TermWin.parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2105 &TermWin.parent[i], &list, &n);
2106 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108
2109 if (TermWin.parent[i] == display->root)
2110 {
2111 if (oldp != None)
2112 pchanged = 1;
2113
2114 break;
2115 }
2116
2117 if (oldp != TermWin.parent[i])
2118 pchanged = 1;
2119 }
2120
2121 n = 0;
2122
2123 if (pchanged)
2124 {
2125 for (; n < (unsigned int)i; n++)
2126 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2128 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2129 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2132 break;
2133 }
2134 }
2135 }
2136
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2138 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2142 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */
2144 }
2145 else
2146 {
2147#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1);
2151#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++)
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2155
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2157 am_transparent = 1;
2158 }
2159
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None;
2162 }
2163
2164 return pchanged;
2165} 2235}
2166#endif
2167 2236
2168/*}}} */ 2237/*}}} */
2169 2238
2170bool 2239bool
2171rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2172{ 2241{
2173 bool flag = false; 2242 bool flag = false;
2174 unicode_t ch = NOCHAR; 2243 wchar_t ch = NOCHAR;
2175 unsigned char *seq_begin; // remember start of esc-sequence here 2244 char *seq_begin; // remember start of esc-sequence here
2176 2245
2177 for (;;) 2246 for (;;)
2178 { 2247 {
2179 if (ch == NOCHAR) 2248 if (ch == NOCHAR)
2180 { 2249 {
2181 seq_begin = cmdbuf_ptr; 2250 seq_begin = cmdbuf_ptr;
2182 ch = next_char (); 2251 ch = next_char ();
2183 }
2184 2252
2185 if (ch == NOCHAR) // TODO: improve 2253 if (ch == NOCHAR)
2186 break; 2254 break;
2255 }
2187 2256
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 { 2258 {
2259 if (!seen_input)
2260 {
2261 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs
2265 // then sometimes get the size wrong.
2266 // unfortunately other programs are even more buggy and dislike
2267 // being sent SIGWINCH, so only do it when we were in fact being
2268 // resized.
2269 if (seen_resize && cmd_pid)
2270 kill (-cmd_pid, SIGWINCH);
2271 }
2272
2190 /* Read a text string from the input buffer */ 2273 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2274 wchar_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2275 bool refreshnow = false;
2193 int nlines = 0; 2276 int nlines = 0;
2194 unicode_t *str = buf; 2277 wchar_t *str = buf;
2195 2278 wchar_t *eol = str + min (ncol, UBUFSIZ);
2196 *str++ = ch;
2197 2279
2198 for (;;) 2280 for (;;)
2199 { 2281 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2283 break;
2284
2285 *str++ = ch;
2286
2287 if (ch == C0_LF || str >= eol)
2288 {
2289 if (ch == C0_LF)
2290 nlines++;
2291
2292 refresh_count++;
2293
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 {
2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + .1)
2299 {
2300 refreshnow = true;
2301 ch = NOCHAR;
2302 break;
2303 }
2304 }
2305
2306 // scr_add_lines only works for nlines <= nrow - 1.
2307 if (nlines >= nrow - 1)
2308 {
2309 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2310 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2311 scr_add_lines (buf, str - buf, nlines);
2312
2313 nlines = 0;
2314 str = buf;
2315 eol = str + min (ncol, UBUFSIZ);
2316 }
2317
2318 if (str >= eol)
2319 {
2320 if (eol >= buf + UBUFSIZ)
2321 {
2322 ch = NOCHAR;
2323 break;
2324 }
2325 else
2326 eol = min (eol + ncol, buf + UBUFSIZ);
2327 }
2328
2329 }
2330
2200 seq_begin = cmdbuf_ptr; 2331 seq_begin = cmdbuf_ptr;
2201 ch = next_char (); 2332 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break;
2205
2206 *str++ = ch;
2207
2208 if (ch == C0_LF)
2209 {
2210 nlines++;
2211 refresh_count++;
2212
2213 if (! (Options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2215 {
2216 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR;
2219 break;
2220 }
2221
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1)
2224 {
2225 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0;
2227 str = buf;
2228 }
2229 }
2230
2231 if (str >= buf + UBUFSIZ)
2232 {
2233 ch = NOCHAR;
2234 break;
2235 }
2236 } 2333 }
2237 2334
2335 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2238 scr_add_lines (buf, nlines, str - buf); 2337 scr_add_lines (buf, str - buf, nlines);
2239 2338
2240 /* 2339 /*
2241 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2244 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2343 */
2249 if (refreshnow) 2344 if (refreshnow)
2250 { 2345 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 flag = true;
2252 refresh_limit++;
2253 else
2254 scr_refresh (refresh_type); 2347 scr_refresh ();
2348 want_refresh = 1;
2255 } 2349 }
2256 2350
2257 } 2351 }
2258 else 2352 else
2259 { 2353 {
… …
2274 2368
2275 return flag; 2369 return flag;
2276} 2370}
2277 2371
2278// read the next character 2372// read the next character
2279unicode_t 2373wchar_t
2280rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2281{ 2375{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2283 { 2377 {
2284 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2285 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2286 return *cmdbuf_ptr++; 2380 return *cmdbuf_ptr++;
2287 2381
2288 wchar_t wc; 2382 wchar_t wc;
2289 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2290 2384
2291 if (len == (size_t)-2) 2385 if (len == (size_t)-2)
2292 { 2386 {
2293 // the mbstate stores incomplete sequences. didn't know this :/ 2387 // the mbstate stores incomplete sequences. didn't know this :/
2294 cmdbuf_ptr = cmdbuf_endp; 2388 cmdbuf_ptr = cmdbuf_endp;
2295 break; 2389 break;
2296 } 2390 }
2297 2391
2298 if (len == (size_t)-1) 2392 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300 2394
2301 // assume wchar == unicode 2395 // assume wchar == unicode
2302 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2303 return wc; 2397 return wc & UNICODE_MASK;
2304 } 2398 }
2305 2399
2306 return NOCHAR; 2400 return NOCHAR;
2307} 2401}
2402
2403// read the next octet
2404uint32_t
2405rxvt_term::next_octet () NOTHROW
2406{
2407 return cmdbuf_ptr < cmdbuf_endp
2408 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR;
2410}
2411
2412static class out_of_input out_of_input;
2308 2413
2309/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2310/* 2415/*
2311 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2312 * to the command. 2417 * to the command.
2313 */ 2418 */
2314unicode_t 2419wchar_t
2315rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2316{ 2421{
2317 unicode_t c = next_char (); 2422 wchar_t c = next_char ();
2423
2424 if (c == NOCHAR)
2425 throw out_of_input;
2426
2427 return c;
2428}
2429
2430uint32_t
2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2432{
2433 uint32_t c = next_octet ();
2318 2434
2319 if (c == NOCHAR) 2435 if (c == NOCHAR)
2320 throw out_of_input; 2436 throw out_of_input;
2321 2437
2322 return c; 2438 return c;
… …
2386 { 2502 {
2387 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2388 break; /* done = 1 */ 2504 break; /* done = 1 */
2389 } 2505 }
2390 } 2506 }
2391 2507
2392 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2393 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2394 { 2510 {
2395 done = 1; 2511 done = 1;
2396 break; 2512 break;
… …
2422 case C0_ESC: 2538 case C0_ESC:
2423 process_escape_seq (); 2539 process_escape_seq ();
2424 break; 2540 break;
2425 case C0_ENQ: /* terminal Status */ 2541 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 2542 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2543 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2429 else 2544 else
2430 tt_write ((unsigned char *)VT100_ANS, 2545 tt_write (VT100_ANS, strlen (VT100_ANS));
2431 (unsigned int)STRLEN (VT100_ANS));
2432 break; 2546 break;
2433 case C0_BEL: /* bell */ 2547 case C0_BEL: /* bell */
2434 scr_bell (); 2548 scr_bell ();
2435 break; 2549 break;
2436 case C0_BS: /* backspace */ 2550 case C0_BS: /* backspace */
… …
2452 break; 2566 break;
2453 case C0_SI: /* shift in - acs */ 2567 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 2568 scr_charset_choose (0);
2455 break; 2569 break;
2456 2570
2571#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 2572 // 8-bit controls
2458 case 0x90: /* DCS */ 2573 case 0x90: /* DCS */
2459 process_dcs_seq (); 2574 process_dcs_seq ();
2460 break; 2575 break;
2461 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
2462 process_csi_seq (); 2577 process_csi_seq ();
2463 break; 2578 break;
2464 case 0x9d: /* CSI */ 2579 case 0x9d: /* CSI */
2465 process_osc_seq (); 2580 process_osc_seq ();
2466 break; 2581 break;
2582#endif
2467 } 2583 }
2468} 2584}
2469/*}}} */ 2585/*}}} */
2470 2586
2471 2587
… …
2533void 2649void
2534rxvt_term::process_escape_seq () 2650rxvt_term::process_escape_seq ()
2535{ 2651{
2536 unicode_t ch = cmd_getc (); 2652 unicode_t ch = cmd_getc ();
2537 2653
2538 if (PrivateModes & PrivMode_vt52) 2654 if (priv_modes & PrivMode_vt52)
2539 { 2655 {
2540 process_escape_vt52 (ch); 2656 process_escape_vt52 (ch);
2541 return; 2657 return;
2542 } 2658 }
2543 2659
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 2675 break;
2560 case '+': 2676 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 2678 break;
2563#ifndef NO_FRILLS 2679#if !ENABLE_MINIMAL
2564 case '6': 2680 case '6':
2565 scr_backindex (); 2681 scr_backindex ();
2566 break; 2682 break;
2567#endif 2683#endif
2568 case '7': 2684 case '7':
2569 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
2570 break; 2686 break;
2571 case '8': 2687 case '8':
2572 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
2573 break; 2689 break;
2574#ifndef NO_FRILLS 2690#if !ENABLE_MINIMAL
2575 case '9': 2691 case '9':
2576 scr_forwardindex (); 2692 scr_forwardindex ();
2577 break; 2693 break;
2578#endif 2694#endif
2579 case '=': 2695 case '=':
… …
2589 break; 2705 break;
2590 2706
2591 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
2592 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
2593 { 2709 {
2594 unicode_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
2595 scr_add_lines (nlcr, 1, 2); 2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2596 } 2712 }
2597 break; 2713 break;
2598 2714
2599 /* kidnapped escape sequence: Should be 8.3.48 */ 2715 /* kidnapped escape sequence: Should be 8.3.48 */
2600 case C1_ESA: /* ESC G */ 2716 case C1_ESA: /* ESC G */
… …
2622 process_dcs_seq (); 2738 process_dcs_seq ();
2623 break; 2739 break;
2624 2740
2625 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2626 case C1_SCI: /* ESC Z */ 2742 case C1_SCI: /* ESC Z */
2627 tt_write ((const unsigned char *)ESCZ_ANSWER, 2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2628 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2629 break; /* steal obsolete ESC [ c */ 2744 break; /* steal obsolete ESC [ c */
2630 2745
2631 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2632 case C1_CSI: /* ESC [ */ 2747 case C1_CSI: /* ESC [ */
2633 process_csi_seq (); 2748 process_csi_seq ();
… …
2742 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
2743 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
2744 if (arg[p] == -1) 2859 if (arg[p] == -1)
2745 arg[p] = ndef; 2860 arg[p] = ndef;
2746 2861
2747#ifdef DEBUG_CMD
2748 fprintf (stderr, "CSI ");
2749 for (p = 0; p < nargs; p++)
2750 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2751 fprintf (stderr, "%c\n", ch);
2752#endif
2753
2754 /* 2862 /*
2755 * private mode handling 2863 * private mode handling
2756 */ 2864 */
2757 if (priv) 2865 if (priv)
2758 { 2866 {
2759 switch (priv) 2867 switch (priv)
2760 { 2868 {
2761 case '>': 2869 case '>':
2762 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
2871 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do).
2878 //
2763 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2879 tt_printf ("\033[>%d;94;0c", 'U');
2880 }
2764 break; 2881 break;
2765 case '?': 2882 case '?':
2766 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2767 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
2768 break; 2885 break;
… …
2873 2990
2874 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2991 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2875 arg[0] = -arg[0]; 2992 arg[0] = -arg[0];
2876 /* FALLTHROUGH */ 2993 /* FALLTHROUGH */
2877 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2994 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2995 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2879 break; 2996 break;
2880 2997
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2998 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 2999 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2883 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3000 break;
2885 3001
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3002 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3003 process_sgr_mode (nargs, arg);
2888 break; 3004 break;
… …
2895 break; 3011 break;
2896 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
2897 scr_report_position (); 3013 scr_report_position ();
2898 break; 3014 break;
2899 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3016 if (option (Opt_insecure))
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3018 break;
2903 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3021 break;
2906 } 3022 }
… …
2942 break; 3058 break;
2943 3059
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3060 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3061 if (arg[0] == 4)
2946 scr_insert_mode (0); 3062 scr_insert_mode (0);
3063 else if (arg[0] == 20)
3064 priv_modes &= ~PrivMode_LFNL;
2947 break; 3065 break;
2948 3066
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3067 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3068 if (arg[0] == 4)
2951 scr_insert_mode (1); 3069 scr_insert_mode (1);
3070 else if (arg[0] == 20)
3071 priv_modes |= PrivMode_LFNL;
2952 break; 3072 break;
2953 3073
2954 /* 3074 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3075 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3076 */
… …
2968 break; 3088 break;
2969 case CSI_75: 3089 case CSI_75:
2970 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
2971 break; 3091 break;
2972 3092
2973#ifndef NO_FRILLS 3093#if !ENABLE_MINIMAL
2974 case CSI_74: 3094 case CSI_74:
2975 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
2976 break; 3096 break;
2977#endif 3097#endif
2978 3098
… …
2985 break; 3105 break;
2986 } 3106 }
2987} 3107}
2988/*}}} */ 3108/*}}} */
2989 3109
2990#ifndef NO_FRILLS 3110#if !ENABLE_MINIMAL
2991/* ARGSUSED */ 3111/* ARGSUSED */
2992void 3112void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3114{
2995 int x, y; 3115 int x, y;
2996 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
2997 Window wdummy; 3117 Window wdummy;
3118
3119 dLocal (Display *, dpy);
2998 3120
2999 if (nargs == 0) 3121 if (nargs == 0)
3000 return; 3122 return;
3001 3123
3002 switch (args[0]) 3124 switch (args[0])
3003 { 3125 {
3004 /* 3126 /*
3005 * commands 3127 * commands
3006 */ 3128 */
3007 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3008 XMapWindow (display->display, TermWin.parent[0]); 3130 XMapWindow (dpy, parent[0]);
3009 break; 3131 break;
3010 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3011 XIconifyWindow (display->display, TermWin.parent[0], 3133 XIconifyWindow (dpy, parent[0], display->screen);
3012 DefaultScreen (display->display));
3013 break; 3134 break;
3014 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3015 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3016 break; 3137 break;
3017 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3018 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3019 break; 3140 break;
3020 case 5: /* raise window */ 3141 case 5: /* raise window */
3021 XRaiseWindow (display->display, TermWin.parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3022 break; 3143 break;
3023 case 6: /* lower window */ 3144 case 6: /* lower window */
3024 XLowerWindow (display->display, TermWin.parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3025 break; 3146 break;
3026 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3027 scr_touch (true); 3148 scr_touch (true);
3028 break; 3149 break;
3029 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3151 set_widthheight ((unsigned int) (args[2] * fwidth),
3031 (unsigned int) (args[1] * TermWin.fheight)); 3152 (unsigned int) (args[1] * fheight));
3032 break; 3153 break;
3033 3154
3034 //case 9: NYI, TODO, restore maximized window or maximize window 3155 //case 9: NYI, TODO, restore maximized window or maximize window
3035 default: 3156 default:
3036 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3037 set_widthheight ((unsigned int)TermWin.width, 3158 set_widthheight ((unsigned int)width,
3038 (unsigned int) (args[1] * TermWin.fheight)); 3159 (unsigned int) (args[1] * fheight));
3039 break; 3160 break;
3040
3041 3161
3042 /* 3162 /*
3043 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3044 */ 3164 */
3045 case 11: /* report window state */ 3165 case 11: /* report window state */
3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3048 break; 3168 break;
3049 case 13: /* report window position */ 3169 case 13: /* report window position */
3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3052 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3053 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3054 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3055 break; 3175 break;
3056 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3059 break; 3179 break;
3060 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3062 break; 3182 break;
3063 case 19: /* report window size (chars) */ 3183 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3065 break; 3185 break;
3066 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3187 {
3069 char *s; 3188 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3191 XFree (s);
3072 } 3192 }
3073 break; 3193 break;
3074 case 21: /* report window title */ 3194 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3195 {
3077 char *s; 3196 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3199 XFree (s);
3080 } 3200 }
3081 break; 3201 break;
3082 } 3202 }
3083} 3203}
3084#endif 3204#endif
3085 3205
3086/*----------------------------------------------------------------------*/ 3206/*----------------------------------------------------------------------*/
3087/* 3207/*
3088 * get input up until STRING TERMINATOR (or BEL) 3208 * get input up until STRING TERMINATOR (or BEL)
3089 * ends_how is terminator used. returned input must be free()'d 3209 * ends_how is terminator used. returned input must be free()'d
3090 */ 3210 */
3091unsigned char * 3211char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3212rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3213{
3094 int seen_esc = 0; /* seen escape? */ 3214 unicode_t ch;
3215 bool seen_esc = false;
3095 unsigned int n = 0; 3216 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3217 wchar_t string[STRING_MAX];
3099 3218
3100 while ((ch = cmd_getc ())) 3219 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3220 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3221 if (seen_esc)
3222 {
3106 if (ch == 0x5c) /* 7bit ST */ 3223 if (ch == 0x5c) /* 7bit ST */
3107 break; 3224 break;
3108 else 3225 else
3109 return NULL; 3226 return NULL;
3110 3227 }
3111 if (ch == C0_ESC) 3228 else if (ch == C0_ESC)
3112 { 3229 {
3113 seen_esc = 1; 3230 seen_esc = true;
3114 continue; 3231 continue;
3115 } 3232 }
3233 else if (ch == C0_BEL || ch == CHAR_ST)
3234 break;
3116 else if (ch == C0_HT) 3235 else if (ch == C0_SYN)
3117 ch = ' '; /* translate '\t' to space */ 3236 ch = cmd_get8 ();
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) 3237 else if (ch < 0x20)
3119 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3120 3239
3121 if (n >= sizeof (string) - 1) 3240 seen_esc = false;
3241
3242 if (n >= STRING_MAX - 1)
3122 // stop at some sane length 3243 // stop at some sane length
3123 return NULL; 3244 return NULL;
3124 3245
3125 string[n++] = ch; 3246 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3247 }
3128 3248
3129 string[n++] = '\0'; 3249 string[n++] = '\0';
3130 3250
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3252
3136 return s; 3253 return rxvt_wcstombs (string);
3137} 3254}
3138 3255
3139/*----------------------------------------------------------------------*/ 3256/*----------------------------------------------------------------------*/
3140/* 3257/*
3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3142 */ 3259 */
3143void 3260void
3144rxvt_term::process_dcs_seq () 3261rxvt_term::process_dcs_seq ()
3145{ 3262{
3146 unsigned char *s; 3263 char *s;
3147 unicode_t eh; 3264 unicode_t eh;
3148 3265
3149 /* 3266 /*
3150 * Not handled yet 3267 * Not handled yet
3151 */ 3268 */
… …
3170 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3171 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3172 3289
3173 if (ch == ';') 3290 if (ch == ';')
3174 { 3291 {
3175 unsigned char *s = get_to_st (eh); 3292 char *s = get_to_st (eh);
3176 3293
3177 if (s) 3294 if (s)
3178 { 3295 {
3179 process_xterm_seq (arg, (char *)s, eh); 3296 process_xterm_seq (arg, s, eh);
3180 free (s); 3297 free (s);
3181 } 3298 }
3182 } 3299 }
3183} 3300}
3184 3301
3185void 3302void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3187{ 3304{
3188 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3189 { 3306 {
3190 if (Options & Opt_insecure) 3307 rgba c;
3191 { 3308 pix_colors_focused[color].get (c);
3192 unsigned short r, g, b; 3309
3193 PixColors[color].get (display, r, g, b); 3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3195 }
3196 } 3316 }
3197 else 3317 else
3198 set_window_color (color, str); 3318 set_window_color (color, str);
3199} 3319}
3200 3320
3201/* 3321/*
3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3203 * 0 = change iconName/title
3204 * 1 = change iconName
3205 * 2 = change title
3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
3209 * 12 = change text color
3210 * 13 = change mouse foreground color
3211 * 17 = change highlight character colour
3212 * 18 = change bold character color
3213 * 19 = change underlined character color
3214 * 46 = change logfile (not implemented)
3215 * 50 = change font
3216 *
3217 * rxvt extensions:
3218 * 20 = bg pixmap
3219 * 39 = change default fg color
3220 * 49 = change default bg color
3221 * 55 = dump scrollback buffer and all of screen
3222 * 701 = change locale
3223 * 702 = find font
3224 * 703 = menu
3225 */ 3323 */
3226void 3324void
3227rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3228{ 3326{
3229 int changed = 0;
3230 int color; 3327 int color;
3231 char *buf, *name; 3328 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3330 int saveop = op;
3331
3332 dLocal (Display *, dpy);
3233 3333
3234 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3235 switch (op) 3339 switch (op)
3236 { 3340 {
3237 case XTerm_name: 3341 case XTerm_name:
3238 set_title (str); 3342 set_title (str);
3239 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3244 set_title (str); 3348 set_title (str);
3245 break; 3349 break;
3246 case XTerm_property: 3350 case XTerm_property:
3247 if (str[0] == '?') 3351 if (str[0] == '?')
3248 { 3352 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3353 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3354 Atom actual_type;
3251 int actual_format; 3355 int actual_format;
3252 unsigned long nitems; 3356 unsigned long nitems;
3253 unsigned long bytes_after; 3357 unsigned long bytes_after;
3254 unsigned char *value = 0; 3358 unsigned char *value = 0;
3255 const char *str = ""; 3359 const char *str = "";
3256 3360
3257 if (prop 3361 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None 3366 && actual_type != None
3263 && actual_format == 8) 3367 && actual_format == 8)
3264 str = (const char *)(value); 3368 str = (const char *)(value);
3265 3369
3266 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3267 3371
3268 XFree (value); 3372 XFree (value);
3269 } 3373 }
3270 else 3374 else
3271 { 3375 {
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3377
3274 if (eq) 3378 if (eq)
3275 { 3379 {
3276 *eq = 0; 3380 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 3381 set_utf8_property (display->atom (str), eq + 1);
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 } 3382 }
3282 else 3383 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 3384 XDeleteProperty (dpy, parent[0],
3284 display->atom (str)); 3385 display->atom (str));
3285 } 3386 }
3286 break; 3387 break;
3287 3388
3288 case XTerm_Color: 3389 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 3390 for (buf = (char *)str; buf && *buf;)
3290 { 3391 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 3392 if ((name = strchr (buf, ';')) == NULL)
3292 break; 3393 break;
3293 3394
3294 *name++ = '\0'; 3395 *name++ = '\0';
3295 color = atoi (buf); 3396 color = atoi (buf) + minCOLOR;
3296 3397
3297 if (color < 0 || color >= TOTAL_COLORS) 3398 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3298 break; 3399 break;
3299 3400
3300 if ((buf = STRCHR (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 3402 *buf++ = '\0';
3302 3403
3303 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3304 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 }
3312 else
3313 set_window_color (color + minCOLOR, name);
3314 } 3405 }
3315 break; 3406 break;
3316 case XTerm_Color00: 3407 case XTerm_Color00:
3317 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3318 break; 3409 break;
3319 case XTerm_Color01: 3410 case XTerm_Color01:
3320 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3321 break; 3412 break;
3322#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3323 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3324 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3325 break; 3416 break;
3326#endif 3417#endif
3327 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3328 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3329 break; 3420 break;
3330 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3331 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3332 break; 3423 break;
3333#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3334 case XTerm_Color_BD:
3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3336 break;
3337 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break;
3340 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3342 break; 3427 break;
3428 case Rxvt_Color_BD:
3429 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp);
3431 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp);
3435 break;
3436 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp);
3438 break;
3343#endif 3439#endif
3440#if TRANSPARENT && TINTING
3441 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp);
3344 3443
3444 check_our_parents ();
3445
3446 if (am_transparent)
3447 want_full_refresh = want_refresh = 1;
3448
3449 break;
3450#endif
3451
3345 case XTerm_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3346 if (*str != ';') 3454 if (*str != ';')
3347 { 3455 {
3348#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3349 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3351#endif
3352 scr_touch (true); 3459 scr_touch (true);
3460#endif
3353 } 3461 }
3462
3463 int changed = 0;
3464
3354 while ((str = STRCHR (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3355 { 3466 {
3356 str++; 3467 str++;
3357#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3359#endif 3470#endif
3360
3361 } 3471 }
3472
3362 if (changed) 3473 if (changed)
3363 { 3474 {
3364#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3365 resize_pixmap (); 3476 resize_pixmap ();
3366#endif
3367 scr_touch (true); 3477 scr_touch (true);
3478#endif
3368 } 3479 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3369 break; 3485 break;
3370 3486
3371 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3372 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3373 break; 3489 break;
3374 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3375 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3376 break; 3492 break;
3377 3493
3378 case XTerm_logfile: 3494 case XTerm_logfile:
3379 // TODO, when secure mode? 3495 // TODO, when secure mode?
3380 break; 3496 break;
3381 3497
3382 case XTerm_font:
3383 if (query)
3384 {
3385 if (Options & Opt_insecure)
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3387 TermWin.fontset->fontdesc
3388 ? TermWin.fontset->fontdesc
3389 : "",
3390 resp);
3391 }
3392 else
3393 change_font (str);
3394 break;
3395
3396#ifndef NO_FRILLS
3397 case XTerm_locale:
3398 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3402 }
3403 else
3404 {
3405 set_locale (str);
3406# ifdef USE_XIM
3407 im_cb ();
3408# endif
3409 }
3410 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif
3421
3422#ifdef MENUBAR
3423 case XTerm_Menu:
3424 if (Options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break;
3427#endif
3428#if 0 3498#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 3499 case Rxvt_dumpscreen: /* no error notices */
3430 { 3500 {
3431 int fd; 3501 int fd;
3432 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3502 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3433 { 3503 {
3434 scr_dump (fd); 3504 scr_dump (fd);
3435 close (fd); 3505 close (fd);
3436 } 3506 }
3437 } 3507 }
3508 break;
3509#endif
3510 case XTerm_font:
3511 op = URxvt_font;
3512 case URxvt_font:
3513#if ENABLE_STYLES
3514 case URxvt_boldFont:
3515 case URxvt_italicFont:
3516 case URxvt_boldItalicFont:
3517#endif
3518 if (query)
3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3521 ? fontset[op - URxvt_font]->fontdesc : "",
3522 resp);
3523 else
3524 {
3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3526
3527 res = strdup (str);
3528 allocated.push_back ((void *)res);
3529 set_fonts ();
3530 }
3531 break;
3532
3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3542 case URxvt_locale:
3543 if (query)
3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3545 else
3546 {
3547 set_locale (str);
3548 pty->set_utf8_mode (enc_utf8);
3549 init_xlocale ();
3550 }
3551 break;
3552
3553 case URxvt_view_up:
3554 case URxvt_view_down:
3555 {
3556 int lines = atoi (str);
3557
3558 if (lines)
3559 scr_page (op == URxvt_view_up ? UP : DN, lines);
3560 else
3561 scr_erase_savelines ();
3562 }
3563
3564 break;
3565#endif
3566
3567#if ENABLE_PERL
3568 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3570 ; // no responses yet
3438 break; 3571 break;
3439#endif 3572#endif
3440 } 3573 }
3441} 3574}
3442/*----------------------------------------------------------------------*/ 3575/*----------------------------------------------------------------------*/
… …
3456{ 3589{
3457 int state; 3590 int state;
3458 3591
3459 if (mode == 's') 3592 if (mode == 's')
3460 { 3593 {
3461 SavedModes |= (PrivateModes & bit); 3594 SavedModes |= (priv_modes & bit);
3462 return -1; 3595 return -1;
3463 } 3596 }
3464 else 3597 else
3465 { 3598 {
3466 if (mode == 'r') 3599 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 3601 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 3603 PrivMode (state, bit);
3471 } 3604 }
3472 3605
3473 return state; 3606 return state;
3474} 3607}
3475 3608
3476/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
3477void 3610void
3478rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3479{ 3612{
3480 unsigned int i, j; 3613 unsigned int i, j;
3481 int state; 3614 int state;
3482 3615
3483 static const struct 3616 static const struct
… …
3492 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap },
3630 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 3632 // 18, 19 printing-related
3499 { menuBar_esc, PrivMode_menuBar }, 3633 { 25, PrivMode_VisibleCursor },
3500#endif
3501#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 3636#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 3637 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 3638 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 3639 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 3640 // 45 margin bell NYI
3511 // 46 start logging 3641 // 46 start logging
… …
3551 } 3681 }
3552 3682
3553 /* extra handling for values with state unkept */ 3683 /* extra handling for values with state unkept */
3554 switch (arg[i]) 3684 switch (arg[i])
3555 { 3685 {
3686#if ENABLE_STYLES
3687 case 1021:
3688 set_option (Opt_intensityStyles, mode);
3689
3690 scr_touch (true);
3691 break;
3692#endif
3556 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
3694 case 1049:
3557 if (Options & Opt_secondaryScreen) 3695 if (option (Opt_secondaryScreen))
3558 if (mode == 0) 3696 if (mode == 0)
3559 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
3560 else if (mode == 1) 3698 else if (mode == 1)
3561 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
3562 break; 3700 break;
… …
3573 * within VT52 mode 3711 * within VT52 mode
3574 */ 3712 */
3575 PrivMode (1, PrivMode_vt52); 3713 PrivMode (1, PrivMode_vt52);
3576 break; 3714 break;
3577 case 3: /* 80/132 */ 3715 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 3716 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3717 set_widthheight (((state ? 132 : 80) * fwidth), height);
3580 break; 3718 break;
3581 case 4: /* smooth scrolling */ 3719 case 4: /* smooth scrolling */
3582 if (state) 3720 set_option (Opt_jumpScroll, !state);
3583 Options &= ~Opt_jumpScroll;
3584 else
3585 Options |= Opt_jumpScroll;
3586 break; 3721 break;
3587 case 5: /* reverse video */ 3722 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 3723 scr_rvideo_mode (state);
3589 break; 3724 break;
3590 case 6: /* relative/absolute origins */ 3725 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 3729 scr_autowrap (state);
3595 break; 3730 break;
3596 /* case 8: - auto repeat, can't do on a per window basis */ 3731 /* case 8: - auto repeat, can't do on a per window basis */
3597 case 9: /* X10 mouse reporting */ 3732 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 3734 priv_modes &= ~PrivMode_MouseX11;
3600 break; 3735 break;
3601#ifdef menuBar_esc
3602 case menuBar_esc:
3603#ifdef MENUBAR
3604 map_menuBar (state);
3605#endif
3606 break;
3607#endif
3608#ifdef scrollBar_esc 3736#ifdef scrollBar_esc
3609 case scrollBar_esc: 3737 case scrollBar_esc:
3610 if (scrollbar_mapping (state)) 3738 if (scrollbar_mapping (state))
3611 { 3739 {
3612 resize_all_windows (0, 0, 0); 3740 resize_all_windows (0, 0, 0);
… …
3624 break; 3752 break;
3625 /* case 66: - application key pad */ 3753 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 3754 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 3755 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 3756 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 3757 priv_modes &= ~PrivMode_MouseX10;
3630 break; 3758 break;
3631#if 0 3759#if 0
3632 case 1001: 3760 case 1001:
3633 break; /* X11 mouse highlighting */ 3761 break; /* X11 mouse highlighting */
3634#endif 3762#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state)
3637 Options &= ~Opt_scrollTtyOutput;
3638 else
3639 Options |= Opt_scrollTtyOutput; 3764 set_option (Opt_scrollTtyOutput, !state);
3640 break; 3765 break;
3641 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
3642 if (state)
3643 Options |= Opt_scrollTtyKeypress; 3767 set_option (Opt_scrollTtyKeypress, state);
3644 else
3645 Options &= ~Opt_scrollTtyKeypress;
3646 break; 3768 break;
3647 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 3770 if (option (Opt_secondaryScreen))
3649 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 3772 scr_erase_screen (2);
3651 scr_change_screen (state); 3773 scr_change_screen (state);
3652 break; 3774 break;
3653 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 3776 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 3777 if (option (Opt_secondaryScreen))
3656 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 3779 scr_erase_screen (2);
3658 break; 3780 break;
3659 default: 3781 default:
3660 break; 3782 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 3808 rendset = 0, rendstyle = ~RS_None;
3687 break; 3809 break;
3688 case 1: 3810 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 3811 rendset = 1, rendstyle = RS_Bold;
3690 break; 3812 break;
3813 //case 2: // low intensity
3814 case 3:
3815 rendset = 1, rendstyle = RS_Italic;
3816 break;
3691 case 4: 3817 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 3818 rendset = 1, rendstyle = RS_Uline;
3693 break; 3819 break;
3694 case 5: 3820 case 5: // slowly blinking
3821 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 3822 rendset = 1, rendstyle = RS_Blink;
3696 break; 3823 break;
3697 //case 6: // scoansi light background 3824 //case 6: // scoansi light background
3698 case 7: 3825 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 3826 rendset = 1, rendstyle = RS_RVid;
3700 break; 3827 break;
3701 case 8: 3828 case 8:
3702 // invisible. NYI 3829 // invisible. NYI
3703 break; 3830 break;
3831 //case 9: // crossed out
3704 //case 10: // scoansi acs off 3832 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 3833 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 3834 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 3835 //...
3836 //case 19: // ninth alt font
3837 //case 20: // gothic
3838 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3839 rendset = 0, rendstyle = RS_Bold;
3709 break; 3840 break;
3710 case 22: 3841 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 3842 rendset = 0, rendstyle = RS_Bold;
3843 break;
3844 case 23: // disable italic
3845 rendset = 0, rendstyle = RS_Italic;
3712 break; 3846 break;
3713 case 24: 3847 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 3848 rendset = 0, rendstyle = RS_Uline;
3715 break; 3849 break;
3716 case 25: 3850 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 3851 rendset = 0, rendstyle = RS_Blink;
3718 break; 3852 break;
3853 case 26: // variable spacing (iso 8613)
3854 rendset = 0, rendstyle = RS_Blink;
3855 break;
3719 case 27: 3856 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 3857 rendset = 0, rendstyle = RS_RVid;
3721 break; 3858 break;
3722 case 28:
3723 // visible. NYI 3859 //case 28: // visible. NYI
3724 break; 3860 //case 29: // not crossed-out
3725 } 3861 }
3726 3862
3727 if (rendset != -1) 3863 if (rendset != -1)
3728 { 3864 {
3729 scr_rendition (rendset, rendstyle); 3865 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 3876 case 35:
3741 case 36: 3877 case 36:
3742 case 37: 3878 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3879 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 3880 break;
3745#ifdef TTY_256COLOR 3881 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 3882 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 3883 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3884 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 3885 i += 2;
3751 } 3886 }
3752 break; 3887 break;
3753#endif
3754 case 39: /* default fg */ 3888 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 3889 scr_color (Color_fg, Color_fg);
3756 break; 3890 break;
3757 3891
3758 case 40: 3892 case 40:
… …
3763 case 45: 3897 case 45:
3764 case 46: 3898 case 46:
3765 case 47: 3899 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3900 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 3901 break;
3768#ifdef TTY_256COLOR 3902 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 3903 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 3904 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3905 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 3906 i += 2;
3774 } 3907 }
3775 break; 3908 break;
3776#endif
3777 case 49: /* default bg */ 3909 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
3779 break; 3911 break;
3780 3912
3781#ifndef NO_BRIGHTCOLOR 3913 //case 50: // not variable spacing
3914
3915#if !ENABLE_MINIMAL
3782 case 90: 3916 case 90:
3783 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
3784 case 92: 3918 case 92:
3785 case 93: 3919 case 93:
3786 case 94: 3920 case 94:
3787 case 95: 3921 case 95:
3788 case 96: 3922 case 96:
3789 case 97: 3923 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3924 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 3925 break;
3793 case 100: 3926 case 100:
3794 case 101: /* set bright bg color */ 3927 case 101: /* set bright bg color */
3795 case 102: 3928 case 102:
3796 case 103: 3929 case 103:
3797 case 104: 3930 case 104:
3798 case 105: 3931 case 105:
3799 case 106: 3932 case 106:
3800 case 107: 3933 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3934 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 3935 break;
3804#endif 3936#endif
3805
3806 } 3937 }
3807 } 3938 }
3808} 3939}
3809/*}}} */ 3940/*}}} */
3810 3941
… …
3814{ 3945{
3815 unicode_t ch, cmd = cmd_getc (); 3946 unicode_t ch, cmd = cmd_getc ();
3816 3947
3817 if (cmd == 'Q') 3948 if (cmd == 'Q')
3818 { /* query graphics */ 3949 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 3950 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 3951 return;
3821 } 3952 }
3822 /* swallow other graphics sequences until terminating ':' */ 3953 /* swallow other graphics sequences until terminating ':' */
3823 do 3954 do
3824 ch = cmd_getc (); 3955 ch = cmd_getc ();
… …
3834 */ 3965 */
3835void 3966void
3836rxvt_term::tt_printf (const char *fmt,...) 3967rxvt_term::tt_printf (const char *fmt,...)
3837{ 3968{
3838 va_list arg_ptr; 3969 va_list arg_ptr;
3839 unsigned char buf[256]; 3970 char buf[256];
3840 3971
3841 va_start (arg_ptr, fmt); 3972 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3973 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 3974 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 3975 tt_write (buf, strlen (buf));
3845} 3976}
3846 3977
3847/* ---------------------------------------------------------------------- */ 3978/* ---------------------------------------------------------------------- */
3848/* Write data to the pty as typed by the user, pasted with the mouse, 3979/* Write data to the pty as typed by the user, pasted with the mouse,
3849 * or generated by us in response to a query ESC sequence. 3980 * or generated by us in response to a query ESC sequence.
3850 */ 3981 */
3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3983
3851void 3984void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3985rxvt_term::tt_write (const char *data, unsigned int len)
3853{ 3986{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3988 return;
3855 3989
3856 if (len) 3990 if (pty->pty < 0)
3991 return;
3992
3993 if (v_buflen == 0)
3994 {
3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3996
3997 if ((unsigned int)written == len)
3998 return;
3999
4000 data += written;
4001 len -= written;
3857 { 4002 }
4003
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005
4006 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len;
4008
4009 pty_ev.set (EVENT_READ | EVENT_WRITE);
4010}
4011
4012void rxvt_term::pty_write ()
4013{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4015
4016 if (written > 0)
4017 {
4018 v_buflen -= written;
4019
3858 if (v_buflen == 0) 4020 if (v_buflen == 0)
3859 { 4021 {
3860 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3861
3862 if ((unsigned int)written == len)
3863 return;
3864
3865 data += written;
3866 len -= written;
3867 }
3868
3869
3870 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3871
3872 memcpy (v_buffer + v_buflen, data, len);
3873 v_buflen += len;
3874 }
3875
3876 for (;;)
3877 {
3878 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3879
3880 if (written > 0)
3881 {
3882 v_buflen -= written;
3883
3884 if (v_buflen == 0)
3885 {
3886 free (v_buffer); 4022 free (v_buffer);
3887 v_buffer = 0; 4023 v_buffer = 0;
3888 v_buflen = 0; 4024 v_buflen = 0;
3889 4025
3890 pty_ev.set (EVENT_READ); 4026 pty_ev.set (EVENT_READ);
3891 return;
3892 }
3893
3894 memmove (v_buffer, v_buffer + written, v_buflen);
3895 }
3896 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3897 // original code just ignores this...
3898 destroy ();
3899 else
3900 {
3901 pty_ev.set (EVENT_READ | EVENT_WRITE);
3902 return; 4027 return;
3903 } 4028 }
4029
4030 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4031 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ);
3905} 4034}
3906 4035
3907/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
3908 4037

Diff Legend

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