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

Diff Legend

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