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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.353 by sasha, Wed Sep 12 19:51:41 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
271#endif
272 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
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 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
273 newlen = 1; 553 newlen = 1;
274 switch (keysym) 554 switch (keysym)
275 { 555 {
276#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 557 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
279 { 559 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
283 } 563 }
284 else 564 else
285 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
289 case XK_Delete: 579 case XK_Delete:
290 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
291 break; 581 break;
292#endif 582#endif
293 case XK_Tab: 583 case XK_Tab:
294 if (shft) 584 if (shft)
295 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
296 else 586 else
297 { 587 {
298#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 589 if (ctrl)
300 meta = 1; 590 meta = 1;
… …
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
660#ifdef TRANSPARENT 1038 flush_ev.stop ();
661 if (want_full_refresh)
662 {
663 want_full_refresh = 0;
664 scr_clear ();
665 scr_touch (false);
666 }
667#endif
668 1039
669 if (want_refresh) 1040 if (want_refresh)
670 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
671 scr_refresh (refresh_type); 1080 scr_refresh ();
672 scrollbar_show (1); 1081 scrollbar_show (1);
673#ifdef USE_XIM 1082#ifdef USE_XIM
674 IMSendSpot (); 1083 IMSendSpot ();
675#endif 1084#endif
676 } 1085 }
677 1086
678 display->flush (); 1087 display->flush ();
679
680 flush_ev.stop ();
681} 1088}
682 1089
683void 1090void
684rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
685{ 1092{
686 SET_R (this); 1093 make_current ();
687 SET_LOCALE (locale);
688 1094
689 display->flush (); 1095 display->flush ();
690 1096
691 if (want_refresh && !flush_ev.active) 1097 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1099}
694 1100
695void 1101void
696rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
697{ 1103{
698 SET_R (this); 1104 make_current ();
699 SET_LOCALE (locale);
700 1105
701 refresh_limit = 1;
702 refresh_count = 0; 1106 refresh_count = 0;
703 flush (); 1107 flush ();
704} 1108}
705 1109
706#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1113{
710 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1115 want_refresh = 1;
712 1116
713 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1118}
715#endif 1119#endif
716 1120
717#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
718void 1122void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1136rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1137{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1140 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1141 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1143 }
741} 1144}
742#endif 1145#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1149rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1150{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1152 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1154 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1156 }
755} 1157}
756#endif 1158#endif
… …
761{ 1163{
762 if (mouse_slip_wheel_speed == 0 1164 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1166 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1167 {
766 refresh_type |= SMOOTH_REFRESH; 1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
767 want_refresh = 1; 1171 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1173 }
770} 1174}
771#endif 1175#endif
772 1176
1177#if LINUX_YIELD_HACK
1178static struct event_handler
1179{
1180 check_watcher yield_ev;
1181
1182 void yield_cb (check_watcher &w)
1183 {
1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1192 w.stop ();
1193 }
1194
1195 event_handler ()
1196 : yield_ev (this, &event_handler::yield_cb)
1197 {
1198 }
1199} event_handler;
1200#endif
1201
773bool 1202bool
774rxvt_term::pty_fill () 1203rxvt_term::pty_fill ()
775{ 1204{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1206
778 if (CBUFSIZ == n) 1207 if (CBUFSIZ == n)
779 { 1208 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1210 n = 0;
782 } 1211 }
783 1212
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
787 1216
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1218
790 if (n > 0) 1219 if (r > 0)
791 { 1220 {
792 cmdbuf_endp += n; 1221 cmdbuf_endp += r;
793 return true; 1222 return true;
794 } 1223 }
795 else if (n < 0 && errno != EAGAIN) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1225 {
1226#if LINUX_YIELD_HACK
1227 if (display->is_local)
1228 event_handler.yield_ev.start ();
1229#endif
1230 }
1231 else
1232 {
1233 pty_ev.stop ();
1234
1235 if (!option (Opt_hold))
796 destroy (); 1236 destroy ();
797 1237 }
1238
798 return false; 1239 return false;
799} 1240}
800 1241
801void 1242void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1244{
804 SET_R (this); 1245 make_current ();
805 SET_LOCALE (locale);
806 1246
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1247 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1248 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1249 while (pty_fill ())
812 if (cmd_parse ()) 1250 if (cmd_parse ())
813 break; 1251 break;
1252
1253 if (revents & EVENT_WRITE)
1254 pty_write ();
814} 1255}
815 1256
816void 1257void
817rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
818{ 1259{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
820 recolour_cursor (); 1261 recolour_cursor ();
821 1262
822#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1264 hidden_pointer = 0;
824 1265
825 if (Options & Opt_pointerBlank) 1266 if (option (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1268#endif
828} 1269}
829 1270
830#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
831void 1272void
832rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
833{ 1274{
834 if (! (Options & Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
835 return; 1276 return;
836 1277
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
838 XFlush (display->display); 1279 XFlush (dpy);
839 1280
840 hidden_pointer = 1; 1281 hidden_pointer = 1;
841} 1282}
842 1283
843void 1284void
844rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
845{ 1286{
846 SET_R (this); 1287 make_current ();
847 SET_LOCALE (locale);
848 1288
849 pointer_blank (); 1289 pointer_blank ();
850} 1290}
851#endif 1291#endif
852 1292
… …
859 x = ev.x; 1299 x = ev.x;
860 y = ev.y; 1300 y = ev.y;
861 pixel_position (&x, &y); 1301 pixel_position (&x, &y);
862 1302
863 if (MEvent.button == AnyButton) 1303 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1304 button_number = 3;
866 }
867 else 1305 else
868 { 1306 {
869 button_number = MEvent.button - Button1; 1307 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1308 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1309 if (button_number >= 3)
872 button_number += (64 - 3); 1310 button_number += (64 - 3);
873 } 1311 }
874 1312
875 if (PrivateModes & PrivMode_MouseX10) 1313 if (priv_modes & PrivMode_MouseX10)
876 { 1314 {
877 /* 1315 /*
878 * do not report ButtonRelease 1316 * do not report ButtonRelease
879 * no state info allowed 1317 * no state info allowed
880 */ 1318 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1337#endif
900
901 } 1338 }
902 1339
903#ifdef DEBUG_MOUSEREPORT 1340#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1341 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1342 if (key_state & 16)
906 fputc ('C', stderr); 1343 fputc ('C', stderr);
907 if (key_state & 4) 1344 if (key_state & 4)
908 fputc ('S', stderr); 1345 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1349 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1350 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1351 button_number,
915 x + 1, 1352 x + 1,
916 y + 1); 1353 y + 1);
917#else 1354#endif
1355
918 tt_printf ("\033[M%c%c%c", 1356 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
920 (32 + x + 1), 1358 (32 + x + 1),
921 (32 + y + 1)); 1359 (32 + y + 1));
922#endif
923} 1360}
924
925#ifdef USING_W11LIB
926void
927rxvt_W11_process_x_event (XEvent *ev)
928{
929 rxvt_t *r = rxvt_get_r ();
930
931 x_cb (*ev);
932}
933#endif
934 1361
935/*{{{ process an X event */ 1362/*{{{ process an X event */
936void 1363void
937rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
938{ 1365{
939 SET_R (this); 1366 make_current ();
940 SET_LOCALE (locale);
941 1367
942#if defined(CURSOR_BLINK) 1368 dLocal (Display *, dpy);
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
944 {
945 if (hidden_cursor)
946 {
947 hidden_cursor = 0;
948 want_refresh = 1;
949 }
950 1369
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1370 if (ev.xany.window == vt
952 } 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
954
955#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 {
958 if (ev.type == MotionNotify
959 || ev.type == ButtonPress
960 || ev.type == ButtonRelease)
961 if (hidden_pointer)
962 pointer_unblank ();
963
964 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank ();
966 }
967#endif
968
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return; 1373 return;
972#endif
973 1374
1375 // for XQueryPointer
974 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1378 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1379
1027 switch (ev.type) 1380 switch (ev.type)
1028 { 1381 {
1029 case KeyPress: 1382 case KeyPress:
1030 lookup_key (ev.xkey); 1383 key_press (ev.xkey);
1031 break; 1384 break;
1032 1385
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease: 1386 case KeyRelease:
1035 { 1387 key_release (ev.xkey);
1036 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R)
1044 mouse_slip_wheel_speed = 0;
1045 }
1046 break; 1388 break;
1047 }
1048#endif
1049 1389
1050 case ButtonPress: 1390 case ButtonPress:
1051 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1052 break; 1392 break;
1053 1393
… …
1055 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1056 break; 1396 break;
1057 1397
1058 case ClientMessage: 1398 case ClientMessage:
1059 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1061 destroy ();
1062#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink))
1068 { 1401 {
1069 /* Get Dnd data */ 1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1403 {
1071 int ActualFormat; 1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1405 {
1073 unsigned long Size, RemainingBytes; 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1407 {
1075 XGetWindowProperty (display->display, display->root, 1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1409 destroy ();
1077 0L, 1000000L, 1410 }
1078 False, AnyPropertyType, 1411#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1415 &ev);
1082 XChangeProperty (display->display, display->root, 1416#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1417 }
1084 8, PropModeReplace, 1418 }
1085 data, STRLEN (data)); 1419#if ENABLE_XEMBED
1086 XFree (data); 1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1421 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1427#endif
1089 } 1428 }
1090#endif /* OFFIX_DND */
1091 break;
1092
1093 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1429 break;
1096 1430
1097 /* 1431 /*
1098 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1099 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1118 break; 1452 break;
1119 } 1453 }
1120 break; 1454 break;
1121 1455
1122 case FocusIn: 1456 case FocusIn:
1123 if (!TermWin.focus) 1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1460 focus_in ();
1461 break;
1462
1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1467 focus_out ();
1468 break;
1469
1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0])
1124 { 1475 {
1125 TermWin.focus = 1; 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1477 ;
1127#ifdef USE_XIM 1478
1128 if (Input_Context != NULL) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 { 1480 {
1138 PixColors = PixColorsFocused; 1481 seen_resize = 1;
1139 set_colorfgbg (); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1483 }
1484 else
1485 {
1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1143#endif 1489#endif
1144 1490 }
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1145 } 1492 }
1146 break; 1493 break;
1147 1494
1148 case FocusOut:
1149 if (TermWin.focus)
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break;
1174
1175 case ConfigureNotify: 1495 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1500
1180 do
1181 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187
1188 if (szHint.width != width || szHint.height != height)
1189 resize_all_windows (width, height, 1);
1190
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent)
1193 {
1194 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif
1199 }
1200 break; 1501 break;
1201 1502
1202 case SelectionClear: 1503 case SelectionClear:
1203 selection_clear (); 1504 selection_clear ();
1204 break; 1505 break;
1205 1506
1206 case SelectionNotify: 1507 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1510 break;
1211 1511
1212 case SelectionRequest: 1512 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1214 break; 1514 break;
1215 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1216 case UnmapNotify: 1524 case UnmapNotify:
1217 TermWin.mapped = 0; 1525 mapped = 0;
1218#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1220#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1221 break; 1530 break;
1222
1223 case MapNotify:
1224 TermWin.mapped = 1;
1225#ifdef TEXT_BLINK
1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1227#endif
1228 break;
1229
1230#ifdef TRANSPARENT
1231 case ReparentNotify:
1232 rootwin_cb (ev);
1233 break;
1234#endif /* TRANSPARENT */
1235 1531
1236 case GraphicsExpose: 1532 case GraphicsExpose:
1237 case Expose: 1533 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1534 if (ev.xany.window == vt)
1239 { 1535 {
1240 do 1536 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1540
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1542
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1250 1546
1251 scr_refresh (refresh_type); 1547 want_refresh = 1;
1252 } 1548 }
1253 else 1549 else
1254 { 1550 {
1255 XEvent unused_event; 1551 XEvent unused_event;
1256 1552
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1554 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1556 ;
1261 1557
1262 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1263 { 1559 {
1264 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1265 scrollbar_show (0); 1561 scrollbar_show (0);
1266 } 1562 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271
1272#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window);
1275#endif
1276 } 1563 }
1277 break; 1564 break;
1278 1565
1279 case MotionNotify: 1566 case MotionNotify:
1280#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1568 if (hidden_pointer)
1282 pointer_unblank (); 1569 pointer_unblank ();
1283#endif 1570#endif
1284#if MENUBAR 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1572 break;
1573
1574 if (ev.xany.window == vt)
1286 { 1575 {
1287 menubar_control (ev.xbutton); 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1578 ; // nop
1290#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1292 break;
1293
1294 if (ev.xany.window == TermWin.vt)
1295 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1580 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1582 ;
1300 1583
1301 XQueryPointer (display->display, TermWin.vt, 1584 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1587 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1588 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1590 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1591 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1592 {
1310#endif 1593#endif
1594#if ISO_14755
1595 // 5.4
1596 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1597 {
1598 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1599 break;
1600 }
1601#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1602 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1603 ev.xbutton.state & Button3Mask ? 2 : 0);
1604
1313#ifdef SELECTION_SCROLLING 1605#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1606 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1607 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1608 {
1317 int dist; 1609 int dist;
1318 1610
1319 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1616
1325 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1327 */ 1619 */
1328 selection_save_x=ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1621 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1622 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1623
1333 /* calc number of lines to scroll */ 1624 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1625 if (ev.xbutton.y < int_bwidth)
1335 { 1626 {
1336 scroll_selection_dir = UP; 1627 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1628 dist = int_bwidth - ev.xbutton.y;
1338 } 1629 }
1339 else 1630 else
1340 { 1631 {
1341 scroll_selection_dir = DN; 1632 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1633 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1634 }
1635
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1636 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1637 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1;
1347 MIN_IT (scroll_selection_lines, 1639 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1640 SELECTION_SCROLL_MAX_LINES);
1349 } 1641 }
1350 else 1642 else
1351 { 1643 {
1352 /* we are within the text window, so we 1644 /* we are within the text window, so we
1353 * shouldn't be scrolling 1645 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1647 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1357 } 1649 }
1358#endif 1650#endif
1359#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1360
1361 } 1652 }
1362#endif 1653#endif
1363
1364 } 1654 }
1365 } 1655 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1657 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1659 MotionNotify, &ev))
1660 ;
1661
1370 XQueryPointer (display->display, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1665 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1666 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1668 scrollbar_size ());
1377 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1669 want_refresh = 1;
1379 scrollbar_show (1); 1670 scrollbar_show (1);
1380 } 1671 }
1381 break; 1672 break;
1382 } 1673 }
1383}
1384 1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701}
1702
1703void
1704rxvt_term::focus_in ()
1705{
1706 if (!focus)
1707 {
1708 focus = 1;
1709 want_refresh = 1;
1710
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM
1714 if (Input_Context != NULL)
1715 {
1716 IMSetPosition ();
1717 XSetICFocus (Input_Context);
1718 }
1719#endif
1720#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1723#endif
1724#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade])
1726 {
1727 pix_colors = pix_colors_focused;
1728 scr_recolour ();
1729 }
1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1744 }
1745}
1746
1747void
1748rxvt_term::focus_out ()
1749{
1750 if (focus)
1751 {
1752 focus = 0;
1753 want_refresh = 1;
1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1757#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf)
1759 {
1760 iso14755buf = 0;
1761# if ISO_14755
1762 scr_overlay_off ();
1763# endif
1764 }
1765#endif
1766#if USE_XIM
1767 if (Input_Context != NULL)
1768 XUnsetICFocus (Input_Context);
1769#endif
1770#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop ();
1773 hidden_cursor = 0;
1774#endif
1775#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade])
1777 {
1778 pix_colors = pix_colors_unfocused;
1779 scr_recolour ();
1780 }
1781#endif
1782 }
1783}
1784
1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1385void 1799void
1386rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1801{
1388 SET_R (this); 1802 make_current ();
1389 SET_LOCALE (locale);
1390 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1391 switch (ev.type) 1809 switch (ev.type)
1392 { 1810 {
1393 case PropertyNotify: 1811 case PropertyNotify:
1812 /*
1813 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on.
1815 */
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1395 { 1818 {
1396 if (ev.xproperty.state == PropertyNewValue) 1819 bgPixmap.set_root_pixmap ();
1397 selection_property (ev.xproperty.window, ev.xproperty.atom); 1820 update_background ();
1398 break;
1399 } 1821 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /*
1404 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on.
1406 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1411 return;
1412 }
1413
1414 /* FALLTHROUGH */
1415 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1;
1418 break; 1822 break;
1823 }
1419#endif 1824# endif
1420 }
1421} 1825}
1826#endif
1422 1827
1423void 1828void
1424rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1425{ 1830{
1426 int reportmode = 0, clickintime; 1831 int reportmode = 0, clickintime;
1427 1832
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1833 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1834
1429 if (!bypass_keystate) 1835 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1836 reportmode = !! (priv_modes & PrivMode_mouse_report);
1837
1431 /* 1838 /*
1432 * VT window processing of button press 1839 * VT window processing of button press
1433 */ 1840 */
1434 if (ev.window == TermWin.vt) 1841 if (ev.window == vt)
1435 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1846#if ISO_14755
1847 // 5.4
1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1849 {
1850 iso14755_54 (ev.x, ev.y);
1851 return;
1852 }
1853#endif
1854
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1855 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1856
1437 if (reportmode) 1857 if (reportmode)
1438 { 1858 {
1439 /* mouse report from vt window */ 1859 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1860 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1861 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1862#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1863 if (ev.button == MEvent.button && clickintime)
1444 { 1864 {
1445 /* same button, within alloted time */ 1865 /* same button, within alloted time */
1446 MEvent.clicks++; 1866 MEvent.clicks++;
1867
1447 if (MEvent.clicks > 1) 1868 if (MEvent.clicks > 1)
1448 { 1869 {
1449 /* only report double clicks */ 1870 /* only report double clicks */
1450 MEvent.clicks = 2; 1871 MEvent.clicks = 2;
1451 mouse_report (ev); 1872 mouse_report (ev);
… …
1470 } 1891 }
1471 else 1892 else
1472 { 1893 {
1473 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1895 MEvent.clicks = 0;
1896
1475 switch (ev.button) 1897 switch (ev.button)
1476 { 1898 {
1477 case Button1: 1899 case Button1:
1900 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */
1902#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask);
1904#else
1905 selection.rect = false;
1906#endif
1907
1478 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1910 {
1481 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1483 else 1913 else
1484 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1929 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1502 else 1932 else
1503 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1934
1504 MEvent.button = Button3; 1935 MEvent.button = Button3;
1505 break; 1936 break;
1506 } 1937 }
1507 } 1938 }
1939
1508 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1509 return; 1941 return;
1510 } 1942 }
1511 1943
1512 /* 1944 /*
… …
1623 case Button3: 2055 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1625 { 2057 {
1626 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1629# else 2061# else
1630 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1631# endif 2063# endif
1632 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1635# else 2067# else
1636 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1637# endif 2069# endif
1638 else 2070 else
1639 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1640 } 2072 }
1641 else 2073 else
1642 { 2074 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2076 (nrow
1645 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2078 / scrollbar_size ()));
1647 } 2079 }
1648 2080
1649 break; 2081 break;
1650 } 2082 }
1651 } 2083 }
2084
1652 return; 2085 return;
1653 } 2086 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2087}
1662 2088
1663void 2089void
1664rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1665{ 2091{
1666 int reportmode = 0; 2092 int reportmode = 0;
1667 2093
1668 csrO = 0; /* reset csr Offset */ 2094 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2095 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2096 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2097
1672 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1673 { 2099 {
1674 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1675 scrollbar_show (0); 2101 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2102 }
2103
1681#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
1684#endif 2107#endif
2108
1685 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1686 { 2110 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2112 return;
2113
2114#if ISO_14755
2115 // 5.4
2116 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2117 return;
2118#endif
2119
1687 if (reportmode) 2120 if (reportmode)
1688 { 2121 {
1689 /* mouse report from vt window */ 2122 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2123 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2124 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2138 MEvent.button = AnyButton;
1706 mouse_report (ev); 2139 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2140#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2141 return;
1709 } 2142 }
2143
1710 /* 2144 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2145 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2146 * when overriding mouse reporting
1713 */ 2147 */
1714 if (PrivateModes & PrivMode_mouse_report 2148 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2149 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2150 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2151 selection_extend (ev.x, ev.y, 0);
1718 2152
1719 switch (ev.button) 2153 switch (ev.button)
1720 { 2154 {
1721 case Button1: 2155 case Button1:
1722 case Button3: 2156 case Button3:
1723 selection_make (ev.time); 2157 selection_make (ev.time);
1724 break; 2158 break;
2159
1725 case Button2: 2160 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1727 break; 2163 break;
2164
1728#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
1729 case Button4: 2166 case Button4:
1730 case Button5: 2167 case Button5:
1731 { 2168 {
1732 int i; 2169 int i;
… …
1734 2171
1735 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
1736 2173
1737 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
1738 i = 1; 2175 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2176 else if (option (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2177 i = nrow - 1;
1741 else 2178 else
1742 i = 5; 2179 i = 5;
1743 2180
1744# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2182 if (ev.state & ControlMask)
1746 { 2183 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2184 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2187
1751 if (slip_wheel_ev.at < NOW) 2188 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2190
1754 slip_wheel_ev.start (); 2191 slip_wheel_ev.start ();
1755 } 2192 }
1756 else 2193 else
1757 { 2194 {
1758# endif 2195# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2196 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2197 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
1772 } 2199 }
1773#endif 2200# endif
1774 } 2201 }
1775 break; 2202 break;
1776#endif 2203#endif
1777 } 2204 }
1778 } 2205 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2206}
1784
1785#ifdef TRANSPARENT
1786#if TINTING
1787/* taken from aterm-0.4.2 */
1788
1789typedef uint32_t RUINT32T;
1790
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{
1793 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i;
1799
1800 Visual* visual = display->visual;
1801
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803
1804 /* for convenience */
1805 mask_r = visual->red_mask;
1806 mask_g = visual->green_mask;
1807 mask_b = visual->blue_mask;
1808
1809 /* boring lookup table pre-initialization */
1810 switch (srcImage->bits_per_pixel) {
1811 case 15:
1812 if ((mask_r != 0x7c00) ||
1813 (mask_g != 0x03e0) ||
1814 (mask_b != 0x001f))
1815 return;
1816 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1817 lookup_r = lookup;
1818 lookup_g = lookup+32;
1819 lookup_b = lookup+32+32;
1820 sh_r = 10;
1821 sh_g = 5;
1822 sh_b = 0;
1823 break;
1824 case 16:
1825 if ((mask_r != 0xf800) ||
1826 (mask_g != 0x07e0) ||
1827 (mask_b != 0x001f))
1828 return;
1829 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1830 lookup_r = lookup;
1831 lookup_g = lookup+32;
1832 lookup_b = lookup+32+64;
1833 sh_r = 11;
1834 sh_g = 5;
1835 sh_b = 0;
1836 break;
1837 case 24:
1838 if ((mask_r != 0xff0000) ||
1839 (mask_g != 0x00ff00) ||
1840 (mask_b != 0x0000ff))
1841 return;
1842 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1843 lookup_r = lookup;
1844 lookup_g = lookup+256;
1845 lookup_b = lookup+256+256;
1846 sh_r = 16;
1847 sh_g = 8;
1848 sh_b = 0;
1849 break;
1850 case 32:
1851 if ((mask_r != 0xff0000) ||
1852 (mask_g != 0x00ff00) ||
1853 (mask_b != 0x0000ff))
1854 return;
1855 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1856 lookup_r = lookup;
1857 lookup_g = lookup+256;
1858 lookup_b = lookup+256+256;
1859 sh_r = 16;
1860 sh_g = 8;
1861 sh_b = 0;
1862 break;
1863 default:
1864 return; /* we do not support this color depth */
1865 }
1866
1867 /* prepare limits for color transformation (each channel is handled separately) */
1868 if (shade < 0) {
1869 shade = -shade;
1870 if (shade < 0) shade = 0;
1871 if (shade > 100) shade = 100;
1872
1873 lower_lim_r = 65535-rm;
1874 lower_lim_g = 65535-gm;
1875 lower_lim_b = 65535-bm;
1876
1877 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1878 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1879 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1880
1881 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1882 } else {
1883 if (shade < 0) shade = 0;
1884 if (shade > 100) shade = 100;
1885
1886 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1887
1888 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1889 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1890 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1891 }
1892
1893 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1894 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1895 {
1896 unsigned int tmp;
1897
1898 tmp = lower_lim_r;
1899 lower_lim_r = lower_lim_b;
1900 lower_lim_b = tmp;
1901
1902 tmp = upper_lim_r;
1903 upper_lim_r = upper_lim_b;
1904 upper_lim_b = tmp;
1905 }
1906
1907 /* fill our lookup tables */
1908 for (i = 0; i <= mask_r>>sh_r; i++)
1909 {
1910 RUINT32T tmp;
1911 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1912 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1913 lookup_r[i] = (tmp/65535)<<sh_r;
1914 }
1915 for (i = 0; i <= mask_g>>sh_g; i++)
1916 {
1917 RUINT32T tmp;
1918 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1919 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1920 lookup_g[i] = (tmp/65535)<<sh_g;
1921 }
1922 for (i = 0; i <= mask_b>>sh_b; i++)
1923 {
1924 RUINT32T tmp;
1925 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1926 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1927 lookup_b[i] = (tmp/65535)<<sh_b;
1928 }
1929
1930 /* apply table to input image (replacing colors by newly calculated ones) */
1931 switch (srcImage->bits_per_pixel)
1932 {
1933 case 15:
1934 {
1935 unsigned short *p1, *pf, *p, *pl;
1936 p1 = (unsigned short *) srcImage->data;
1937 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1938 while (p1 < pf)
1939 {
1940 p = p1;
1941 pl = p1 + srcImage->width;
1942 for (; p < pl; p++)
1943 {
1944 *p = lookup_r[(*p & 0x7c00)>>10] |
1945 lookup_g[(*p & 0x03e0)>> 5] |
1946 lookup_b[(*p & 0x001f)];
1947 }
1948 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1949 }
1950 break;
1951 }
1952 case 16:
1953 {
1954 unsigned short *p1, *pf, *p, *pl;
1955 p1 = (unsigned short *) srcImage->data;
1956 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1957 while (p1 < pf)
1958 {
1959 p = p1;
1960 pl = p1 + srcImage->width;
1961 for (; p < pl; p++)
1962 {
1963 *p = lookup_r[(*p & 0xf800)>>11] |
1964 lookup_g[(*p & 0x07e0)>> 5] |
1965 lookup_b[(*p & 0x001f)];
1966 }
1967 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1968 }
1969 break;
1970 }
1971 case 24:
1972 {
1973 unsigned char *p1, *pf, *p, *pl;
1974 p1 = (unsigned char *) srcImage->data;
1975 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1976 while (p1 < pf)
1977 {
1978 p = p1;
1979 pl = p1 + srcImage->width * 3;
1980 for (; p < pl; p += 3)
1981 {
1982 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1983 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1984 p[2] = lookup_r[(p[2] & 0x0000ff)];
1985 }
1986 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1987 }
1988 break;
1989 }
1990 case 32:
1991 {
1992 RUINT32T *p1, *pf, *p, *pl;
1993 p1 = (RUINT32T *) srcImage->data;
1994 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1995
1996 while (p1 < pf)
1997 {
1998 p = p1;
1999 pl = p1 + srcImage->width;
2000 for (; p < pl; p++)
2001 {
2002 *p = lookup_r[(*p & 0xff0000)>>16] |
2003 lookup_g[(*p & 0x00ff00)>> 8] |
2004 lookup_b[(*p & 0x0000ff)] |
2005 (*p & ~0xffffff);
2006 }
2007 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2008 }
2009 break;
2010 }
2011 }
2012
2013 free (lookup);
2014}
2015#endif
2016
2017/*
2018 * Check our parents are still who we think they are.
2019 * Do transparency updates if required
2020 */
2021int
2022rxvt_term::check_our_parents ()
2023{
2024 int i, pchanged, aformat, have_pixmap, rootdepth;
2025 unsigned long nitems, bytes_after;
2026 Atom atype;
2027 unsigned char *prop = NULL;
2028 Window root, oldp, *list;
2029 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr;
2031
2032 pchanged = 0;
2033
2034 if (!(Options & Opt_transparent))
2035 return pchanged; /* Don't try any more */
2036
2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth;
2039
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
2042 if (rootdepth != wattr.depth)
2043 {
2044 if (am_transparent)
2045 {
2046 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0;
2049 }
2050
2051 return pchanged; /* Don't try any more */
2052 }
2053
2054 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False);
2056
2057 /*
2058 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that.
2061 */
2062 i = (xa[XA_XROOTPMAPID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success);
2066
2067 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success);
2072
2073 if (!i || prop == NULL
2074#if TINTING
2075 || !rs[Rs_color + Color_tint]
2076#endif
2077 )
2078 have_pixmap = 0;
2079 else
2080 {
2081 have_pixmap = 1;
2082 rootpixmap = *(Pixmap *)prop;
2083 XFree (prop);
2084 }
2085
2086 if (have_pixmap)
2087 {
2088 /*
2089 * Copy display->root pixmap transparency
2090 */
2091 int sx, sy, nx, ny;
2092 unsigned int nw, nh;
2093 Window cr;
2094 XImage *image;
2095 GC gc;
2096 XGCValues gcvalue;
2097
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2099 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height;
2102 nx = ny = 0;
2103
2104 if (sx < 0)
2105 {
2106 nw += sx;
2107 nx = -sx;
2108 sx = 0;
2109 }
2110
2111 if (sy < 0)
2112 {
2113 nh += sy;
2114 ny = -sy;
2115 sy = 0;
2116 }
2117
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2120 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */
2125 allowedxerror = 0;
2126
2127 if (image == NULL)
2128 {
2129 if (am_transparent && am_pixmap_trans)
2130 {
2131 pchanged = 1;
2132 if (TermWin.pixmap != None)
2133 {
2134 XFreePixmap (display->display, TermWin.pixmap);
2135 TermWin.pixmap = None;
2136 }
2137 }
2138
2139 am_pixmap_trans = 0;
2140 }
2141 else
2142 {
2143 if (TermWin.pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap);
2145
2146#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint))
2148 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2153
2154 ShadeXImage (display, image, shade, rm, gm, bm);
2155 }
2156#endif
2157
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2159 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc);
2164 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]);
2167
2168 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1;
2170
2171 am_transparent = am_pixmap_trans = 1;
2172 }
2173 }
2174
2175 if (!am_pixmap_trans)
2176 {
2177 unsigned int n;
2178 /*
2179 * InheritPixmap transparency
2180 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2183 {
2184 oldp = TermWin.parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n);
2187 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2190 if (TermWin.parent[i] == display->root)
2191 {
2192 if (oldp != None)
2193 pchanged = 1;
2194
2195 break;
2196 }
2197
2198 if (oldp != TermWin.parent[i])
2199 pchanged = 1;
2200 }
2201
2202 n = 0;
2203
2204 if (pchanged)
2205 {
2206 for (; n < (unsigned int)i; n++)
2207 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2213 break;
2214 }
2215 }
2216 }
2217
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2223 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */
2225 }
2226 else
2227 {
2228#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1);
2232#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2241 am_transparent = 1;
2242 }
2243
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None;
2246 }
2247
2248 // this is experimental
2249 if (scrollBar.win)
2250 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle ();
2254 scrollbar_show (0);
2255 }
2256
2257 return pchanged;
2258}
2259#endif
2260 2207
2261/*}}} */ 2208/*}}} */
2262 2209
2263bool 2210bool
2264rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
2265{ 2212{
2266 bool flag = false; 2213 bool flag = false;
2267 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2269 2216
2270 for (;;) 2217 for (;;)
2271 { 2218 {
2272 if (ch == NOCHAR) 2219 if (ch == NOCHAR)
2273 { 2220 {
2274 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2222 ch = next_char ();
2276 }
2277 2223
2278 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
2279 break; 2225 break;
2226 }
2280 2227
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2229 {
2230 if (!seen_input)
2231 {
2232 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs
2236 // then sometimes get the size wrong.
2237 // unfortunately other programs are even more buggy and dislike
2238 // being sent SIGWINCH, so only do it when we were in fact being
2239 // resized.
2240 if (seen_resize && cmd_pid)
2241 kill (-cmd_pid, SIGWINCH);
2242 }
2243
2283 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2246 bool refreshnow = false;
2286 int nlines = 0; 2247 int nlines = 0;
2287 unicode_t *str = buf; 2248 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2250
2289 for (;;) 2251 for (;;)
2290 { 2252 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2254 break;
2293 2255
2294 *str++ = ch; 2256 *str++ = ch;
2295 2257
2296 if (ch == C0_LF) 2258 if (ch == C0_LF || str >= eol)
2297 { 2259 {
2260 if (ch == C0_LF)
2298 nlines++; 2261 nlines++;
2262
2299 refresh_count++; 2263 refresh_count++;
2300 2264
2301 if (!(Options & Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2266 {
2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2304 refreshnow = true; 2271 refreshnow = true;
2305 ch = NOCHAR; 2272 ch = NOCHAR;
2306 break; 2273 break;
2274 }
2307 } 2275 }
2308 2276
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2278 if (nlines >= nrow - 1)
2311 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2282 scr_add_lines (buf, str - buf, nlines);
2283
2313 nlines = 0; 2284 nlines = 0;
2314 str = buf; 2285 str = buf;
2286 eol = str + min (ncol, UBUFSIZ);
2315 } 2287 }
2316 }
2317 2288
2318 if (str >= buf + UBUFSIZ) 2289 if (str >= eol)
2319 { 2290 {
2291 if (eol >= buf + UBUFSIZ)
2292 {
2320 ch = NOCHAR; 2293 ch = NOCHAR;
2321 break; 2294 break;
2295 }
2296 else
2297 eol = min (eol + ncol, buf + UBUFSIZ);
2298 }
2299
2322 } 2300 }
2323 2301
2324 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2303 ch = next_char ();
2326 } 2304 }
2327 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2329 2309
2330 /* 2310 /*
2331 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2314 */
2336 if (refreshnow) 2315 if (refreshnow)
2337 { 2316 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true; 2317 flag = true;
2343 scr_refresh (refresh_type); 2318 scr_refresh ();
2344 } 2319 want_refresh = 1;
2345 } 2320 }
2346 2321
2347 } 2322 }
2348 else 2323 else
2349 { 2324 {
… …
2363 } 2338 }
2364 2339
2365 return flag; 2340 return flag;
2366} 2341}
2367 2342
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character 2343// read the next character
2378unicode_t 2344wchar_t
2379rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2380{ 2346{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2348 {
2383 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2351 return *cmdbuf_ptr++;
2386 2352
2387 wchar_t wc; 2353 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2355
2390 if (len == (size_t)-2) 2356 if (len == (size_t)-2)
2391 { 2357 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2358 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2359 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2360 break;
2395 } 2361 }
2396 2362
2397 if (len == (size_t)-1) 2363 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2365
2400 // assume wchar == unicode 2366 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2402 return wc; 2368 return wc & UNICODE_MASK;
2403 } 2369 }
2404 2370
2405 return NOCHAR; 2371 return NOCHAR;
2406} 2372}
2373
2374// read the next octet
2375uint32_t
2376rxvt_term::next_octet () NOTHROW
2377{
2378 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR;
2381}
2382
2383static class out_of_input out_of_input;
2407 2384
2408/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2409/* 2386/*
2410 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2411 * to the command. 2388 * to the command.
2412 */ 2389 */
2413unicode_t 2390wchar_t
2414rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2392{
2416 unicode_t c = next_char (); 2393 wchar_t c = next_char ();
2417 2394
2418 if (c == NOCHAR) 2395 if (c == NOCHAR)
2419 throw out_of_input; 2396 throw out_of_input;
2420 2397
2421 return c; 2398 return c;
2422} 2399}
2423 2400
2424unicode_t 2401uint32_t
2425rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2403{
2427 unicode_t c = next_octet (); 2404 uint32_t c = next_octet ();
2428 2405
2429 if (c == NOCHAR) 2406 if (c == NOCHAR)
2430 throw out_of_input; 2407 throw out_of_input;
2431 2408
2432 return c; 2409 return c;
… …
2496 { 2473 {
2497 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2498 break; /* done = 1 */ 2475 break; /* done = 1 */
2499 } 2476 }
2500 } 2477 }
2501 2478
2502 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2503 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2504 { 2481 {
2505 done = 1; 2482 done = 1;
2506 break; 2483 break;
… …
2532 case C0_ESC: 2509 case C0_ESC:
2533 process_escape_seq (); 2510 process_escape_seq ();
2534 break; 2511 break;
2535 case C0_ENQ: /* terminal Status */ 2512 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2513 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2514 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2515 else
2540 tt_write ((unsigned char *)VT100_ANS, 2516 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2517 break;
2543 case C0_BEL: /* bell */ 2518 case C0_BEL: /* bell */
2544 scr_bell (); 2519 scr_bell ();
2545 break; 2520 break;
2546 case C0_BS: /* backspace */ 2521 case C0_BS: /* backspace */
… …
2570 process_dcs_seq (); 2545 process_dcs_seq ();
2571 break; 2546 break;
2572 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2573 process_csi_seq (); 2548 process_csi_seq ();
2574 break; 2549 break;
2575 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2576 process_osc_seq (); 2551 process_osc_seq ();
2577 break; 2552 break;
2578#endif 2553#endif
2579 } 2554 }
2580} 2555}
… …
2645void 2620void
2646rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2647{ 2622{
2648 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2649 2624
2650 if (PrivateModes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
2651 { 2626 {
2652 process_escape_vt52 (ch); 2627 process_escape_vt52 (ch);
2653 return; 2628 return;
2654 } 2629 }
2655 2630
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2646 break;
2672 case '+': 2647 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 2649 break;
2675#ifndef NO_FRILLS 2650#if !ENABLE_MINIMAL
2676 case '6': 2651 case '6':
2677 scr_backindex (); 2652 scr_backindex ();
2678 break; 2653 break;
2679#endif 2654#endif
2680 case '7': 2655 case '7':
2681 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
2682 break; 2657 break;
2683 case '8': 2658 case '8':
2684 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
2685 break; 2660 break;
2686#ifndef NO_FRILLS 2661#if !ENABLE_MINIMAL
2687 case '9': 2662 case '9':
2688 scr_forwardindex (); 2663 scr_forwardindex ();
2689 break; 2664 break;
2690#endif 2665#endif
2691 case '=': 2666 case '=':
… …
2701 break; 2676 break;
2702 2677
2703 /* 8.3.87: NEXT LINE */ 2678 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2679 case C1_NEL: /* ESC E */
2705 { 2680 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 2681 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 2683 }
2709 break; 2684 break;
2710 2685
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2686 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2687 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 2709 process_dcs_seq ();
2735 break; 2710 break;
2736 2711
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2713 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 2715 break; /* steal obsolete ESC [ c */
2742 2716
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 2718 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 2719 process_csi_seq ();
… …
2807rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
2808{ 2782{
2809 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
2810 unsigned int nargs, p; 2784 unsigned int nargs, p;
2811 int n, ndef; 2785 int n, ndef;
2812 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
2813 2787
2814 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
2815 arg[--nargs] = 0;
2816 2789
2817 priv = 0; 2790 priv = 0;
2818 ch = cmd_getc (); 2791 ch = cmd_getc ();
2819 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2820 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 2829 if (arg[p] == -1)
2857 arg[p] = ndef; 2830 arg[p] = ndef;
2858 2831
2859#ifdef DEBUG_CMD
2860 fprintf (stderr, "CSI ");
2861 for (p = 0; p < nargs; p++)
2862 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2863 fprintf (stderr, "%c\n", ch);
2864#endif
2865
2866 /* 2832 /*
2867 * private mode handling 2833 * private mode handling
2868 */ 2834 */
2869 if (priv) 2835 if (priv)
2870 { 2836 {
2871 switch (priv) 2837 switch (priv)
2872 { 2838 {
2873 case '>': 2839 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2847 // that we do not support xterm mouse reporting (should be 95 when we do).
2848 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2849 tt_printf ("\033[>%d;94;0c", 'U');
2850 }
2876 break; 2851 break;
2877 case '?': 2852 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 2854 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 2855 break;
… …
2985 2960
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2961 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 2962 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 2963 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2964 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2965 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 2966 break;
2992 2967
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2968 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 2970 break;
2997 2971
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2972 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 2973 process_sgr_mode (nargs, arg);
3000 break; 2974 break;
… …
3007 break; 2981 break;
3008 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3009 scr_report_position (); 2983 scr_report_position ();
3010 break; 2984 break;
3011 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 2986 if (option (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 2988 break;
3015 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 2991 break;
3018 } 2992 }
… …
3054 break; 3028 break;
3055 3029
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3030 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3031 if (arg[0] == 4)
3058 scr_insert_mode (0); 3032 scr_insert_mode (0);
3033 else if (arg[0] == 20)
3034 priv_modes &= ~PrivMode_LFNL;
3059 break; 3035 break;
3060 3036
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3037 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3038 if (arg[0] == 4)
3063 scr_insert_mode (1); 3039 scr_insert_mode (1);
3040 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL;
3064 break; 3042 break;
3065 3043
3066 /* 3044 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3045 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3046 */
… …
3080 break; 3058 break;
3081 case CSI_75: 3059 case CSI_75:
3082 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
3083 break; 3061 break;
3084 3062
3085#ifndef NO_FRILLS 3063#if !ENABLE_MINIMAL
3086 case CSI_74: 3064 case CSI_74:
3087 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
3088 break; 3066 break;
3089#endif 3067#endif
3090 3068
… …
3097 break; 3075 break;
3098 } 3076 }
3099} 3077}
3100/*}}} */ 3078/*}}} */
3101 3079
3102#ifndef NO_FRILLS 3080#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3081/* ARGSUSED */
3104void 3082void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3084{
3107 int x, y; 3085 int x, y;
3108 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3109 Window wdummy; 3087 Window wdummy;
3088
3089 dLocal (Display *, dpy);
3110 3090
3111 if (nargs == 0) 3091 if (nargs == 0)
3112 return; 3092 return;
3113 3093
3114 switch (args[0]) 3094 switch (args[0])
3115 { 3095 {
3116 /* 3096 /*
3117 * commands 3097 * commands
3118 */ 3098 */
3119 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3100 XMapWindow (dpy, parent[0]);
3121 break; 3101 break;
3122 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3103 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3104 break;
3126 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3107 break;
3129 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3110 break;
3132 case 5: /* raise window */ 3111 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3134 break; 3113 break;
3135 case 6: /* lower window */ 3114 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3137 break; 3116 break;
3138 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3139 scr_touch (true); 3118 scr_touch (true);
3140 break; 3119 break;
3141 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3121 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3122 (unsigned int) (args[1] * fheight));
3144 break; 3123 break;
3145 3124
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3125 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3126 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3128 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3129 (unsigned int) (args[1] * fheight));
3151 break; 3130 break;
3152
3153 3131
3154 /* 3132 /*
3155 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3156 */ 3134 */
3157 case 11: /* report window state */ 3135 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3138 break;
3161 case 13: /* report window position */ 3139 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3145 break;
3168 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3149 break;
3172 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3152 break;
3175 case 19: /* report window size (chars) */ 3153 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3155 break;
3178 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3157 {
3181 char *s; 3158 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s);
3184 } 3162 }
3185 break; 3163 break;
3186 case 21: /* report window title */ 3164 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3165 {
3189 char *s; 3166 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s);
3192 } 3170 }
3193 break; 3171 break;
3194 } 3172 }
3195} 3173}
3196#endif 3174#endif
3197 3175
3198/*----------------------------------------------------------------------*/ 3176/*----------------------------------------------------------------------*/
3199/* 3177/*
3200 * get input up until STRING TERMINATOR (or BEL) 3178 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3179 * ends_how is terminator used. returned input must be free()'d
3202 */ 3180 */
3203unsigned char * 3181char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3182rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3183{
3206 unicode_t prev = 0, ch; 3184 unicode_t ch;
3185 bool seen_esc = false;
3207 unsigned int n = 0; 3186 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3187 wchar_t string[STRING_MAX];
3210 3188
3211 while ((ch = cmd_getc ()) != NOCHAR) 3189 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3190 {
3213 if (prev == C0_ESC) 3191 if (seen_esc)
3214 { 3192 {
3215 if (ch == 0x5c) /* 7bit ST */ 3193 if (ch == 0x5c) /* 7bit ST */
3216 break; 3194 break;
3217 else 3195 else
3218 return NULL; 3196 return NULL;
3219 } 3197 }
3198 else if (ch == C0_ESC)
3199 {
3200 seen_esc = true;
3201 continue;
3202 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3222 else if (ch < 0x20) 3207 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3224 3209
3225 if (n >= sizeof (string) - 1) 3210 seen_esc = false;
3211
3212 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3213 // stop at some sane length
3227 return NULL; 3214 return NULL;
3228 3215
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
3235 string[n++] = prev = ch; 3216 string[n++] = ch;
3236 } 3217 }
3237 3218
3238 string[n++] = '\0'; 3219 string[n++] = '\0';
3239 3220
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3222
3245 return s; 3223 return rxvt_wcstombs (string);
3246} 3224}
3247 3225
3248/*----------------------------------------------------------------------*/ 3226/*----------------------------------------------------------------------*/
3249/* 3227/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3229 */
3252void 3230void
3253rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3254{ 3232{
3255 unsigned char *s; 3233 char *s;
3256 unicode_t eh; 3234 unicode_t eh;
3257 3235
3258 /* 3236 /*
3259 * Not handled yet 3237 * Not handled yet
3260 */ 3238 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3257 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3258 arg = arg * 10 + (ch - '0');
3281 3259
3282 if (ch == ';') 3260 if (ch == ';')
3283 { 3261 {
3284 unsigned char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3285 3263
3286 if (s) 3264 if (s)
3287 { 3265 {
3288 process_xterm_seq (arg, (char *)s, eh); 3266 process_xterm_seq (arg, s, eh);
3289 free (s); 3267 free (s);
3290 } 3268 }
3291 } 3269 }
3292} 3270}
3293 3271
3294void 3272void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3274{
3297 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3298 { 3276 {
3299 if (Options & Opt_insecure) 3277 rgba c;
3300 { 3278 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3279
3302 PixColorsFocused[color].get (display, r, g, b); 3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3286 }
3306 else 3287 else
3307 set_window_color (color, str); 3288 set_window_color (color, str);
3308} 3289}
3309 3290
3310/* 3291/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3293 */
3335void 3294void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3295rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3296{
3338 int changed = 0;
3339 int color; 3297 int color;
3340 char *buf, *name; 3298 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3300 int saveop = op;
3301
3302 dLocal (Display *, dpy);
3342 3303
3343 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3344 switch (op) 3309 switch (op)
3345 { 3310 {
3346 case XTerm_name: 3311 case XTerm_name:
3347 set_title (str); 3312 set_title (str);
3348 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3353 set_title (str); 3318 set_title (str);
3354 break; 3319 break;
3355 case XTerm_property: 3320 case XTerm_property:
3356 if (str[0] == '?') 3321 if (str[0] == '?')
3357 { 3322 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3323 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3324 Atom actual_type;
3360 int actual_format; 3325 int actual_format;
3361 unsigned long nitems; 3326 unsigned long nitems;
3362 unsigned long bytes_after; 3327 unsigned long bytes_after;
3363 unsigned char *value = 0; 3328 unsigned char *value = 0;
3364 const char *str = ""; 3329 const char *str = "";
3365 3330
3366 if (prop 3331 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3336 && actual_type != None
3372 && actual_format == 8) 3337 && actual_format == 8)
3373 str = (const char *)(value); 3338 str = (const char *)(value);
3374 3339
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3341
3377 XFree (value); 3342 XFree (value);
3378 } 3343 }
3379 else 3344 else
3380 { 3345 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3347
3383 if (eq) 3348 if (eq)
3384 { 3349 {
3385 *eq = 0; 3350 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3351 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3352 }
3391 else 3353 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3354 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3355 display->atom (str));
3394 } 3356 }
3395 break; 3357 break;
3396 3358
3397 case XTerm_Color: 3359 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3360 for (buf = (char *)str; buf && *buf;)
3399 { 3361 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3362 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3363 break;
3402 3364
3403 *name++ = '\0'; 3365 *name++ = '\0';
3404 color = atoi (buf); 3366 color = atoi (buf) + minCOLOR;
3405 3367
3406 if (color < 0 || color >= TOTAL_COLORS) 3368 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3369 break;
3408 3370
3409 if ((buf = STRCHR (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3372 *buf++ = '\0';
3411 3373
3412 if (name[0] == '?' && !name[1]) 3374 process_color_seq (op, color, name, resp);
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3422 set_window_color (color + minCOLOR, name);
3423 } 3375 }
3424 break; 3376 break;
3425 case XTerm_Color00: 3377 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3378 process_color_seq (op, Color_fg, str, resp);
3427 break; 3379 break;
3428 case XTerm_Color01: 3380 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3430 break; 3382 break;
3431#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3385 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3386 break;
3435#endif 3387#endif
3436 case XTerm_Color_pointer_fg: 3388 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3390 break;
3439 case XTerm_Color_pointer_bg: 3391 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3392 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3393 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break;
3446 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break;
3449 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3396 process_color_seq (op, Color_RV, str, resp);
3451 break; 3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp);
3401 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp);
3405 break;
3406 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp);
3408 break;
3452#endif 3409#endif
3410#if ENABLE_TRANSPARENCY
3411 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp);
3413 {
3414 bool changed = false;
3415 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3453 3422
3423 break;
3424#endif
3425
3426#if XPM_BACKGROUND
3454 case XTerm_Pixmap: 3427 case Rxvt_Pixmap:
3455 if (*str != ';') 3428 if (!strcmp (str, "?"))
3456 { 3429 {
3457#if XPM_BACKGROUND 3430 char str[256];
3458 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true);
3462 }
3463 while ((str = STRCHR (str, ';')) != NULL)
3464 {
3465 str++;
3466#if XPM_BACKGROUND
3467 changed += scale_pixmap (str);
3468#endif
3469 3431
3470 } 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3471 if (changed) 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3472 { 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3473#ifdef XPM_BACKGROUND 3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3474 resize_pixmap ();
3475#endif
3476 scr_touch (true);
3477 }
3478 break;
3479
3480 case XTerm_restoreFG:
3481 set_window_color (Color_fg, str);
3482 break;
3483 case XTerm_restoreBG:
3484 set_window_color (Color_bg, str);
3485 break;
3486
3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3489 break;
3490
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 } 3436 }
3512 else 3437 else
3513 { 3438 {
3439 int changed = 0;
3440
3441 if (*str != ';')
3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3514 set_locale (str); 3451 while (str)
3515# ifdef USE_XIM 3452 {
3516 im_cb (); 3453 str++;
3517# endif 3454 if (bgPixmap.set_geometry (str))
3455 changed++;
3456 str = strchr (str, ';');
3457 }
3458 if (changed)
3459 update_background ();
3518 } 3460 }
3519 break; 3461 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif 3462#endif
3530 3463
3531#ifdef MENUBAR 3464 case Rxvt_restoreFG:
3532 case XTerm_Menu: 3465 set_window_color (Color_fg, str);
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break; 3466 break;
3536#endif 3467 case Rxvt_restoreBG:
3468 set_window_color (Color_bg, str);
3469 break;
3470
3471 case XTerm_logfile:
3472 // TODO, when secure mode?
3473 break;
3474
3537#if 0 3475#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3476 case Rxvt_dumpscreen: /* no error notices */
3539 { 3477 {
3540 int fd; 3478 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3480 {
3543 scr_dump (fd); 3481 scr_dump (fd);
3544 close (fd); 3482 close (fd);
3545 } 3483 }
3546 } 3484 }
3485 break;
3486#endif
3487 case XTerm_font:
3488 op = URxvt_font;
3489 case URxvt_font:
3490#if ENABLE_STYLES
3491 case URxvt_boldFont:
3492 case URxvt_italicFont:
3493 case URxvt_boldItalicFont:
3494#endif
3495 if (query)
3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3498 ? fontset[op - URxvt_font]->fontdesc : "",
3499 resp);
3500 else
3501 {
3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
3503
3504 res = strdup (str);
3505 allocated.push_back ((void *)res);
3506 set_fonts ();
3507 }
3508 break;
3509
3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3519 case URxvt_locale:
3520 if (query)
3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3522 else
3523 {
3524 set_locale (str);
3525 pty->set_utf8_mode (enc_utf8);
3526 init_xlocale ();
3527 }
3528 break;
3529
3530 case URxvt_view_up:
3531 case URxvt_view_down:
3532 {
3533 int lines = atoi (str);
3534
3535 if (lines)
3536 scr_page (op == URxvt_view_up ? UP : DN, lines);
3537 else
3538 scr_erase_savelines ();
3539 }
3540
3541 break;
3542#endif
3543
3544#if ENABLE_PERL
3545 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3547 ; // no responses yet
3547 break; 3548 break;
3548#endif 3549#endif
3549 } 3550 }
3550} 3551}
3551/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
… …
3565{ 3566{
3566 int state; 3567 int state;
3567 3568
3568 if (mode == 's') 3569 if (mode == 's')
3569 { 3570 {
3570 SavedModes |= (PrivateModes & bit); 3571 SavedModes |= (priv_modes & bit);
3571 return -1; 3572 return -1;
3572 } 3573 }
3573 else 3574 else
3574 { 3575 {
3575 if (mode == 'r') 3576 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3578 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3579 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3580 PrivMode (state, bit);
3580 } 3581 }
3581 3582
3582 return state; 3583 return state;
3583} 3584}
3584 3585
3585/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3586void 3587void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 3589{
3589 unsigned int i, j; 3590 unsigned int i, j;
3590 int state; 3591 int state;
3591 3592
3592 static const struct 3593 static const struct
3593 { 3594 {
3594 const int argval; 3595 const int argval;
3595 const unsigned long bit; 3596 const unsigned long bit;
3596 }
3597
3598 argtopriv[] = { 3597 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
3600 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
3601 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
3605 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3607 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 3608 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3611#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3613 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3614 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3615 // 45 margin bell NYI
3620 // 46 start logging 3616 // 46 start logging
… …
3660 } 3656 }
3661 3657
3662 /* extra handling for values with state unkept */ 3658 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3659 switch (arg[i])
3664 { 3660 {
3661#if ENABLE_STYLES
3662 case 1021:
3663 set_option (Opt_intensityStyles, mode);
3664
3665 scr_touch (true);
3666 break;
3667#endif
3665 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
3669 case 1049:
3666 if (Options & Opt_secondaryScreen) 3670 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 3671 if (mode == 0)
3668 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3669 else if (mode == 1) 3673 else if (mode == 1)
3670 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
3671 break; 3675 break;
… …
3682 * within VT52 mode 3686 * within VT52 mode
3683 */ 3687 */
3684 PrivMode (1, PrivMode_vt52); 3688 PrivMode (1, PrivMode_vt52);
3685 break; 3689 break;
3686 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3692 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 3693 break;
3690 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3691 if (state) 3695 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 3696 break;
3696 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
3698 break; 3699 break;
3699 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 3704 scr_autowrap (state);
3704 break; 3705 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~PrivMode_MouseX11;
3709 break; 3710 break;
3710#ifdef menuBar_esc
3711 case menuBar_esc:
3712#ifdef MENUBAR
3713 map_menuBar (state);
3714#endif
3715 break;
3716#endif
3717#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
3718 case scrollBar_esc: 3712 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 3713 if (scrollbar_mapping (state))
3720 { 3714 {
3721 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
… …
3733 break; 3727 break;
3734 /* case 66: - application key pad */ 3728 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 3732 priv_modes &= ~PrivMode_MouseX10;
3739 break; 3733 break;
3740#if 0 3734#if 0
3741 case 1001: 3735 case 1001:
3742 break; /* X11 mouse highlighting */ 3736 break; /* X11 mouse highlighting */
3743#endif 3737#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 3738 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 3739 set_option (Opt_scrollTtyOutput, !state);
3749 break; 3740 break;
3750 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 3742 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 3743 break;
3756 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 3745 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 3747 scr_erase_screen (2);
3760 scr_change_screen (state); 3748 scr_change_screen (state);
3761 break; 3749 break;
3762 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 3751 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 3752 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 3754 scr_erase_screen (2);
3767 break; 3755 break;
3768 default: 3756 default:
3769 break; 3757 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 3783 rendset = 0, rendstyle = ~RS_None;
3796 break; 3784 break;
3797 case 1: 3785 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 3786 rendset = 1, rendstyle = RS_Bold;
3799 break; 3787 break;
3800 //case 2: // faint or second colour 3788 //case 2: // low intensity
3789 case 3:
3790 rendset = 1, rendstyle = RS_Italic;
3791 break;
3801 case 4: 3792 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 3793 rendset = 1, rendstyle = RS_Uline;
3803 break; 3794 break;
3804 case 5: // slowly blinking 3795 case 5: // slowly blinking
3805 case 6: // rapidly blinking 3796 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 3808 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 3809 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 3810 //...
3820 //case 19: // ninth alt font 3811 //case 19: // ninth alt font
3821 //case 20: // gothic 3812 //case 20: // gothic
3822 case 21: // disable bold, faint 3813 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 3814 rendset = 0, rendstyle = RS_Bold;
3824 break; 3815 break;
3825 case 22: 3816 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 3817 rendset = 0, rendstyle = RS_Bold;
3827 break; 3818 break;
3828 //case 23: disable italic 3819 case 23: // disable italic
3820 rendset = 0, rendstyle = RS_Italic;
3821 break;
3829 case 24: 3822 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 3823 rendset = 0, rendstyle = RS_Uline;
3831 break; 3824 break;
3832 case 25: 3825 case 25:
3826 rendset = 0, rendstyle = RS_Blink;
3827 break;
3828 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 3829 rendset = 0, rendstyle = RS_Blink;
3834 break; 3830 break;
3835 case 27: 3831 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 3832 rendset = 0, rendstyle = RS_RVid;
3837 break; 3833 break;
… …
3855 case 35: 3851 case 35:
3856 case 36: 3852 case 36:
3857 case 37: 3853 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3854 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 3855 break;
3860#ifdef TTY_256COLOR 3856 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 3857 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 3858 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3859 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 3860 i += 2;
3866 } 3861 }
3867 break; 3862 break;
3868#endif
3869 case 39: /* default fg */ 3863 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 3864 scr_color (Color_fg, Color_fg);
3871 break; 3865 break;
3872 3866
3873 case 40: 3867 case 40:
… …
3878 case 45: 3872 case 45:
3879 case 46: 3873 case 46:
3880 case 47: 3874 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3875 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 3876 break;
3883#ifdef TTY_256COLOR 3877 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 3878 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 3879 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3880 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 3881 i += 2;
3889 } 3882 }
3890 break; 3883 break;
3891#endif
3892 case 49: /* default bg */ 3884 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 3885 scr_color (Color_bg, Color_bg);
3894 break; 3886 break;
3895 3887
3896#ifndef NO_BRIGHTCOLOR 3888 //case 50: // not variable spacing
3889
3890#if !ENABLE_MINIMAL
3897 case 90: 3891 case 90:
3898 case 91: /* set bright fg color */ 3892 case 91: /* set bright fg color */
3899 case 92: 3893 case 92:
3900 case 93: 3894 case 93:
3901 case 94: 3895 case 94:
3902 case 95: 3896 case 95:
3903 case 96: 3897 case 96:
3904 case 97: 3898 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3899 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 3900 break;
3908 case 100: 3901 case 100:
3909 case 101: /* set bright bg color */ 3902 case 101: /* set bright bg color */
3910 case 102: 3903 case 102:
3911 case 103: 3904 case 103:
3912 case 104: 3905 case 104:
3913 case 105: 3906 case 105:
3914 case 106: 3907 case 106:
3915 case 107: 3908 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3909 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 3910 break;
3919#endif 3911#endif
3920
3921 } 3912 }
3922 } 3913 }
3923} 3914}
3924/*}}} */ 3915/*}}} */
3925 3916
… …
3929{ 3920{
3930 unicode_t ch, cmd = cmd_getc (); 3921 unicode_t ch, cmd = cmd_getc ();
3931 3922
3932 if (cmd == 'Q') 3923 if (cmd == 'Q')
3933 { /* query graphics */ 3924 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 3926 return;
3936 } 3927 }
3937 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
3938 do 3929 do
3939 ch = cmd_getc (); 3930 ch = cmd_getc ();
… …
3949 */ 3940 */
3950void 3941void
3951rxvt_term::tt_printf (const char *fmt,...) 3942rxvt_term::tt_printf (const char *fmt,...)
3952{ 3943{
3953 va_list arg_ptr; 3944 va_list arg_ptr;
3954 unsigned char buf[256]; 3945 char buf[256];
3955 3946
3956 va_start (arg_ptr, fmt); 3947 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 3949 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 3950 tt_write (buf, strlen (buf));
3960} 3951}
3961 3952
3962/* ---------------------------------------------------------------------- */ 3953/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 3954/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 3955 * or generated by us in response to a query ESC sequence.
3965 */ 3956 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958
3966void 3959void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3960rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 3961{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3963 return;
3970 3964
3971 if (len) 3965 if (pty->pty < 0)
3966 return;
3967
3968 if (v_buflen == 0)
3969 {
3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3971
3972 if ((unsigned int)written == len)
3973 return;
3974
3975 data += written;
3976 len -= written;
3972 { 3977 }
3978
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3980
3981 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len;
3983
3984 pty_ev.set (EVENT_READ | EVENT_WRITE);
3985}
3986
3987void rxvt_term::pty_write ()
3988{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3990
3991 if (written > 0)
3992 {
3993 v_buflen -= written;
3994
3973 if (v_buflen == 0) 3995 if (v_buflen == 0)
3974 { 3996 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 3997 free (v_buffer);
4002 v_buffer = 0; 3998 v_buffer = 0;
4003 v_buflen = 0; 3999 v_buflen = 0;
4004 4000
4005 pty_ev.set (EVENT_READ); 4001 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4002 return;
4018 } 4003 }
4004
4005 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4006 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ);
4020} 4009}
4021 4010
4022/*----------------------- end-of-file (C source) -----------------------*/ 4011/*----------------------- end-of-file (C source) -----------------------*/
4023 4012

Diff Legend

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