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.359 by ayin, Mon Oct 15 14:56:06 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) 1039
1040#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ())
662 { 1042 {
663 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
664 scr_clear ();
665 scr_touch (false); 1044 scr_touch (false);
666 } 1045 }
667#endif 1046#endif
668 1047
669 if (want_refresh) 1048 if (want_refresh)
670 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
671 scr_refresh (refresh_type); 1088 scr_refresh ();
672 scrollbar_show (1); 1089 scrollbar_show (1);
673#ifdef USE_XIM 1090#ifdef USE_XIM
674 IMSendSpot (); 1091 IMSendSpot ();
675#endif 1092#endif
676 } 1093 }
677 1094
678 display->flush (); 1095 display->flush ();
679
680 flush_ev.stop ();
681} 1096}
682 1097
683void 1098void
684rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
685{ 1100{
686 SET_R (this); 1101 make_current ();
687 SET_LOCALE (locale);
688 1102
689 display->flush (); 1103 display->flush ();
690 1104
691 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1107}
694 1108
695void 1109void
696rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
697{ 1111{
698 SET_R (this); 1112 make_current ();
699 SET_LOCALE (locale);
700 1113
701 refresh_limit = 1;
702 refresh_count = 0; 1114 refresh_count = 0;
703 flush (); 1115 flush ();
704} 1116}
705 1117
706#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1121{
710 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1123 want_refresh = 1;
712 1124
713 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1126}
715#endif 1127#endif
716 1128
717#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
718void 1130void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1145{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1148 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1149 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1151 }
741} 1152}
742#endif 1153#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1158{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1160 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1162 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1164 }
755} 1165}
756#endif 1166#endif
… …
761{ 1171{
762 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1175 {
766 refresh_type |= SMOOTH_REFRESH; 1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
767 want_refresh = 1; 1179 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1181 }
770} 1182}
771#endif 1183#endif
772 1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
773bool 1210bool
774rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
775{ 1212{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1214
778 if (CBUFSIZ == n) 1215 if (CBUFSIZ == n)
779 { 1216 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1218 n = 0;
782 } 1219 }
783 1220
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
787 1224
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1226
790 if (n > 0) 1227 if (r > 0)
791 { 1228 {
792 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
793 return true; 1230 return true;
794 } 1231 }
795 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
796 destroy (); 1244 destroy ();
797 1245 }
1246
798 return false; 1247 return false;
799} 1248}
800 1249
801void 1250void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1252{
804 SET_R (this); 1253 make_current ();
805 SET_LOCALE (locale);
806 1254
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1257 while (pty_fill ())
812 if (cmd_parse ()) 1258 if (cmd_parse ())
813 break; 1259 break;
1260
1261 if (revents & EVENT_WRITE)
1262 pty_write ();
814} 1263}
815 1264
816void 1265void
817rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
818{ 1267{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
820 recolour_cursor (); 1269 recolour_cursor ();
821 1270
822#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1272 hidden_pointer = 0;
824 1273
825 if (Options & Opt_pointerBlank) 1274 if (option (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1276#endif
828} 1277}
829 1278
830#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
831void 1280void
832rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
833{ 1282{
834 if (! (Options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
835 return; 1284 return;
836 1285
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
838 XFlush (display->display); 1287 XFlush (dpy);
839 1288
840 hidden_pointer = 1; 1289 hidden_pointer = 1;
841} 1290}
842 1291
843void 1292void
844rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
845{ 1294{
846 SET_R (this); 1295 make_current ();
847 SET_LOCALE (locale);
848 1296
849 pointer_blank (); 1297 pointer_blank ();
850} 1298}
851#endif 1299#endif
852 1300
… …
854rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
855{ 1303{
856 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
857 int x, y; 1305 int x, y;
858 1306
859 x = ev.x; 1307 x = Pixel2Col (ev.x);
860 y = ev.y; 1308 y = Pixel2Row (ev.y);
861 pixel_position (&x, &y);
862 1309
863 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1311 button_number = 3;
866 }
867 else 1312 else
868 { 1313 {
869 button_number = MEvent.button - Button1; 1314 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1315 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1316 if (button_number >= 3)
872 button_number += (64 - 3); 1317 button_number += (64 - 3);
873 } 1318 }
874 1319
875 if (PrivateModes & PrivMode_MouseX10) 1320 if (priv_modes & PrivMode_MouseX10)
876 { 1321 {
877 /* 1322 /*
878 * do not report ButtonRelease 1323 * do not report ButtonRelease
879 * no state info allowed 1324 * no state info allowed
880 */ 1325 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1340 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1341 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1342#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1343 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1344#endif
900
901 } 1345 }
902 1346
903#ifdef DEBUG_MOUSEREPORT 1347#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1348 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1349 if (key_state & 16)
906 fputc ('C', stderr); 1350 fputc ('C', stderr);
907 if (key_state & 4) 1351 if (key_state & 4)
908 fputc ('S', stderr); 1352 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1356 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1357 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1358 button_number,
915 x + 1, 1359 x + 1,
916 y + 1); 1360 y + 1);
917#else 1361#endif
1362
918 tt_printf ("\033[M%c%c%c", 1363 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1364 (32 + button_number + key_state),
920 (32 + x + 1), 1365 (32 + x + 1),
921 (32 + y + 1)); 1366 (32 + y + 1));
922#endif
923} 1367}
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 1368
935/*{{{ process an X event */ 1369/*{{{ process an X event */
936void 1370void
937rxvt_term::x_cb (XEvent &ev) 1371rxvt_term::x_cb (XEvent &ev)
938{ 1372{
939 SET_R (this); 1373 make_current ();
940 SET_LOCALE (locale);
941 1374
942#if defined(CURSOR_BLINK) 1375 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 1376
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 if (ev.xany.window == vt
952 } 1378 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1379 && 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; 1380 return;
972#endif
973 1381
1382 // for XQueryPointer
974 Window unused_root, unused_child; 1383 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1384 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1385 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 1386
1027 switch (ev.type) 1387 switch (ev.type)
1028 { 1388 {
1029 case KeyPress: 1389 case KeyPress:
1030 lookup_key (ev.xkey); 1390 key_press (ev.xkey);
1031 break; 1391 break;
1032 1392
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease: 1393 case KeyRelease:
1035 { 1394 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; 1395 break;
1047 }
1048#endif
1049 1396
1050 case ButtonPress: 1397 case ButtonPress:
1051 button_press (ev.xbutton); 1398 button_press (ev.xbutton);
1052 break; 1399 break;
1053 1400
… …
1055 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1056 break; 1403 break;
1057 1404
1058 case ClientMessage: 1405 case ClientMessage:
1059 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1407 && !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 { 1408 {
1069 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1410 {
1071 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1412 {
1073 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1414 {
1075 XGetWindowProperty (display->display, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1416 destroy ();
1077 0L, 1000000L, 1417 }
1078 False, AnyPropertyType, 1418#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1420 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1422 &ev);
1082 XChangeProperty (display->display, display->root, 1423#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1424 }
1084 8, PropModeReplace, 1425 }
1085 data, STRLEN (data)); 1426#if ENABLE_XEMBED
1086 XFree (data); 1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1428 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1089 } 1435 }
1090#endif /* OFFIX_DND */
1091 break;
1092
1093 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1436 break;
1096 1437
1097 /* 1438 /*
1098 * XXX: this is not the _current_ arrangement 1439 * XXX: this is not the _current_ arrangement
1099 * Here's my conclusion: 1440 * Here's my conclusion:
… …
1118 break; 1459 break;
1119 } 1460 }
1120 break; 1461 break;
1121 1462
1122 case FocusIn: 1463 case FocusIn:
1123 if (!TermWin.focus) 1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1467 focus_in ();
1468 break;
1469
1470 case FocusOut:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_out ();
1475 break;
1476
1477 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1481 if (ev.xconfigure.window == parent[0])
1124 { 1482 {
1125 TermWin.focus = 1; 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1484 ;
1127#ifdef USE_XIM 1485
1128 if (Input_Context != NULL) 1486 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 { 1487 {
1138 PixColors = PixColorsFocused; 1488 seen_resize = 1;
1139 set_colorfgbg (); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1490 }
1491 else
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1143#endif 1496#endif
1144 1497 }
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1145 } 1499 }
1146 break; 1500 break;
1147 1501
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: 1502 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1504 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1505 && ev.xproperty.state == PropertyNewValue)
1506 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1507
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; 1508 break;
1201 1509
1202 case SelectionClear: 1510 case SelectionClear:
1203 selection_clear (); 1511 selection_clear ();
1204 break; 1512 break;
1205 1513
1206 case SelectionNotify: 1514 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1515 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1516 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1517 break;
1211 1518
1212 case SelectionRequest: 1519 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1520 selection_send (ev.xselectionrequest);
1214 break; 1521 break;
1215 1522
1523 case MapNotify:
1524 mapped = 1;
1525#ifdef TEXT_BLINK
1526 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1527#endif
1528 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 break;
1530
1216 case UnmapNotify: 1531 case UnmapNotify:
1217 TermWin.mapped = 0; 1532 mapped = 0;
1218#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1220#endif 1535#endif
1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1221 break; 1537 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 1538
1236 case GraphicsExpose: 1539 case GraphicsExpose:
1237 case Expose: 1540 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1239 { 1542 {
1240 do 1543 do
1544 {
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1549
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1551
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1250 1556 }
1251 scr_refresh (refresh_type); 1557 want_refresh = 1;
1252 } 1558 }
1253 else 1559 else
1254 { 1560 {
1255 XEvent unused_event; 1561 XEvent unused_event;
1256 1562
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1564 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1566 ;
1261 1567
1262 if (isScrollbarWindow (ev.xany.window)) 1568 if (isScrollbarWindow (ev.xany.window))
1263 { 1569 {
1264 scrollBar.setIdle (); 1570 scrollBar.setIdle ();
1265 scrollbar_show (0); 1571 scrollbar_show (0);
1266 } 1572 }
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 } 1573 }
1277 break; 1574 break;
1278 1575
1279 case MotionNotify: 1576 case MotionNotify:
1280#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1578 if (hidden_pointer)
1282 pointer_unblank (); 1579 pointer_unblank ();
1283#endif 1580#endif
1284#if MENUBAR 1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1582 break;
1583
1584 if (ev.xany.window == vt)
1286 { 1585 {
1287 menubar_control (ev.xbutton); 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1588 ; // 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))) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1590 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1592 ;
1300 1593
1301 XQueryPointer (display->display, TermWin.vt, 1594 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1597 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1598 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1600 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1602 {
1310#endif 1603#endif
1604#if ISO_14755
1605 // 5.4
1606 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1607 {
1608 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1609 break;
1610 }
1611#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1612 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1613 ev.xbutton.state & Button3Mask ? 2 : 0);
1614
1313#ifdef SELECTION_SCROLLING 1615#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1616 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1617 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1618 {
1317 int dist; 1619 int dist;
1318 1620
1319 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1625 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1626
1325 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1327 */ 1629 */
1328 selection_save_x=ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1631 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1632 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1633
1333 /* calc number of lines to scroll */ 1634 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1635 if (ev.xbutton.y < int_bwidth)
1335 { 1636 {
1336 scroll_selection_dir = UP; 1637 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1638 dist = int_bwidth - ev.xbutton.y;
1338 } 1639 }
1339 else 1640 else
1340 { 1641 {
1341 scroll_selection_dir = DN; 1642 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1643 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1644 }
1645
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1646 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1647 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1;
1347 MIN_IT (scroll_selection_lines, 1649 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1650 SELECTION_SCROLL_MAX_LINES);
1349 } 1651 }
1350 else 1652 else
1351 { 1653 {
1352 /* we are within the text window, so we 1654 /* we are within the text window, so we
1353 * shouldn't be scrolling 1655 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1657 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1658 sel_scroll_ev.stop();
1357 } 1659 }
1358#endif 1660#endif
1359#ifdef MOUSE_THRESHOLD 1661#ifdef MOUSE_THRESHOLD
1360
1361 } 1662 }
1362#endif 1663#endif
1363
1364 } 1664 }
1365 } 1665 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1667 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1669 MotionNotify, &ev))
1670 ;
1671
1370 XQueryPointer (display->display, scrollBar.win, 1672 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1673 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1674 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1675 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1676 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1678 scrollbar_size ());
1377 scr_refresh (refresh_type);
1378 refresh_limit = 0; 1679 want_refresh = 1;
1379 scrollbar_show (1); 1680 scrollbar_show (1);
1380 } 1681 }
1381 break; 1682 break;
1382 } 1683 }
1383}
1384 1684
1685#if defined(CURSOR_BLINK)
1686 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1711}
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM
1724 if (Input_Context != NULL)
1725 {
1726 IMSetPosition ();
1727 XSetICFocus (Input_Context);
1728 }
1729#endif
1730#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif
1734#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade])
1736 {
1737 pix_colors = pix_colors_focused;
1738 scr_recolour ();
1739 }
1740#endif
1741#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell))
1743 {
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif
1751 }
1752}
1753
1754void
1755rxvt_term::focus_out ()
1756{
1757 if (focus)
1758 {
1759 focus = 0;
1760 want_refresh = 1;
1761
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1763
1764#if ENABLE_FRILLS || ISO_14755
1765 if (iso14755buf)
1766 {
1767 iso14755buf = 0;
1768# if ISO_14755
1769 scr_overlay_off ();
1770# endif
1771 }
1772#endif
1773#if USE_XIM
1774 if (Input_Context != NULL)
1775 XUnsetICFocus (Input_Context);
1776#endif
1777#if CURSOR_BLINK
1778 if (option (Opt_cursorBlink))
1779 cursor_blink_ev.stop ();
1780 hidden_cursor = 0;
1781#endif
1782#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade])
1784 {
1785 pix_colors = pix_colors_unfocused;
1786 scr_recolour ();
1787 }
1788#endif
1789 }
1790}
1791
1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1803}
1804
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1385void 1806void
1386rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1808{
1388 SET_R (this); 1809 make_current ();
1389 SET_LOCALE (locale);
1390 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1391 switch (ev.type) 1816 switch (ev.type)
1392 { 1817 {
1393 case PropertyNotify: 1818 case PropertyNotify:
1819 /*
1820 * if user used some Esetroot compatible prog to set the root bg,
1821 * use the property to determine the pixmap. We use it later on.
1822 */
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1395 { 1825 {
1396 if (ev.xproperty.state == PropertyNewValue) 1826 bgPixmap.set_root_pixmap ();
1397 selection_property (ev.xproperty.window, ev.xproperty.atom); 1827 update_background ();
1398 break;
1399 } 1828 }
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; 1829 break;
1830 }
1419#endif 1831# endif
1420 }
1421} 1832}
1833#endif
1422 1834
1423void 1835void
1424rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
1425{ 1837{
1426 int reportmode = 0, clickintime; 1838 int reportmode = 0, clickintime;
1427 1839
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1840 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1841
1429 if (!bypass_keystate) 1842 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1843 reportmode = !! (priv_modes & PrivMode_mouse_report);
1844
1431 /* 1845 /*
1432 * VT window processing of button press 1846 * VT window processing of button press
1433 */ 1847 */
1434 if (ev.window == TermWin.vt) 1848 if (ev.window == vt)
1435 { 1849 {
1850 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1851 return;
1852
1853#if ISO_14755
1854 // 5.4
1855 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1856 {
1857 iso14755_54 (ev.x, ev.y);
1858 return;
1859 }
1860#endif
1861
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1862 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1863
1437 if (reportmode) 1864 if (reportmode)
1438 { 1865 {
1439 /* mouse report from vt window */ 1866 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1444 { 1871 {
1445 /* same button, within alloted time */ 1872 /* same button, within alloted time */
1446 MEvent.clicks++; 1873 MEvent.clicks++;
1874
1447 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1448 { 1876 {
1449 /* only report double clicks */ 1877 /* only report double clicks */
1450 MEvent.clicks = 2; 1878 MEvent.clicks = 2;
1451 mouse_report (ev); 1879 mouse_report (ev);
… …
1470 } 1898 }
1471 else 1899 else
1472 { 1900 {
1473 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1902 MEvent.clicks = 0;
1903
1475 switch (ev.button) 1904 switch (ev.button)
1476 { 1905 {
1477 case Button1: 1906 case Button1:
1907 /* allow meta + click to select rectangular areas */
1908 /* should be done in screen.C */
1909#if ENABLE_FRILLS
1910 selection.rect = !!(ev.state & ModMetaMask);
1911#else
1912 selection.rect = false;
1913#endif
1914
1478 /* allow shift+left click to extend selection */ 1915 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1916 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1917 {
1481 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1919 selection_rotate (ev.x, ev.y);
1483 else 1920 else
1484 selection_extend (ev.x, ev.y, 1); 1921 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1936 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1937 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1502 else 1939 else
1503 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1941
1504 MEvent.button = Button3; 1942 MEvent.button = Button3;
1505 break; 1943 break;
1506 } 1944 }
1507 } 1945 }
1946
1508 MEvent.time = ev.time; 1947 MEvent.time = ev.time;
1509 return; 1948 return;
1510 } 1949 }
1511 1950
1512 /* 1951 /*
… …
1623 case Button3: 2062 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != R_SB_XTERM)
1625 { 2064 {
1626 if (scrollbar_above_slider (ev.y)) 2065 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2067 scr_page (UP, nrow - 1);
1629# else 2068# else
1630 scr_page (UP, TermWin.nrow / 4); 2069 scr_page (UP, nrow / 4);
1631# endif 2070# endif
1632 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2073 scr_page (DN, nrow - 1);
1635# else 2074# else
1636 scr_page (DN, TermWin.nrow / 4); 2075 scr_page (DN, nrow / 4);
1637# endif 2076# endif
1638 else 2077 else
1639 scrollBar.setMotion (); 2078 scrollBar.setMotion ();
1640 } 2079 }
1641 else 2080 else
1642 { 2081 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2083 (nrow
1645 * scrollbar_position (ev.y) 2084 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2085 / scrollbar_size ()));
1647 } 2086 }
1648 2087
1649 break; 2088 break;
1650 } 2089 }
1651 } 2090 }
2091
1652 return; 2092 return;
1653 } 2093 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2094}
1662 2095
1663void 2096void
1664rxvt_term::button_release (XButtonEvent &ev) 2097rxvt_term::button_release (XButtonEvent &ev)
1665{ 2098{
1666 int reportmode = 0; 2099 int reportmode = 0;
1667 2100
1668 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2102 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2104
1672 if (scrollbar_isUpDn ()) 2105 if (scrollbar_isUpDn ())
1673 { 2106 {
1674 scrollBar.setIdle (); 2107 scrollBar.setIdle ();
1675 scrollbar_show (0); 2108 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2109 }
2110
1681#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2112 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
1684#endif 2114#endif
2115
1685 if (ev.window == TermWin.vt) 2116 if (ev.window == vt)
1686 { 2117 {
2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2119 return;
2120
2121#if ISO_14755
2122 // 5.4
2123 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2124 return;
2125#endif
2126
1687 if (reportmode) 2127 if (reportmode)
1688 { 2128 {
1689 /* mouse report from vt window */ 2129 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2130 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2131 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2145 MEvent.button = AnyButton;
1706 mouse_report (ev); 2146 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2147#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2148 return;
1709 } 2149 }
2150
1710 /* 2151 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2152 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2153 * when overriding mouse reporting
1713 */ 2154 */
1714 if (PrivateModes & PrivMode_mouse_report 2155 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2156 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2157 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2158 selection_extend (ev.x, ev.y, 0);
1718 2159
1719 switch (ev.button) 2160 switch (ev.button)
1720 { 2161 {
1721 case Button1: 2162 case Button1:
1722 case Button3: 2163 case Button3:
1723 selection_make (ev.time); 2164 selection_make (ev.time);
1724 break; 2165 break;
2166
1725 case Button2: 2167 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1727 break; 2170 break;
2171
1728#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
1729 case Button4: 2173 case Button4:
1730 case Button5: 2174 case Button5:
1731 { 2175 {
1732 int i; 2176 int i;
… …
1734 2178
1735 v = ev.button == Button4 ? UP : DN; 2179 v = ev.button == Button4 ? UP : DN;
1736 2180
1737 if (ev.state & ShiftMask) 2181 if (ev.state & ShiftMask)
1738 i = 1; 2182 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2183 else if (option (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2184 i = nrow - 1;
1741 else 2185 else
1742 i = 5; 2186 i = 5;
1743 2187
1744# ifdef MOUSE_SLIP_WHEELING 2188# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2189 if (ev.state & ControlMask)
1746 { 2190 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2191 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2192 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; 2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2194
1751 if (slip_wheel_ev.at < NOW) 2195 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2197
1754 slip_wheel_ev.start (); 2198 slip_wheel_ev.start ();
1755 } 2199 }
1756 else 2200 else
1757 { 2201 {
1758# endif 2202# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2203 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2204 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 2205# ifdef MOUSE_SLIP_WHEELING
1772 } 2206 }
1773#endif 2207# endif
1774 } 2208 }
1775 break; 2209 break;
1776#endif 2210#endif
1777 } 2211 }
1778 } 2212 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2213}
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 2214
2261/*}}} */ 2215/*}}} */
2262 2216
2263bool 2217bool
2264rxvt_term::cmd_parse () 2218rxvt_term::cmd_parse ()
2265{ 2219{
2266 bool flag = false; 2220 bool flag = false;
2267 unicode_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2269 2223
2270 for (;;) 2224 for (;;)
2271 { 2225 {
2272 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2273 { 2227 {
2274 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2229 ch = next_char ();
2276 }
2277 2230
2278 if (ch == NOCHAR) // TODO: improve 2231 if (ch == NOCHAR)
2279 break; 2232 break;
2233 }
2280 2234
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2236 {
2237 if (!seen_input)
2238 {
2239 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs
2243 // then sometimes get the size wrong.
2244 // unfortunately other programs are even more buggy and dislike
2245 // being sent SIGWINCH, so only do it when we were in fact being
2246 // resized.
2247 if (seen_resize && cmd_pid)
2248 kill (-cmd_pid, SIGWINCH);
2249 }
2250
2283 /* Read a text string from the input buffer */ 2251 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2252 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2253 bool refreshnow = false;
2286 int nlines = 0; 2254 int nlines = 0;
2287 unicode_t *str = buf; 2255 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2257
2289 for (;;) 2258 for (;;)
2290 { 2259 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2261 break;
2293 2262
2294 *str++ = ch; 2263 *str++ = ch;
2295 2264
2296 if (ch == C0_LF) 2265 if (ch == C0_LF || str >= eol)
2297 { 2266 {
2267 if (ch == C0_LF)
2298 nlines++; 2268 nlines++;
2269
2299 refresh_count++; 2270 refresh_count++;
2300 2271
2301 if (!(Options & Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 { 2273 {
2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2277 {
2304 refreshnow = true; 2278 refreshnow = true;
2305 ch = NOCHAR; 2279 ch = NOCHAR;
2306 break; 2280 break;
2281 }
2307 } 2282 }
2308 2283
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2285 if (nlines >= nrow - 1)
2311 { 2286 {
2287 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2289 scr_add_lines (buf, str - buf, nlines);
2290
2313 nlines = 0; 2291 nlines = 0;
2314 str = buf; 2292 str = buf;
2293 eol = str + min (ncol, UBUFSIZ);
2315 } 2294 }
2316 }
2317 2295
2318 if (str >= buf + UBUFSIZ) 2296 if (str >= eol)
2319 { 2297 {
2298 if (eol >= buf + UBUFSIZ)
2299 {
2320 ch = NOCHAR; 2300 ch = NOCHAR;
2321 break; 2301 break;
2302 }
2303 else
2304 eol = min (eol + ncol, buf + UBUFSIZ);
2305 }
2306
2322 } 2307 }
2323 2308
2324 seq_begin = cmdbuf_ptr; 2309 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2310 ch = next_char ();
2326 } 2311 }
2327 2312
2313 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2315 scr_add_lines (buf, str - buf, nlines);
2329 2316
2330 /* 2317 /*
2331 * If there have been a lot of new lines, then update the screen 2318 * 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. 2319 * 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 2320 * if skipScroll is enabled.
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2321 */
2336 if (refreshnow) 2322 if (refreshnow)
2337 { 2323 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true; 2324 flag = true;
2343 scr_refresh (refresh_type); 2325 scr_refresh ();
2344 } 2326 want_refresh = 1;
2345 } 2327 }
2346 2328
2347 } 2329 }
2348 else 2330 else
2349 { 2331 {
… …
2363 } 2345 }
2364 2346
2365 return flag; 2347 return flag;
2366} 2348}
2367 2349
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 2350// read the next character
2378unicode_t 2351wchar_t
2379rxvt_term::next_char () 2352rxvt_term::next_char () NOTHROW
2380{ 2353{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2354 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2355 {
2383 // assume 7-bit to be ascii ALWAYS 2356 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2357 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2358 return *cmdbuf_ptr++;
2386 2359
2387 wchar_t wc; 2360 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2361 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2362
2390 if (len == (size_t)-2) 2363 if (len == (size_t)-2)
2391 { 2364 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2365 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2366 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2367 break;
2395 } 2368 }
2396 2369
2397 if (len == (size_t)-1) 2370 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2372
2400 // assume wchar == unicode 2373 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2402 return wc; 2375 return wc & UNICODE_MASK;
2403 } 2376 }
2404 2377
2405 return NOCHAR; 2378 return NOCHAR;
2406} 2379}
2380
2381// read the next octet
2382uint32_t
2383rxvt_term::next_octet () NOTHROW
2384{
2385 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR;
2388}
2389
2390static class out_of_input out_of_input;
2407 2391
2408/* rxvt_cmd_getc () - Return next input character */ 2392/* rxvt_cmd_getc () - Return next input character */
2409/* 2393/*
2410 * Return the next input character after first passing any keyboard input 2394 * Return the next input character after first passing any keyboard input
2411 * to the command. 2395 * to the command.
2412 */ 2396 */
2413unicode_t 2397wchar_t
2414rxvt_term::cmd_getc () 2398rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2399{
2416 unicode_t c = next_char (); 2400 wchar_t c = next_char ();
2417 2401
2418 if (c == NOCHAR) 2402 if (c == NOCHAR)
2419 throw out_of_input; 2403 throw out_of_input;
2420 2404
2421 return c; 2405 return c;
2422} 2406}
2423 2407
2424unicode_t 2408uint32_t
2425rxvt_term::cmd_get8 () 2409rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2410{
2427 unicode_t c = next_octet (); 2411 uint32_t c = next_octet ();
2428 2412
2429 if (c == NOCHAR) 2413 if (c == NOCHAR)
2430 throw out_of_input; 2414 throw out_of_input;
2431 2415
2432 return c; 2416 return c;
… …
2496 { 2480 {
2497 if ((buf[len++] = cmd_getc ()) == 'i') 2481 if ((buf[len++] = cmd_getc ()) == 'i')
2498 break; /* done = 1 */ 2482 break; /* done = 1 */
2499 } 2483 }
2500 } 2484 }
2501 2485
2502 for (i = 0; i < len; i++) 2486 for (i = 0; i < len; i++)
2503 if (putc (buf[i], fd) == EOF) 2487 if (putc (buf[i], fd) == EOF)
2504 { 2488 {
2505 done = 1; 2489 done = 1;
2506 break; 2490 break;
… …
2532 case C0_ESC: 2516 case C0_ESC:
2533 process_escape_seq (); 2517 process_escape_seq ();
2534 break; 2518 break;
2535 case C0_ENQ: /* terminal Status */ 2519 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2520 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2521 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2522 else
2540 tt_write ((unsigned char *)VT100_ANS, 2523 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2524 break;
2543 case C0_BEL: /* bell */ 2525 case C0_BEL: /* bell */
2544 scr_bell (); 2526 scr_bell ();
2545 break; 2527 break;
2546 case C0_BS: /* backspace */ 2528 case C0_BS: /* backspace */
… …
2570 process_dcs_seq (); 2552 process_dcs_seq ();
2571 break; 2553 break;
2572 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2573 process_csi_seq (); 2555 process_csi_seq ();
2574 break; 2556 break;
2575 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
2576 process_osc_seq (); 2558 process_osc_seq ();
2577 break; 2559 break;
2578#endif 2560#endif
2579 } 2561 }
2580} 2562}
… …
2645void 2627void
2646rxvt_term::process_escape_seq () 2628rxvt_term::process_escape_seq ()
2647{ 2629{
2648 unicode_t ch = cmd_getc (); 2630 unicode_t ch = cmd_getc ();
2649 2631
2650 if (PrivateModes & PrivMode_vt52) 2632 if (priv_modes & PrivMode_vt52)
2651 { 2633 {
2652 process_escape_vt52 (ch); 2634 process_escape_vt52 (ch);
2653 return; 2635 return;
2654 } 2636 }
2655 2637
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 2652 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 2653 break;
2672 case '+': 2654 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 2655 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 2656 break;
2675#ifndef NO_FRILLS 2657#if !ENABLE_MINIMAL
2676 case '6': 2658 case '6':
2677 scr_backindex (); 2659 scr_backindex ();
2678 break; 2660 break;
2679#endif 2661#endif
2680 case '7': 2662 case '7':
2681 scr_cursor (SAVE); 2663 scr_cursor (SAVE);
2682 break; 2664 break;
2683 case '8': 2665 case '8':
2684 scr_cursor (RESTORE); 2666 scr_cursor (RESTORE);
2685 break; 2667 break;
2686#ifndef NO_FRILLS 2668#if !ENABLE_MINIMAL
2687 case '9': 2669 case '9':
2688 scr_forwardindex (); 2670 scr_forwardindex ();
2689 break; 2671 break;
2690#endif 2672#endif
2691 case '=': 2673 case '=':
… …
2701 break; 2683 break;
2702 2684
2703 /* 8.3.87: NEXT LINE */ 2685 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2686 case C1_NEL: /* ESC E */
2705 { 2687 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 2688 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 2689 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 2690 }
2709 break; 2691 break;
2710 2692
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2693 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2694 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 2716 process_dcs_seq ();
2735 break; 2717 break;
2736 2718
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2720 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 2722 break; /* steal obsolete ESC [ c */
2742 2723
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 2725 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 2726 process_csi_seq ();
… …
2807rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
2808{ 2789{
2809 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
2810 unsigned int nargs, p; 2791 unsigned int nargs, p;
2811 int n, ndef; 2792 int n, ndef;
2812 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
2813 2794
2814 for (nargs = ESC_ARGS; nargs > 0;) 2795 nargs = 0;
2815 arg[--nargs] = 0;
2816 2796
2817 priv = 0; 2797 priv = 0;
2818 ch = cmd_getc (); 2798 ch = cmd_getc ();
2819 if (ch >= '<' && ch <= '?') 2799 if (ch >= '<' && ch <= '?')
2820 { /* '<' '=' '>' '?' */ 2800 { /* '<' '=' '>' '?' */
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 2834 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 2835 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 2836 if (arg[p] == -1)
2857 arg[p] = ndef; 2837 arg[p] = ndef;
2858 2838
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 /* 2839 /*
2867 * private mode handling 2840 * private mode handling
2868 */ 2841 */
2869 if (priv) 2842 if (priv)
2870 { 2843 {
2871 switch (priv) 2844 switch (priv)
2872 { 2845 {
2873 case '>': 2846 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 2847 if (ch == CSI_DA) /* secondary device attributes */
2848 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2854 // that we do not support xterm mouse reporting (should be 95 when we do).
2855 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2856 tt_printf ("\033[>%d;94;0c", 'U');
2857 }
2876 break; 2858 break;
2877 case '?': 2859 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 2862 break;
… …
2985 2967
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2968 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 2969 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 2970 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2971 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2972 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 2973 break;
2992 2974
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2975 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 2976 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 2977 break;
2997 2978
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2979 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 2980 process_sgr_mode (nargs, arg);
3000 break; 2981 break;
… …
3007 break; 2988 break;
3008 case 6: /* CPR requested */ 2989 case 6: /* CPR requested */
3009 scr_report_position (); 2990 scr_report_position ();
3010 break; 2991 break;
3011 case 7: /* unofficial extension */ 2992 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 2993 if (option (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2994 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 2995 break;
3015 case 8: /* unofficial extension */ 2996 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2997 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 2998 break;
3018 } 2999 }
… …
3054 break; 3035 break;
3055 3036
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3037 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3038 if (arg[0] == 4)
3058 scr_insert_mode (0); 3039 scr_insert_mode (0);
3040 else if (arg[0] == 20)
3041 priv_modes &= ~PrivMode_LFNL;
3059 break; 3042 break;
3060 3043
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3044 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3045 if (arg[0] == 4)
3063 scr_insert_mode (1); 3046 scr_insert_mode (1);
3047 else if (arg[0] == 20)
3048 priv_modes |= PrivMode_LFNL;
3064 break; 3049 break;
3065 3050
3066 /* 3051 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3052 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3053 */
… …
3080 break; 3065 break;
3081 case CSI_75: 3066 case CSI_75:
3082 scr_cursor (RESTORE); 3067 scr_cursor (RESTORE);
3083 break; 3068 break;
3084 3069
3085#ifndef NO_FRILLS 3070#if !ENABLE_MINIMAL
3086 case CSI_74: 3071 case CSI_74:
3087 process_window_ops (arg, nargs); 3072 process_window_ops (arg, nargs);
3088 break; 3073 break;
3089#endif 3074#endif
3090 3075
… …
3097 break; 3082 break;
3098 } 3083 }
3099} 3084}
3100/*}}} */ 3085/*}}} */
3101 3086
3102#ifndef NO_FRILLS 3087#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3088/* ARGSUSED */
3104void 3089void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3091{
3107 int x, y; 3092 int x, y;
3108 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
3109 Window wdummy; 3094 Window wdummy;
3095
3096 dLocal (Display *, dpy);
3110 3097
3111 if (nargs == 0) 3098 if (nargs == 0)
3112 return; 3099 return;
3113 3100
3114 switch (args[0]) 3101 switch (args[0])
3115 { 3102 {
3116 /* 3103 /*
3117 * commands 3104 * commands
3118 */ 3105 */
3119 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3107 XMapWindow (dpy, parent[0]);
3121 break; 3108 break;
3122 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3110 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3111 break;
3126 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3114 break;
3129 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3117 break;
3132 case 5: /* raise window */ 3118 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3119 XRaiseWindow (dpy, parent[0]);
3134 break; 3120 break;
3135 case 6: /* lower window */ 3121 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3122 XLowerWindow (dpy, parent[0]);
3137 break; 3123 break;
3138 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3139 scr_touch (true); 3125 scr_touch (true);
3140 break; 3126 break;
3141 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3128 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3129 (unsigned int) (args[1] * fheight));
3144 break; 3130 break;
3145 3131
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3132 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3133 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3134 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3135 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3136 (unsigned int) (args[1] * fheight));
3151 break; 3137 break;
3152
3153 3138
3154 /* 3139 /*
3155 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3156 */ 3141 */
3157 case 11: /* report window state */ 3142 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3145 break;
3161 case 13: /* report window position */ 3146 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3152 break;
3168 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3156 break;
3172 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3159 break;
3175 case 19: /* report window size (chars) */ 3160 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3162 break;
3178 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3164 {
3181 char *s; 3165 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3166 XGetIconName (dpy, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3168 XFree (s);
3184 } 3169 }
3185 break; 3170 break;
3186 case 21: /* report window title */ 3171 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3172 {
3189 char *s; 3173 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3174 XFetchName (dpy, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3176 XFree (s);
3192 } 3177 }
3193 break; 3178 break;
3194 } 3179 }
3195} 3180}
3196#endif 3181#endif
3197 3182
3198/*----------------------------------------------------------------------*/ 3183/*----------------------------------------------------------------------*/
3199/* 3184/*
3200 * get input up until STRING TERMINATOR (or BEL) 3185 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3186 * ends_how is terminator used. returned input must be free()'d
3202 */ 3187 */
3203unsigned char * 3188char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3189rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3190{
3206 unicode_t prev = 0, ch; 3191 unicode_t ch;
3192 bool seen_esc = false;
3207 unsigned int n = 0; 3193 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3194 wchar_t string[STRING_MAX];
3210 3195
3211 while ((ch = cmd_getc ()) != NOCHAR) 3196 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3197 {
3213 if (prev == C0_ESC) 3198 if (seen_esc)
3214 { 3199 {
3215 if (ch == 0x5c) /* 7bit ST */ 3200 if (ch == 0x5c) /* 7bit ST */
3216 break; 3201 break;
3217 else 3202 else
3218 return NULL; 3203 return NULL;
3219 } 3204 }
3205 else if (ch == C0_ESC)
3206 {
3207 seen_esc = true;
3208 continue;
3209 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3210 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3211 break;
3212 else if (ch == C0_SYN)
3213 ch = cmd_get8 ();
3222 else if (ch < 0x20) 3214 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3215 return NULL; /* other control character - exit */
3224 3216
3225 if (n >= sizeof (string) - 1) 3217 seen_esc = false;
3218
3219 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3220 // stop at some sane length
3227 return NULL; 3221 return NULL;
3228 3222
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
3235 string[n++] = prev = ch; 3223 string[n++] = ch;
3236 } 3224 }
3237 3225
3238 string[n++] = '\0'; 3226 string[n++] = '\0';
3239 3227
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3228 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3229
3245 return s; 3230 return rxvt_wcstombs (string);
3246} 3231}
3247 3232
3248/*----------------------------------------------------------------------*/ 3233/*----------------------------------------------------------------------*/
3249/* 3234/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3236 */
3252void 3237void
3253rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3254{ 3239{
3255 unsigned char *s; 3240 char *s;
3256 unicode_t eh; 3241 unicode_t eh;
3257 3242
3258 /* 3243 /*
3259 * Not handled yet 3244 * Not handled yet
3260 */ 3245 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3281 3266
3282 if (ch == ';') 3267 if (ch == ';')
3283 { 3268 {
3284 unsigned char *s = get_to_st (eh); 3269 char *s = get_to_st (eh);
3285 3270
3286 if (s) 3271 if (s)
3287 { 3272 {
3288 process_xterm_seq (arg, (char *)s, eh); 3273 process_xterm_seq (arg, s, eh);
3289 free (s); 3274 free (s);
3290 } 3275 }
3291 } 3276 }
3292} 3277}
3293 3278
3294void 3279void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3280rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3281{
3297 if (str[0] == '?' && !str[1]) 3282 if (str[0] == '?' && !str[1])
3298 { 3283 {
3299 if (Options & Opt_insecure) 3284 rgba c;
3300 { 3285 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3286
3302 PixColorsFocused[color].get (display, r, g, b); 3287#if XFT
3288 if (c.a != rgba::MAX_CC)
3289 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3290 else
3291#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3292 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3293 }
3306 else 3294 else
3307 set_window_color (color, str); 3295 set_window_color (color, str);
3308} 3296}
3309 3297
3310/* 3298/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3299 * 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 */ 3300 */
3335void 3301void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3302rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3303{
3338 int changed = 0;
3339 int color; 3304 int color;
3340 char *buf, *name; 3305 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3306 bool query = str[0] == '?' && !str[1];
3307 int saveop = op;
3308
3309 dLocal (Display *, dpy);
3342 3310
3343 assert (str != NULL); 3311 assert (str != NULL);
3312
3313 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3314 return;
3315
3344 switch (op) 3316 switch (op)
3345 { 3317 {
3346 case XTerm_name: 3318 case XTerm_name:
3347 set_title (str); 3319 set_title (str);
3348 /* FALLTHROUGH */ 3320 /* FALLTHROUGH */
… …
3353 set_title (str); 3325 set_title (str);
3354 break; 3326 break;
3355 case XTerm_property: 3327 case XTerm_property:
3356 if (str[0] == '?') 3328 if (str[0] == '?')
3357 { 3329 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3330 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3331 Atom actual_type;
3360 int actual_format; 3332 int actual_format;
3361 unsigned long nitems; 3333 unsigned long nitems;
3362 unsigned long bytes_after; 3334 unsigned long bytes_after;
3363 unsigned char *value = 0; 3335 unsigned char *value = 0;
3364 const char *str = ""; 3336 const char *str = "";
3365 3337
3366 if (prop 3338 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3339 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3340 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3341 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3342 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3343 && actual_type != None
3372 && actual_format == 8) 3344 && actual_format == 8)
3373 str = (const char *)(value); 3345 str = (const char *)(value);
3374 3346
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3347 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3348
3377 XFree (value); 3349 XFree (value);
3378 } 3350 }
3379 else 3351 else
3380 { 3352 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3353 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3354
3383 if (eq) 3355 if (eq)
3384 { 3356 {
3385 *eq = 0; 3357 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3358 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 } 3359 }
3391 else 3360 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3361 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3362 display->atom (str));
3394 } 3363 }
3395 break; 3364 break;
3396 3365
3397 case XTerm_Color: 3366 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3367 for (buf = (char *)str; buf && *buf;)
3399 { 3368 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3369 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3370 break;
3402 3371
3403 *name++ = '\0'; 3372 *name++ = '\0';
3404 color = atoi (buf); 3373 color = atoi (buf) + minCOLOR;
3405 3374
3406 if (color < 0 || color >= TOTAL_COLORS) 3375 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3376 break;
3408 3377
3409 if ((buf = STRCHR (name, ';')) != NULL) 3378 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3379 *buf++ = '\0';
3411 3380
3412 if (name[0] == '?' && !name[1]) 3381 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 } 3382 }
3424 break; 3383 break;
3425 case XTerm_Color00: 3384 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3385 process_color_seq (op, Color_fg, str, resp);
3427 break; 3386 break;
3428 case XTerm_Color01: 3387 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3388 process_color_seq (op, Color_bg, str, resp);
3430 break; 3389 break;
3431#ifndef NO_CURSORCOLOR 3390#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3391 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3392 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3393 break;
3435#endif 3394#endif
3436 case XTerm_Color_pointer_fg: 3395 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3396 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3397 break;
3439 case XTerm_Color_pointer_bg: 3398 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3399 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3400 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3401#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: 3402 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3403 process_color_seq (op, Color_RV, str, resp);
3451 break; 3404 break;
3405 case Rxvt_Color_BD:
3406 case URxvt_Color_BD:
3407 process_color_seq (op, Color_BD, str, resp);
3408 break;
3409 case Rxvt_Color_UL:
3410 case URxvt_Color_UL:
3411 process_color_seq (op, Color_UL, str, resp);
3412 break;
3413 case URxvt_Color_IT:
3414 process_color_seq (op, Color_IT, str, resp);
3415 break;
3452#endif 3416#endif
3417#if ENABLE_TRANSPARENCY
3418 case URxvt_Color_tint:
3419 process_color_seq (op, Color_tint, str, resp);
3420 {
3421 bool changed = false;
3422 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424 else
3425 changed = bgPixmap.unset_tint ();
3426 if (changed)
3427 update_background ();
3428 }
3453 3429
3430 break;
3431#endif
3432
3433#if BG_IMAGE_FROM_FILE
3454 case XTerm_Pixmap: 3434 case Rxvt_Pixmap:
3455 if (*str != ';') 3435 if (!strcmp (str, "?"))
3456 { 3436 {
3457#if XPM_BACKGROUND 3437 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 3438
3470 } 3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3471 if (changed) 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3472 { 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3473#ifdef XPM_BACKGROUND 3442 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 } 3443 }
3512 else 3444 else
3513 { 3445 {
3446 int changed = 0;
3447
3448 if (*str != ';')
3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3514 set_locale (str); 3458 while (str)
3515# ifdef USE_XIM 3459 {
3516 im_cb (); 3460 str++;
3517# endif 3461 if (bgPixmap.set_geometry (str))
3462 changed++;
3463 str = strchr (str, ';');
3464 }
3465 if (changed)
3466 update_background ();
3518 } 3467 }
3519 break; 3468 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 3469#endif
3530 3470
3531#ifdef MENUBAR 3471 case Rxvt_restoreFG:
3532 case XTerm_Menu: 3472 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; 3473 break;
3536#endif 3474 case Rxvt_restoreBG:
3475 set_window_color (Color_bg, str);
3476 break;
3477
3478 case XTerm_logfile:
3479 // TODO, when secure mode?
3480 break;
3481
3537#if 0 3482#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3483 case Rxvt_dumpscreen: /* no error notices */
3539 { 3484 {
3540 int fd; 3485 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3486 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3487 {
3543 scr_dump (fd); 3488 scr_dump (fd);
3544 close (fd); 3489 close (fd);
3545 } 3490 }
3546 } 3491 }
3492 break;
3493#endif
3494 case XTerm_font:
3495 op = URxvt_font;
3496 case URxvt_font:
3497#if ENABLE_STYLES
3498 case URxvt_boldFont:
3499 case URxvt_italicFont:
3500 case URxvt_boldItalicFont:
3501#endif
3502 if (query)
3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3505 ? fontset[op - URxvt_font]->fontdesc : "",
3506 resp);
3507 else
3508 {
3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
3510
3511 res = strdup (str);
3512 allocated.push_back ((void *)res);
3513 set_fonts ();
3514 }
3515 break;
3516
3517 case URxvt_version:
3518 if (query)
3519 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3520 op,
3521 rs[Rs_name], VERSION[0], VERSION[2],
3522 resp);
3523 break;
3524
3525#if !ENABLE_MINIMAL
3526 case URxvt_locale:
3527 if (query)
3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3529 else
3530 {
3531 set_locale (str);
3532 pty->set_utf8_mode (enc_utf8);
3533 init_xlocale ();
3534 }
3535 break;
3536
3537 case URxvt_view_up:
3538 case URxvt_view_down:
3539 {
3540 int lines = atoi (str);
3541
3542 if (lines)
3543 scr_page (op == URxvt_view_up ? UP : DN, lines);
3544 else
3545 scr_erase_savelines ();
3546 }
3547
3548 break;
3549#endif
3550
3551#if ENABLE_PERL
3552 case URxvt_perl:
3553 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3554 ; // no responses yet
3547 break; 3555 break;
3548#endif 3556#endif
3549 } 3557 }
3550} 3558}
3551/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
… …
3565{ 3573{
3566 int state; 3574 int state;
3567 3575
3568 if (mode == 's') 3576 if (mode == 's')
3569 { 3577 {
3570 SavedModes |= (PrivateModes & bit); 3578 SavedModes |= (priv_modes & bit);
3571 return -1; 3579 return -1;
3572 } 3580 }
3573 else 3581 else
3574 { 3582 {
3575 if (mode == 'r') 3583 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3585 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3586 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3587 PrivMode (state, bit);
3580 } 3588 }
3581 3589
3582 return state; 3590 return state;
3583} 3591}
3584 3592
3585/* we're not using priv _yet_ */ 3593/* we're not using priv _yet_ */
3586void 3594void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 3596{
3589 unsigned int i, j; 3597 unsigned int i, j;
3590 int state; 3598 int state;
3591 3599
3592 static const struct 3600 static const struct
3593 { 3601 {
3594 const int argval; 3602 const int argval;
3595 const unsigned long bit; 3603 const unsigned long bit;
3596 }
3597
3598 argtopriv[] = { 3604 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR },
3600 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3601 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap },
3612 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 3614 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 3615 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 3617 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 3618#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3619 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 3622 // 45 margin bell NYI
3620 // 46 start logging 3623 // 46 start logging
… …
3660 } 3663 }
3661 3664
3662 /* extra handling for values with state unkept */ 3665 /* extra handling for values with state unkept */
3663 switch (arg[i]) 3666 switch (arg[i])
3664 { 3667 {
3668#if ENABLE_STYLES
3669 case 1021:
3670 set_option (Opt_intensityStyles, mode);
3671
3672 scr_touch (true);
3673 break;
3674#endif
3665 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3676 case 1049:
3666 if (Options & Opt_secondaryScreen) 3677 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 3678 if (mode == 0)
3668 scr_cursor (RESTORE); 3679 scr_cursor (RESTORE);
3669 else if (mode == 1) 3680 else if (mode == 1)
3670 scr_cursor (SAVE); 3681 scr_cursor (SAVE);
3671 break; 3682 break;
… …
3682 * within VT52 mode 3693 * within VT52 mode
3683 */ 3694 */
3684 PrivMode (1, PrivMode_vt52); 3695 PrivMode (1, PrivMode_vt52);
3685 break; 3696 break;
3686 case 3: /* 80/132 */ 3697 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 3698 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3699 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 3700 break;
3690 case 4: /* smooth scrolling */ 3701 case 4: /* smooth scrolling */
3691 if (state) 3702 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 3703 break;
3696 case 5: /* reverse video */ 3704 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 3705 scr_rvideo_mode (state);
3698 break; 3706 break;
3699 case 6: /* relative/absolute origins */ 3707 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 3711 scr_autowrap (state);
3704 break; 3712 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 3713 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 3714 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 3716 priv_modes &= ~PrivMode_MouseX11;
3709 break; 3717 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 3718#ifdef scrollBar_esc
3718 case scrollBar_esc: 3719 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 3720 if (scrollbar_mapping (state))
3720 { 3721 {
3721 resize_all_windows (0, 0, 0); 3722 resize_all_windows (0, 0, 0);
… …
3733 break; 3734 break;
3734 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 3739 priv_modes &= ~PrivMode_MouseX10;
3739 break; 3740 break;
3740#if 0 3741#if 0
3741 case 1001: 3742 case 1001:
3742 break; /* X11 mouse highlighting */ 3743 break; /* X11 mouse highlighting */
3743#endif 3744#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 3746 set_option (Opt_scrollTtyOutput, !state);
3749 break; 3747 break;
3750 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 3749 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 3750 break;
3756 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 3752 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 3754 scr_erase_screen (2);
3760 scr_change_screen (state); 3755 scr_change_screen (state);
3761 break; 3756 break;
3762 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 3758 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 3759 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 3760 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 3761 scr_erase_screen (2);
3767 break; 3762 break;
3768 default: 3763 default:
3769 break; 3764 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 3790 rendset = 0, rendstyle = ~RS_None;
3796 break; 3791 break;
3797 case 1: 3792 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 3793 rendset = 1, rendstyle = RS_Bold;
3799 break; 3794 break;
3800 //case 2: // faint or second colour 3795 //case 2: // low intensity
3796 case 3:
3797 rendset = 1, rendstyle = RS_Italic;
3798 break;
3801 case 4: 3799 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 3800 rendset = 1, rendstyle = RS_Uline;
3803 break; 3801 break;
3804 case 5: // slowly blinking 3802 case 5: // slowly blinking
3805 case 6: // rapidly blinking 3803 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 3815 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 3816 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 3817 //...
3820 //case 19: // ninth alt font 3818 //case 19: // ninth alt font
3821 //case 20: // gothic 3819 //case 20: // gothic
3822 case 21: // disable bold, faint 3820 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 3821 rendset = 0, rendstyle = RS_Bold;
3824 break; 3822 break;
3825 case 22: 3823 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 3824 rendset = 0, rendstyle = RS_Bold;
3827 break; 3825 break;
3828 //case 23: disable italic 3826 case 23: // disable italic
3827 rendset = 0, rendstyle = RS_Italic;
3828 break;
3829 case 24: 3829 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 3830 rendset = 0, rendstyle = RS_Uline;
3831 break; 3831 break;
3832 case 25: 3832 case 25:
3833 rendset = 0, rendstyle = RS_Blink;
3834 break;
3835 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 3836 rendset = 0, rendstyle = RS_Blink;
3834 break; 3837 break;
3835 case 27: 3838 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 3839 rendset = 0, rendstyle = RS_RVid;
3837 break; 3840 break;
… …
3855 case 35: 3858 case 35:
3856 case 36: 3859 case 36:
3857 case 37: 3860 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3861 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 3862 break;
3860#ifdef TTY_256COLOR 3863 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 3864 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 3865 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3866 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 3867 i += 2;
3866 } 3868 }
3867 break; 3869 break;
3868#endif
3869 case 39: /* default fg */ 3870 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 3871 scr_color (Color_fg, Color_fg);
3871 break; 3872 break;
3872 3873
3873 case 40: 3874 case 40:
… …
3878 case 45: 3879 case 45:
3879 case 46: 3880 case 46:
3880 case 47: 3881 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 3883 break;
3883#ifdef TTY_256COLOR 3884 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 3885 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 3886 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 3888 i += 2;
3889 } 3889 }
3890 break; 3890 break;
3891#endif
3892 case 49: /* default bg */ 3891 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 3892 scr_color (Color_bg, Color_bg);
3894 break; 3893 break;
3895 3894
3896#ifndef NO_BRIGHTCOLOR 3895 //case 50: // not variable spacing
3896
3897#if !ENABLE_MINIMAL
3897 case 90: 3898 case 90:
3898 case 91: /* set bright fg color */ 3899 case 91: /* set bright fg color */
3899 case 92: 3900 case 92:
3900 case 93: 3901 case 93:
3901 case 94: 3902 case 94:
3902 case 95: 3903 case 95:
3903 case 96: 3904 case 96:
3904 case 97: 3905 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 3907 break;
3908 case 100: 3908 case 100:
3909 case 101: /* set bright bg color */ 3909 case 101: /* set bright bg color */
3910 case 102: 3910 case 102:
3911 case 103: 3911 case 103:
3912 case 104: 3912 case 104:
3913 case 105: 3913 case 105:
3914 case 106: 3914 case 106:
3915 case 107: 3915 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 3917 break;
3919#endif 3918#endif
3920
3921 } 3919 }
3922 } 3920 }
3923} 3921}
3924/*}}} */ 3922/*}}} */
3925 3923
… …
3929{ 3927{
3930 unicode_t ch, cmd = cmd_getc (); 3928 unicode_t ch, cmd = cmd_getc ();
3931 3929
3932 if (cmd == 'Q') 3930 if (cmd == 'Q')
3933 { /* query graphics */ 3931 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 3932 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 3933 return;
3936 } 3934 }
3937 /* swallow other graphics sequences until terminating ':' */ 3935 /* swallow other graphics sequences until terminating ':' */
3938 do 3936 do
3939 ch = cmd_getc (); 3937 ch = cmd_getc ();
… …
3949 */ 3947 */
3950void 3948void
3951rxvt_term::tt_printf (const char *fmt,...) 3949rxvt_term::tt_printf (const char *fmt,...)
3952{ 3950{
3953 va_list arg_ptr; 3951 va_list arg_ptr;
3954 unsigned char buf[256]; 3952 char buf[256];
3955 3953
3956 va_start (arg_ptr, fmt); 3954 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3955 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 3956 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 3957 tt_write (buf, strlen (buf));
3960} 3958}
3961 3959
3962/* ---------------------------------------------------------------------- */ 3960/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 3961/* 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. 3962 * or generated by us in response to a query ESC sequence.
3965 */ 3963 */
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3965
3966void 3966void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3967rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 3968{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3969 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3970 return;
3970 3971
3971 if (len) 3972 if (pty->pty < 0)
3973 return;
3974
3975 if (v_buflen == 0)
3976 {
3977 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3978
3979 if ((unsigned int)written == len)
3980 return;
3981
3982 data += written;
3983 len -= written;
3972 { 3984 }
3985
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990
3991 pty_ev.set (EVENT_READ | EVENT_WRITE);
3992}
3993
3994void rxvt_term::pty_write ()
3995{
3996 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3997
3998 if (written > 0)
3999 {
4000 v_buflen -= written;
4001
3973 if (v_buflen == 0) 4002 if (v_buflen == 0)
3974 { 4003 {
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); 4004 free (v_buffer);
4002 v_buffer = 0; 4005 v_buffer = 0;
4003 v_buflen = 0;
4004 4006
4005 pty_ev.set (EVENT_READ); 4007 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; 4008 return;
4018 } 4009 }
4010
4011 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4012 }
4013 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014 pty_ev.set (EVENT_READ);
4020} 4015}
4021 4016
4022/*----------------------- end-of-file (C source) -----------------------*/ 4017/*----------------------- end-of-file (C source) -----------------------*/
4023 4018

Diff Legend

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