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.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
63void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
254rxvt_term::commit_iso14755 ()
255{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260
261 if (iso14755buf & ISO_14755_51)
262 {
263 char mb[16];
264 int len;
265
266 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20)
268 len = wcstombs (mb, ch, 16);
269 else
270 {
271 mb[0] = ch[0];
272 len = 1;
273 }
274
275 if (len > 0)
276 tt_write (mb, len);
277 else
278 scr_bell ();
279 }
280
281 iso14755buf = 0;
282}
283
284int
64rxvt_term::lookup_key (XKeyEvent &ev) 285rxvt_term::hex_keyval (XKeyEvent &ev)
286{
287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++)
290 {
291 KeySym k = XLookupKeysym (&ev, index);
292
293 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
294 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
295 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
296 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
297 }
298
299 return -1;
300}
301#endif
302
303void
304rxvt_term::key_press (XKeyEvent &ev)
65{ 305{
66 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
67 unsigned int newlen; 307 unsigned int newlen;
68 KeySym keysym; 308 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 309 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
74 316
75 /* 317 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
78 * 320 *
79 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
80 */ 322 */
81 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
84 326
85 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
86 { 328 {
87 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 338 Status status_return;
97 339
98#if 0 340#if 0
99#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
103 else 345 else
104#endif 346#endif
105#endif 347#endif
106 { 348 {
… …
108 350
109 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
113 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
116 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 361 SET_LOCALE (locale);
118 362
119 if (status_return == XLookupChars 363 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
142 } 386 }
143 else 387 else
144#endif 388#endif
145 { 389 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
148 } 392 }
149 393
150 if (valid_keysym) 394 if (valid_keysym)
151 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
152 if (TermWin.saveLines) 401 if (saveLines)
153 { 402 {
154#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 404 if (!ctrl && !meta)
156 {
157#else 405#else
158 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
159 { 408 {
160#endif
161 int lnsppg; 409 int lnsppg;
162 410
163#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 413#else
166 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
167#endif 415#endif
168 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
169 { 417 {
170 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
171 return; 419 return;
… …
199 scr_move_to (0, 1); 447 scr_move_to (0, 1);
200 return; 448 return;
201 } 449 }
202 else if (keysym == XK_End) 450 else if (keysym == XK_End)
203 { 451 {
204 scr_move_to (1, 0); 452 scr_move_to (1, 1);
205 return; 453 return;
206 } 454 }
207 } 455 }
208#endif 456#endif
209 } 457 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 463 {
216 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
218 } 466 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 468 {
221 switch (keysym) 469 switch (keysym)
222 { 470 {
223 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
226 return; 474 return;
475#if TODO
227 /* rxvt extras */ 476 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 478 change_font (FONT_UP);
230 return; 479 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 481 change_font (FONT_DN);
233 return; 482 return;
483#endif
234 } 484 }
235 } 485 }
236 } 486 }
237#ifdef PRINTPIPE 487
238 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
239 { 489 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
241 return;
242 } 491 {
243#endif 492 int hv;
244 493
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
246 { 495 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 497 {
250 unsigned int l; 498 commit_iso14755 ();
251 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
252 500# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 501 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 502# endif
261 ) 503 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 504 }
266 505 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
513 else if ((hv = hex_keyval (ev)) >= 0)
514 {
515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
516 | hv | ISO_14755_51;
517# if ISO_14755
518 iso14755_51 (iso14755buf & ISO_14755_MASK);
519# endif
268 return; 520 return;
269 } 521 }
270 else 522 else
523 {
524# if ENABLE_OVERLAY
525 scr_overlay_off ();
271#endif 526# endif
527 iso14755buf = 0;
528 }
529 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED))
533 {
534 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif
539 }
540#endif
541
542#ifdef PRINTPIPE
543 if (keysym == XK_Print)
544 {
545 scr_printscreen (ctrl | shft);
546 return;
547 }
548#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
272 { 552 {
273 newlen = 1; 553 newlen = 1;
274 switch (keysym) 554 switch (keysym)
275 { 555 {
276#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 557 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
279 { 559 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
283 } 563 }
284 else 564 else
285 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, key_backspace);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
289 case XK_Delete: 579 case XK_Delete:
290 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, key_delete);
291 break; 581 break;
292#endif 582#endif
293 case XK_Tab: 583 case XK_Tab:
294 if (shft) 584 if (shft)
295 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
296 else 586 else
297 { 587 {
298#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 589 if (ctrl)
300 meta = 1; 590 meta = 1;
… …
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
1038 flush_ev.stop ();
1039
660#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
661 if (want_full_refresh) 1041 if (want_full_refresh)
662 { 1042 {
663 want_full_refresh = 0; 1043 want_full_refresh = 0;
664 scr_clear (); 1044 scr_clear ();
… …
666 } 1046 }
667#endif 1047#endif
668 1048
669 if (want_refresh) 1049 if (want_refresh)
670 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
671 scr_refresh (refresh_type); 1089 scr_refresh ();
672 scrollbar_show (1); 1090 scrollbar_show (1);
673#ifdef USE_XIM 1091#ifdef USE_XIM
674 IMSendSpot (); 1092 IMSendSpot ();
675#endif 1093#endif
676 } 1094 }
677 1095
678 display->flush (); 1096 display->flush ();
679
680 flush_ev.stop ();
681} 1097}
682 1098
683void 1099void
684rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
685{ 1101{
686 SET_R (this); 1102 make_current ();
687 SET_LOCALE (locale);
688 1103
689 display->flush (); 1104 display->flush ();
690 1105
691 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1108}
694 1109
695void 1110void
696rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
697{ 1112{
698 SET_R (this); 1113 make_current ();
699 SET_LOCALE (locale);
700 1114
701 refresh_limit = 1; 1115 refresh_limit = 1;
702 refresh_count = 0; 1116 refresh_count = 0;
703 flush (); 1117 flush ();
704} 1118}
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1123{
710 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1125 want_refresh = 1;
712 1126
713 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1128}
715#endif 1129#endif
716 1130
717#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
718void 1132void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1147{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1150 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1151 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1153 }
741} 1154}
742#endif 1155#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1160{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1162 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1164 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1166 }
755} 1167}
756#endif 1168#endif
… …
761{ 1173{
762 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1177 {
766 refresh_type |= SMOOTH_REFRESH; 1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
767 want_refresh = 1; 1181 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1183 }
770} 1184}
771#endif 1185#endif
772 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
773bool 1212bool
774rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
775{ 1214{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1216
778 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
779 { 1218 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1220 n = 0;
782 } 1221 }
783 1222
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
787 1226
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1228
790 if (n > 0) 1229 if (r > 0)
791 { 1230 {
792 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
793 return true; 1232 return true;
794 } 1233 }
795 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
796 destroy (); 1246 destroy ();
1247 }
797 1248
798 return false; 1249 return false;
799} 1250}
800 1251
801void 1252void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1254{
804 SET_R (this); 1255 make_current ();
805 SET_LOCALE (locale);
806 1256
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1259 while (pty_fill ())
812 if (cmd_parse ()) 1260 if (cmd_parse ())
813 break; 1261 break;
1262
1263 if (revents & EVENT_WRITE)
1264 pty_write ();
814} 1265}
815 1266
816void 1267void
817rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
818{ 1269{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
820 recolour_cursor (); 1271 recolour_cursor ();
821 1272
822#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1274 hidden_pointer = 0;
824 1275
825 if (Options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1278#endif
828} 1279}
829 1280
830#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
831void 1282void
832rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
833{ 1284{
834 if (! (Options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
835 return; 1286 return;
836 1287
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
838 XFlush (display->display); 1289 XFlush (dpy);
839 1290
840 hidden_pointer = 1; 1291 hidden_pointer = 1;
841} 1292}
842 1293
843void 1294void
844rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
845{ 1296{
846 SET_R (this); 1297 make_current ();
847 SET_LOCALE (locale);
848 1298
849 pointer_blank (); 1299 pointer_blank ();
850} 1300}
851#endif 1301#endif
852 1302
… …
859 x = ev.x; 1309 x = ev.x;
860 y = ev.y; 1310 y = ev.y;
861 pixel_position (&x, &y); 1311 pixel_position (&x, &y);
862 1312
863 if (MEvent.button == AnyButton) 1313 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1314 button_number = 3;
866 }
867 else 1315 else
868 { 1316 {
869 button_number = MEvent.button - Button1; 1317 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1318 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1319 if (button_number >= 3)
872 button_number += (64 - 3); 1320 button_number += (64 - 3);
873 } 1321 }
874 1322
875 if (PrivateModes & PrivMode_MouseX10) 1323 if (priv_modes & PrivMode_MouseX10)
876 { 1324 {
877 /* 1325 /*
878 * do not report ButtonRelease 1326 * do not report ButtonRelease
879 * no state info allowed 1327 * no state info allowed
880 */ 1328 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1347#endif
900
901 } 1348 }
902 1349
903#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1352 if (key_state & 16)
906 fputc ('C', stderr); 1353 fputc ('C', stderr);
907 if (key_state & 4) 1354 if (key_state & 4)
908 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1359 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1361 button_number,
915 x + 1, 1362 x + 1,
916 y + 1); 1363 y + 1);
917#else 1364#endif
1365
918 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
920 (32 + x + 1), 1368 (32 + x + 1),
921 (32 + y + 1)); 1369 (32 + y + 1));
922#endif
923} 1370}
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 1371
935/*{{{ process an X event */ 1372/*{{{ process an X event */
936void 1373void
937rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
938{ 1375{
939 SET_R (this); 1376 make_current ();
940 SET_LOCALE (locale);
941 1377
942#if defined(CURSOR_BLINK) 1378 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 1379
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
952 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1382 && 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; 1383 return;
972#endif
973 1384
1385 // for XQueryPointer
974 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1388 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 1389
1027 switch (ev.type) 1390 switch (ev.type)
1028 { 1391 {
1029 case KeyPress: 1392 case KeyPress:
1030 lookup_key (ev.xkey); 1393 key_press (ev.xkey);
1031 break; 1394 break;
1032 1395
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease: 1396 case KeyRelease:
1035 { 1397 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; 1398 break;
1047 }
1048#endif
1049 1399
1050 case ButtonPress: 1400 case ButtonPress:
1051 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1052 break; 1402 break;
1053 1403
… …
1055 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1056 break; 1406 break;
1057 1407
1058 case ClientMessage: 1408 case ClientMessage:
1059 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !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 { 1411 {
1069 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1413 {
1071 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1415 {
1073 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1417 {
1075 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1419 destroy ();
1077 0L, 1000000L, 1420 }
1078 False, AnyPropertyType, 1421#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1425 &ev);
1082 XChangeProperty (display->display, display->root, 1426#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1427 }
1084 8, PropModeReplace, 1428 }
1085 data, STRLEN (data)); 1429#if ENABLE_XEMBED
1086 XFree (data); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1431 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1089 } 1438 }
1090#endif /* OFFIX_DND */
1091 break; 1439 break;
1092 1440
1093 case MappingNotify: 1441 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1443 break;
… …
1118 break; 1466 break;
1119 } 1467 }
1120 break; 1468 break;
1121 1469
1122 case FocusIn: 1470 case FocusIn:
1123 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1124 { 1486 {
1125 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1488 ;
1127#ifdef USE_XIM 1489
1128 if (Input_Context != NULL) 1490 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 { 1491 {
1138 PixColors = PixColorsFocused; 1492 seen_resize = 1;
1139 set_colorfgbg (); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1494 }
1143#endif
1144 1495
1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1499 if (option (Opt_transparent))
1500 check_our_parents ();
1501#endif
1145 } 1502 }
1146 break; 1503 break;
1147 1504
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: 1505 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1508 && ev.xproperty.state == PropertyNewValue)
1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1510
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; 1511 break;
1201 1512
1202 case SelectionClear: 1513 case SelectionClear:
1203 selection_clear (); 1514 selection_clear ();
1204 break; 1515 break;
1205 1516
1206 case SelectionNotify: 1517 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1518 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1520 break;
1211 1521
1212 case SelectionRequest: 1522 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1214 break; 1524 break;
1215 1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break;
1533
1216 case UnmapNotify: 1534 case UnmapNotify:
1217 TermWin.mapped = 0; 1535 mapped = 0;
1218#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1220#endif 1538#endif
1221 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
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; 1540 break;
1229 1541
1230#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1231 case ReparentNotify: 1543 case ReparentNotify:
1232 rootwin_cb (ev); 1544 rootwin_cb (ev);
1233 break; 1545 break;
1234#endif /* TRANSPARENT */ 1546#endif /* TRANSPARENT */
1235 1547
1236 case GraphicsExpose: 1548 case GraphicsExpose:
1237 case Expose: 1549 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == vt)
1239 { 1551 {
1240 do 1552 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1244 1556
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1558
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1250 1562
1251 scr_refresh (refresh_type); 1563 want_refresh = 1;
1252 } 1564 }
1253 else 1565 else
1254 { 1566 {
1255 XEvent unused_event; 1567 XEvent unused_event;
1256 1568
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1258 ; 1570 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1572 ;
1261 1573
1262 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1263 { 1575 {
1264 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1265 scrollbar_show (0); 1577 scrollbar_show (0);
1266 } 1578 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271 1579
1272#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1275#endif 1583#endif
1276 } 1584 }
1277 break; 1585 break;
1278 1586
1279 case MotionNotify: 1587 case MotionNotify:
1280#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1589 if (hidden_pointer)
1282 pointer_unblank (); 1590 pointer_unblank ();
1283#endif 1591#endif
1284#if MENUBAR 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1593 break;
1594
1595 if (ev.xany.window == vt)
1286 { 1596 {
1287 menubar_control (ev.xbutton); 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1599 ; // 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))) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1601 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1299 ; 1603 ;
1300 1604
1301 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (dpy, vt,
1302 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1609 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1613 {
1310#endif 1614#endif
1615#if ISO_14755
1616 // 5.4
1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1618 {
1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1620 break;
1621 }
1622#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1313#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1629 {
1317 int dist; 1630 int dist;
1318 1631
1319 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1637
1325 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1327 */ 1640 */
1328 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1644
1333 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1335 { 1647 {
1336 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1338 } 1650 }
1339 else 1651 else
1340 { 1652 {
1341 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1655 }
1656
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1347 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1349 } 1662 }
1350 else 1663 else
1351 { 1664 {
1352 /* we are within the text window, so we 1665 /* we are within the text window, so we
1353 * shouldn't be scrolling 1666 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1668 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1669 sel_scroll_ev.stop();
1357 } 1670 }
1358#endif 1671#endif
1359#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1360
1361 } 1673 }
1362#endif 1674#endif
1363
1364 } 1675 }
1365 } 1676 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1678 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1369 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1370 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1371 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1687 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1689 scrollbar_size ());
1377 scr_refresh (refresh_type); 1690 want_refresh = 1;
1378 refresh_limit = 0; 1691 refresh_limit = 0;
1379 scrollbar_show (1); 1692 scrollbar_show (1);
1380 } 1693 }
1381 break; 1694 break;
1382 } 1695 }
1383}
1384 1696
1697#if defined(CURSOR_BLINK)
1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1699 {
1700 if (hidden_cursor)
1701 {
1702 hidden_cursor = 0;
1703 want_refresh = 1;
1704 }
1705
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1707 }
1708#endif
1709
1710#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1712 {
1713 if (ev.type == MotionNotify
1714 || ev.type == ButtonPress
1715 || ev.type == ButtonRelease)
1716 if (hidden_pointer)
1717 pointer_unblank ();
1718
1719 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank ();
1721 }
1722#endif
1723}
1724
1725void
1726rxvt_term::focus_in ()
1727{
1728 if (!focus)
1729 {
1730 focus = 1;
1731 want_refresh = 1;
1732
1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1734
1735#if USE_XIM
1736 if (Input_Context != NULL)
1737 {
1738 IMSetPosition ();
1739 XSetICFocus (Input_Context);
1740 }
1741#endif
1742#if CURSOR_BLINK
1743 if (option (Opt_cursorBlink))
1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1745#endif
1746#if OFF_FOCUS_FADING
1747 if (rs[Rs_fade])
1748 {
1749 pix_colors = pix_colors_focused;
1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1805}
1806
1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1385void 1821void
1386rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1823{
1388 SET_R (this); 1824 make_current ();
1389 SET_LOCALE (locale);
1390 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1391 switch (ev.type) 1831 switch (ev.type)
1392 { 1832 {
1393 case PropertyNotify: 1833 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1834 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1835 * 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. 1836 * use the property to determine the pixmap. We use it later on.
1406 */ 1837 */
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]) 1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1840 return;
1412 }
1413 1841
1414 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1415 case ReparentNotify: 1843 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1418 break; 1846 break;
1847 }
1419#endif 1848# endif
1420 }
1421} 1849}
1850#endif
1422 1851
1423void 1852void
1424rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1425{ 1854{
1426 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1427 1856
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1429 if (!bypass_keystate) 1859 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1861
1431 /* 1862 /*
1432 * VT window processing of button press 1863 * VT window processing of button press
1433 */ 1864 */
1434 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1435 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1870#if ISO_14755
1871 // 5.4
1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1873 {
1874 iso14755_54 (ev.x, ev.y);
1875 return;
1876 }
1877#endif
1878
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1879 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1880
1437 if (reportmode) 1881 if (reportmode)
1438 { 1882 {
1439 /* mouse report from vt window */ 1883 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1884 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1885 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1444 { 1888 {
1445 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1446 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1447 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1448 { 1893 {
1449 /* only report double clicks */ 1894 /* only report double clicks */
1450 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1451 mouse_report (ev); 1896 mouse_report (ev);
… …
1470 } 1915 }
1471 else 1916 else
1472 { 1917 {
1473 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1920
1475 switch (ev.button) 1921 switch (ev.button)
1476 { 1922 {
1477 case Button1: 1923 case Button1:
1924 /* allow meta + click to select rectangular areas */
1925 /* should be done in screen.C */
1926#if ENABLE_FRILLS
1927 selection.rect = !!(ev.state & ModMetaMask);
1928#else
1929 selection.rect = false;
1930#endif
1931
1478 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1934 {
1481 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1483 else 1937 else
1484 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1953 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1502 else 1956 else
1503 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1958
1504 MEvent.button = Button3; 1959 MEvent.button = Button3;
1505 break; 1960 break;
1506 } 1961 }
1507 } 1962 }
1963
1508 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1509 return; 1965 return;
1510 } 1966 }
1511 1967
1512 /* 1968 /*
… …
1623 case Button3: 2079 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2080 if (scrollBar.style != R_SB_XTERM)
1625 { 2081 {
1626 if (scrollbar_above_slider (ev.y)) 2082 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2084 scr_page (UP, nrow - 1);
1629# else 2085# else
1630 scr_page (UP, TermWin.nrow / 4); 2086 scr_page (UP, nrow / 4);
1631# endif 2087# endif
1632 else if (scrollbar_below_slider (ev.y)) 2088 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2089# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2090 scr_page (DN, nrow - 1);
1635# else 2091# else
1636 scr_page (DN, TermWin.nrow / 4); 2092 scr_page (DN, nrow / 4);
1637# endif 2093# endif
1638 else 2094 else
1639 scrollBar.setMotion (); 2095 scrollBar.setMotion ();
1640 } 2096 }
1641 else 2097 else
1642 { 2098 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2099 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2100 (nrow
1645 * scrollbar_position (ev.y) 2101 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2102 / scrollbar_size ()));
1647 } 2103 }
1648 2104
1649 break; 2105 break;
1650 } 2106 }
1651 } 2107 }
2108
1652 return; 2109 return;
1653 } 2110 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2111}
1662 2112
1663void 2113void
1664rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1665{ 2115{
1666 int reportmode = 0; 2116 int reportmode = 0;
1667 2117
1668 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2119 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2121
1672 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1673 { 2123 {
1674 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1675 scrollbar_show (0); 2125 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2126 }
2127
1681#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
1684#endif 2131#endif
2132
1685 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1686 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
2143
1687 if (reportmode) 2144 if (reportmode)
1688 { 2145 {
1689 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1706 mouse_report (ev); 2163 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2165 return;
1709 } 2166 }
2167
1710 /* 2168 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2170 * when overriding mouse reporting
1713 */ 2171 */
1714 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2173 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1718 2176
1719 switch (ev.button) 2177 switch (ev.button)
1720 { 2178 {
1721 case Button1: 2179 case Button1:
1722 case Button3: 2180 case Button3:
1723 selection_make (ev.time); 2181 selection_make (ev.time);
1724 break; 2182 break;
2183
1725 case Button2: 2184 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1727 break; 2187 break;
2188
1728#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
1729 case Button4: 2190 case Button4:
1730 case Button5: 2191 case Button5:
1731 { 2192 {
1732 int i; 2193 int i;
… …
1734 2195
1735 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
1736 2197
1737 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1738 i = 1; 2199 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1741 else 2202 else
1742 i = 5; 2203 i = 5;
1743 2204
1744# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1746 { 2207 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2209 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; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2211
1751 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2214
1754 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
1755 } 2216 }
1756 else 2217 else
1757 { 2218 {
1758# endif 2219# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2220 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2221 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 2222# ifdef MOUSE_SLIP_WHEELING
1772 } 2223 }
1773#endif 2224# endif
1774 } 2225 }
1775 break; 2226 break;
1776#endif 2227#endif
1777 } 2228 }
1778 } 2229 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2230}
1784 2231
1785#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
1786#if TINTING 2233#if TINTING
1787/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
1788 2235
1789typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
1790 2237
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{ 2239{
1793 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2245 int i;
1799 2246
1800 Visual* visual = display->visual; 2247 Visual *visual = term->visual;
1801 2248
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2250
1804 /* for convenience */ 2251 /* for convenience */
1805 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2029 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2031 2478
2032 pchanged = 0; 2479 pchanged = 0;
2033 2480
2034 if (!(Options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2036 2483
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2039 2486
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2041 2488
2042 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2043 { 2490 {
2044 if (am_transparent) 2491 if (am_transparent)
2045 { 2492 {
2046 pchanged = 1; 2493 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2049 } 2496 }
2050 2497
2051 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2052 } 2499 }
2053 2500
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2502 XSync (dpy, False);
2056 2503
2057 /* 2504 /*
2058 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2061 */ 2508 */
2062 i = (xa[XA_XROOTPMAPID] 2509 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2066 2513
2067 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2072 2519
2073 if (!i || prop == NULL 2520 if (!i || prop == NULL
2074#if TINTING 2521#if TINTING
2075 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2076#endif 2523#endif
2077 ) 2524 )
2078 have_pixmap = 0; 2525 have_pixmap = 0;
2079 else 2526 else
2080 { 2527 {
… …
2093 Window cr; 2540 Window cr;
2094 XImage *image; 2541 XImage *image;
2095 GC gc; 2542 GC gc;
2096 XGCValues gcvalue; 2543 XGCValues gcvalue;
2097 2544
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2549 nx = ny = 0;
2103 2550
… …
2113 nh += sy; 2560 nh += sy;
2114 ny = -sy; 2561 ny = -sy;
2115 sy = 0; 2562 sy = 0;
2116 } 2563 }
2117 2564
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2120 allowedxerror = -1; 2569 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2571
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2574 allowedxerror = 0;
2126 2575
2127 if (image == NULL) 2576 if (image == NULL)
2128 { 2577 {
2129 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2130 { 2579 {
2131 pchanged = 1; 2580 pchanged = 1;
2132 if (TermWin.pixmap != None) 2581 if (pixmap != None)
2133 { 2582 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2583 XFreePixmap (dpy, pixmap);
2135 TermWin.pixmap = None; 2584 pixmap = None;
2136 } 2585 }
2137 } 2586 }
2138 2587
2139 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2140 } 2589 }
2141 else 2590 else
2142 { 2591 {
2143 if (TermWin.pixmap != None) 2592 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2593 XFreePixmap (dpy, pixmap);
2145 2594
2146#if TINTING 2595#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2597 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2599
2600 rgba c;
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2153 2602
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2155 } 2604 }
2156#endif 2605#endif
2157 2606
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2159 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2611 XFreeGC (dpy, gc);
2164 XDestroyImage (image); 2612 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2614 XClearWindow (dpy, parent[0]);
2167 2615
2168 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2617 pchanged = 1;
2170 2618
2171 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2172 } 2620 }
2173 } 2621 }
2174 2622
2175 if (!am_pixmap_trans) 2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2176 { 2626 {
2177 unsigned int n; 2627 unsigned int n;
2178 /* 2628 /*
2179 * InheritPixmap transparency 2629 * InheritPixmap transparency
2180 */ 2630 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2632 {
2184 oldp = TermWin.parent[i]; 2633 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2186 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2635 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2636
2190 if (TermWin.parent[i] == display->root) 2637 if (parent[i] == display->root)
2191 { 2638 {
2192 if (oldp != None) 2639 if (oldp != None)
2193 pchanged = 1; 2640 pchanged = 1;
2194 2641
2195 break; 2642 break;
2196 } 2643 }
2197 2644
2198 if (oldp != TermWin.parent[i]) 2645 if (oldp != parent[i])
2199 pchanged = 1; 2646 pchanged = 1;
2200 } 2647 }
2201 2648
2202 n = 0; 2649 n = 0;
2203 2650
2204 if (pchanged) 2651 if (pchanged)
2205 {
2206 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2207 { 2653 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2655
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2657 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2659 break;
2214 } 2660 }
2215 } 2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2216 } 2664 {
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]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2667 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2225 } 2669 }
2226 else 2670 else
2227 { 2671 {
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++) 2672 for (n = 0; n < (unsigned int)i; n++)
2235 { 2673 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2675 XClearWindow (dpy, parent[n]);
2238 } 2676 }
2239 2677
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2241 am_transparent = 1; 2679 am_transparent = 1;
2242 } 2680 }
2243 2681
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2683 parent[i] = None;
2246 } 2684 }
2247 2685
2248 // this is experimental
2249 if (scrollBar.win) 2686 if (scrollBar.win)
2250 { 2687 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2254 scrollbar_show (0); 2690 scrollbar_show (0);
2255 } 2691 }
2256 2692
2693 if (am_transparent)
2694 {
2695 want_refresh = want_full_refresh = 1;
2696 if (am_pixmap_trans)
2697 flush ();
2698 }
2699
2257 return pchanged; 2700 return pchanged;
2258} 2701}
2259#endif 2702#endif
2260 2703
2261/*}}} */ 2704/*}}} */
2262 2705
2263bool 2706bool
2264rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2265{ 2708{
2266 bool flag = false; 2709 bool flag = false;
2267 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2269 2712
2270 for (;;) 2713 for (;;)
2271 { 2714 {
2272 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2273 { 2716 {
2274 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2718 ch = next_char ();
2276 }
2277 2719
2278 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2279 break; 2721 break;
2722 }
2280 2723
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2724 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2725 {
2726 if (!seen_input)
2727 {
2728 seen_input = 1;
2729 // many badly-written programs (e.g. jed) contain a race condition:
2730 // they first read the screensize and then install a SIGWINCH handler.
2731 // some window managers resize the window early, and these programs
2732 // then sometimes get the size wrong.
2733 // unfortunately other programs are even more buggy and dislike
2734 // being sent SIGWINCH, so only do it when we were in fact being
2735 // resized.
2736 if (seen_resize && cmd_pid)
2737 kill (-cmd_pid, SIGWINCH);
2738 }
2739
2283 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2742 bool refreshnow = false;
2286 int nlines = 0; 2743 int nlines = 0;
2287 unicode_t *str = buf; 2744 wchar_t *str = buf;
2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2746
2289 for (;;) 2747 for (;;)
2290 { 2748 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2749 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2750 break;
2293 2751
2294 *str++ = ch; 2752 *str++ = ch;
2295 2753
2296 if (ch == C0_LF) 2754 if (ch == C0_LF || str >= eol)
2297 { 2755 {
2756 if (ch == C0_LF)
2298 nlines++; 2757 nlines++;
2758
2299 refresh_count++; 2759 refresh_count++;
2300 2760
2301 if (!(Options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2303 { 2763 {
2304 refreshnow = true; 2764 refreshnow = true;
2765 refresh_count = 0;
2305 ch = NOCHAR; 2766 ch = NOCHAR;
2306 break; 2767 break;
2307 } 2768 }
2308 2769
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2771 if (nlines >= nrow - 1)
2311 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2313 nlines = 0; 2777 nlines = 0;
2314 str = buf; 2778 str = buf;
2779 eol = str + min (ncol, UBUFSIZ);
2315 } 2780 }
2316 }
2317 2781
2318 if (str >= buf + UBUFSIZ) 2782 if (str >= eol)
2319 { 2783 {
2784 if (eol >= buf + UBUFSIZ)
2785 {
2320 ch = NOCHAR; 2786 ch = NOCHAR;
2321 break; 2787 break;
2788 }
2789 else
2790 eol = min (eol + ncol, buf + UBUFSIZ);
2791 }
2792
2322 } 2793 }
2323 2794
2324 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2796 ch = next_char ();
2326 } 2797 }
2327 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2329 2802
2330 /* 2803 /*
2331 * If there have been a lot of new lines, then update the screen 2804 * 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. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2808 */
2336 if (refreshnow) 2809 if (refreshnow)
2337 { 2810 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2812 refresh_limit++;
2340 else 2813 else
2341 { 2814 {
2342 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2343 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2344 } 2819 }
2345 } 2820 }
2346 2821
2347 } 2822 }
2348 else 2823 else
… …
2363 } 2838 }
2364 2839
2365 return flag; 2840 return flag;
2366} 2841}
2367 2842
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 2843// read the next character
2378unicode_t 2844wchar_t
2379rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2380{ 2846{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2848 {
2383 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2386 2852
2387 wchar_t wc; 2853 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2854 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2855
2390 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2391 { 2857 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2860 break;
2395 } 2861 }
2396 2862
2397 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2865
2400 // assume wchar == unicode 2866 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2402 return wc; 2868 return wc & UNICODE_MASK;
2403 } 2869 }
2404 2870
2405 return NOCHAR; 2871 return NOCHAR;
2406} 2872}
2873
2874// read the next octet
2875uint32_t
2876rxvt_term::next_octet () NOTHROW
2877{
2878 return cmdbuf_ptr < cmdbuf_endp
2879 ? (unsigned char)*cmdbuf_ptr++
2880 : NOCHAR;
2881}
2882
2883static class out_of_input out_of_input;
2407 2884
2408/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2409/* 2886/*
2410 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2411 * to the command. 2888 * to the command.
2412 */ 2889 */
2413unicode_t 2890wchar_t
2414rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2892{
2416 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2417 2894
2418 if (c == NOCHAR) 2895 if (c == NOCHAR)
2419 throw out_of_input; 2896 throw out_of_input;
2420 2897
2421 return c; 2898 return c;
2422} 2899}
2423 2900
2424unicode_t 2901uint32_t
2425rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2903{
2427 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2428 2905
2429 if (c == NOCHAR) 2906 if (c == NOCHAR)
2430 throw out_of_input; 2907 throw out_of_input;
2431 2908
2432 return c; 2909 return c;
… …
2532 case C0_ESC: 3009 case C0_ESC:
2533 process_escape_seq (); 3010 process_escape_seq ();
2534 break; 3011 break;
2535 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 3015 else
2540 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 3017 break;
2543 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2544 scr_bell (); 3019 scr_bell ();
2545 break; 3020 break;
2546 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
2645void 3120void
2646rxvt_term::process_escape_seq () 3121rxvt_term::process_escape_seq ()
2647{ 3122{
2648 unicode_t ch = cmd_getc (); 3123 unicode_t ch = cmd_getc ();
2649 3124
2650 if (PrivateModes & PrivMode_vt52) 3125 if (priv_modes & PrivMode_vt52)
2651 { 3126 {
2652 process_escape_vt52 (ch); 3127 process_escape_vt52 (ch);
2653 return; 3128 return;
2654 } 3129 }
2655 3130
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3146 break;
2672 case '+': 3147 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3149 break;
2675#ifndef NO_FRILLS 3150#if !ENABLE_MINIMAL
2676 case '6': 3151 case '6':
2677 scr_backindex (); 3152 scr_backindex ();
2678 break; 3153 break;
2679#endif 3154#endif
2680 case '7': 3155 case '7':
2681 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
2682 break; 3157 break;
2683 case '8': 3158 case '8':
2684 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
2685 break; 3160 break;
2686#ifndef NO_FRILLS 3161#if !ENABLE_MINIMAL
2687 case '9': 3162 case '9':
2688 scr_forwardindex (); 3163 scr_forwardindex ();
2689 break; 3164 break;
2690#endif 3165#endif
2691 case '=': 3166 case '=':
… …
2701 break; 3176 break;
2702 3177
2703 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
2705 { 3180 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 3183 }
2709 break; 3184 break;
2710 3185
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 3209 process_dcs_seq ();
2735 break; 3210 break;
2736 3211
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
2742 3216
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 3219 process_csi_seq ();
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 3330 if (arg[p] == -1)
2857 arg[p] = ndef; 3331 arg[p] = ndef;
2858 3332
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 /* 3333 /*
2867 * private mode handling 3334 * private mode handling
2868 */ 3335 */
2869 if (priv) 3336 if (priv)
2870 { 3337 {
2871 switch (priv) 3338 switch (priv)
2872 { 3339 {
2873 case '>': 3340 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
2876 break; 3352 break;
2877 case '?': 3353 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3356 break;
… …
2985 3461
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3462 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 3463 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 3464 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 3467 break;
2992 3468
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3471 break;
2997 3472
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
3000 break; 3475 break;
… …
3007 break; 3482 break;
3008 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3009 scr_report_position (); 3484 scr_report_position ();
3010 break; 3485 break;
3011 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3487 if (option (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3489 break;
3015 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3492 break;
3018 } 3493 }
… …
3054 break; 3529 break;
3055 3530
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3531 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3532 if (arg[0] == 4)
3058 scr_insert_mode (0); 3533 scr_insert_mode (0);
3534 else if (arg[0] == 20)
3535 priv_modes &= ~PrivMode_LFNL;
3059 break; 3536 break;
3060 3537
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3538 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3539 if (arg[0] == 4)
3063 scr_insert_mode (1); 3540 scr_insert_mode (1);
3541 else if (arg[0] == 20)
3542 priv_modes |= PrivMode_LFNL;
3064 break; 3543 break;
3065 3544
3066 /* 3545 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3546 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3547 */
… …
3080 break; 3559 break;
3081 case CSI_75: 3560 case CSI_75:
3082 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3083 break; 3562 break;
3084 3563
3085#ifndef NO_FRILLS 3564#if !ENABLE_MINIMAL
3086 case CSI_74: 3565 case CSI_74:
3087 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3088 break; 3567 break;
3089#endif 3568#endif
3090 3569
… …
3097 break; 3576 break;
3098 } 3577 }
3099} 3578}
3100/*}}} */ 3579/*}}} */
3101 3580
3102#ifndef NO_FRILLS 3581#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3582/* ARGSUSED */
3104void 3583void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3585{
3107 int x, y; 3586 int x, y;
3108 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3109 Window wdummy; 3588 Window wdummy;
3589
3590 dLocal (Display *, dpy);
3110 3591
3111 if (nargs == 0) 3592 if (nargs == 0)
3112 return; 3593 return;
3113 3594
3114 switch (args[0]) 3595 switch (args[0])
3115 { 3596 {
3116 /* 3597 /*
3117 * commands 3598 * commands
3118 */ 3599 */
3119 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3601 XMapWindow (dpy, parent[0]);
3121 break; 3602 break;
3122 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3604 XIconifyWindow (dpy, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3605 break;
3126 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3128 break; 3608 break;
3129 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3611 break;
3132 case 5: /* raise window */ 3612 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3134 break; 3614 break;
3135 case 6: /* lower window */ 3615 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3137 break; 3617 break;
3138 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3139 scr_touch (true); 3619 scr_touch (true);
3140 break; 3620 break;
3141 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3622 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3623 (unsigned int) (args[1] * fheight));
3144 break; 3624 break;
3145 3625
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3626 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3627 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3629 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
3151 break; 3631 break;
3152
3153 3632
3154 /* 3633 /*
3155 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3156 */ 3635 */
3157 case 11: /* report window state */ 3636 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3639 break;
3161 case 13: /* report window position */ 3640 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3646 break;
3168 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3650 break;
3172 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3653 break;
3175 case 19: /* report window size (chars) */ 3654 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3656 break;
3178 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3658 {
3181 char *s; 3659 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3662 XFree (s);
3184 } 3663 }
3185 break; 3664 break;
3186 case 21: /* report window title */ 3665 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3666 {
3189 char *s; 3667 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s);
3192 } 3671 }
3193 break; 3672 break;
3194 } 3673 }
3195} 3674}
3196#endif 3675#endif
3197 3676
3198/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3199/* 3678/*
3200 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3202 */ 3681 */
3203unsigned char * 3682char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3684{
3206 unicode_t prev = 0, ch; 3685 unicode_t ch;
3686 bool seen_esc = false;
3207 unsigned int n = 0; 3687 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3688 wchar_t string[STRING_MAX];
3210 3689
3211 while ((ch = cmd_getc ()) != NOCHAR) 3690 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3691 {
3213 if (prev == C0_ESC) 3692 if (seen_esc)
3214 { 3693 {
3215 if (ch == 0x5c) /* 7bit ST */ 3694 if (ch == 0x5c) /* 7bit ST */
3216 break; 3695 break;
3217 else 3696 else
3218 return NULL; 3697 return NULL;
3219 } 3698 }
3699 else if (ch == C0_ESC)
3700 {
3701 seen_esc = true;
3702 continue;
3703 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3222 else if (ch < 0x20) 3708 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3224 3710
3225 if (n >= sizeof (string) - 1) 3711 seen_esc = false;
3712
3713 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3714 // stop at some sane length
3227 return NULL; 3715 return NULL;
3228 3716
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
3235 string[n++] = prev = ch; 3717 string[n++] = ch;
3236 } 3718 }
3237 3719
3238 string[n++] = '\0'; 3720 string[n++] = '\0';
3239 3721
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3723
3245 return s; 3724 return rxvt_wcstombs (string);
3246} 3725}
3247 3726
3248/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3249/* 3728/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3729 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3730 */
3252void 3731void
3253rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3254{ 3733{
3255 unsigned char *s; 3734 char *s;
3256 unicode_t eh; 3735 unicode_t eh;
3257 3736
3258 /* 3737 /*
3259 * Not handled yet 3738 * Not handled yet
3260 */ 3739 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3281 3760
3282 if (ch == ';') 3761 if (ch == ';')
3283 { 3762 {
3284 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3285 3764
3286 if (s) 3765 if (s)
3287 { 3766 {
3288 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3289 free (s); 3768 free (s);
3290 } 3769 }
3291 } 3770 }
3292} 3771}
3293 3772
3294void 3773void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3775{
3297 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3298 { 3777 {
3299 if (Options & Opt_insecure) 3778 rgba c;
3300 { 3779 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3780
3302 PixColorsFocused[color].get (display, r, g, b); 3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3787 }
3306 else 3788 else
3307 set_window_color (color, str); 3789 set_window_color (color, str);
3308} 3790}
3309 3791
3310/* 3792/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * 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 */ 3794 */
3335void 3795void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3797{
3338 int changed = 0;
3339 int color; 3798 int color;
3340 char *buf, *name; 3799 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3801 int saveop = op;
3802
3803 dLocal (Display *, dpy);
3342 3804
3343 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3344 switch (op) 3810 switch (op)
3345 { 3811 {
3346 case XTerm_name: 3812 case XTerm_name:
3347 set_title (str); 3813 set_title (str);
3348 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3353 set_title (str); 3819 set_title (str);
3354 break; 3820 break;
3355 case XTerm_property: 3821 case XTerm_property:
3356 if (str[0] == '?') 3822 if (str[0] == '?')
3357 { 3823 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3824 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3825 Atom actual_type;
3360 int actual_format; 3826 int actual_format;
3361 unsigned long nitems; 3827 unsigned long nitems;
3362 unsigned long bytes_after; 3828 unsigned long bytes_after;
3363 unsigned char *value = 0; 3829 unsigned char *value = 0;
3364 const char *str = ""; 3830 const char *str = "";
3365 3831
3366 if (prop 3832 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3837 && actual_type != None
3372 && actual_format == 8) 3838 && actual_format == 8)
3373 str = (const char *)(value); 3839 str = (const char *)(value);
3374 3840
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3842
3377 XFree (value); 3843 XFree (value);
3378 } 3844 }
3379 else 3845 else
3380 { 3846 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3847 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3848
3383 if (eq) 3849 if (eq)
3384 { 3850 {
3385 *eq = 0; 3851 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3852 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 } 3853 }
3391 else 3854 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3855 XDeleteProperty (dpy, parent[0],
3393 display->atom (str)); 3856 display->atom (str));
3394 } 3857 }
3395 break; 3858 break;
3396 3859
3397 case XTerm_Color: 3860 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3861 for (buf = (char *)str; buf && *buf;)
3399 { 3862 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3864 break;
3402 3865
3403 *name++ = '\0'; 3866 *name++ = '\0';
3404 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3405 3868
3406 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3870 break;
3408 3871
3409 if ((buf = STRCHR (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3873 *buf++ = '\0';
3411 3874
3412 if (name[0] == '?' && !name[1]) 3875 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 } 3876 }
3424 break; 3877 break;
3425 case XTerm_Color00: 3878 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3427 break; 3880 break;
3428 case XTerm_Color01: 3881 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3430 break; 3883 break;
3431#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3887 break;
3435#endif 3888#endif
3436 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3891 break;
3439 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3894 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#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: 3896 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3451 break; 3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3906 break;
3907 case URxvt_Color_IT:
3908 process_color_seq (op, Color_IT, str, resp);
3909 break;
3452#endif 3910#endif
3911#if TRANSPARENT && TINTING
3912 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp);
3453 3914
3915 check_our_parents ();
3916
3917 if (am_transparent)
3918 want_full_refresh = want_refresh = 1;
3919
3920 break;
3921#endif
3922
3454 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3455 if (*str != ';') 3925 if (*str != ';')
3456 { 3926 {
3457#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3458 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true); 3930 scr_touch (true);
3931#endif
3462 } 3932 }
3933
3934 int changed = 0;
3935
3463 while ((str = STRCHR (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3464 { 3937 {
3465 str++; 3938 str++;
3466#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3468#endif 3941#endif
3469
3470 } 3942 }
3943
3471 if (changed) 3944 if (changed)
3472 { 3945 {
3473#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3947 resize_pixmap ();
3475#endif
3476 scr_touch (true); 3948 scr_touch (true);
3949#endif
3477 } 3950 }
3951 }
3478 break; 3952 break;
3479 3953
3480 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3482 break; 3956 break;
3483 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3485 break; 3959 break;
3486 3960
3487 case XTerm_logfile: 3961 case XTerm_logfile:
3488 // TODO, when secure mode? 3962 // TODO, when secure mode?
3489 break; 3963 break;
3490 3964
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 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 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
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break;
3536#endif
3537#if 0 3965#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3539 { 3967 {
3540 int fd; 3968 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3970 {
3543 scr_dump (fd); 3971 scr_dump (fd);
3544 close (fd); 3972 close (fd);
3545 } 3973 }
3546 } 3974 }
3975 break;
3976#endif
3977 case XTerm_font:
3978 op = URxvt_font;
3979 case URxvt_font:
3980#if ENABLE_STYLES
3981 case URxvt_boldFont:
3982 case URxvt_italicFont:
3983 case URxvt_boldItalicFont:
3984#endif
3985 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp);
3990 else
3991 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3993
3994 res = strdup (str);
3995 allocated.push_back ((void *)res);
3996 set_fonts ();
3997 }
3998 break;
3999
4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
4009 case URxvt_locale:
4010 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4012 else
4013 {
4014 set_locale (str);
4015 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale ();
4017 }
4018 break;
4019
4020 case URxvt_view_up:
4021 case URxvt_view_down:
4022 {
4023 int lines = atoi (str);
4024
4025 if (lines)
4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
4027 else
4028 scr_erase_savelines ();
4029 }
4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet
3547 break; 4038 break;
3548#endif 4039#endif
3549 } 4040 }
3550} 4041}
3551/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3565{ 4056{
3566 int state; 4057 int state;
3567 4058
3568 if (mode == 's') 4059 if (mode == 's')
3569 { 4060 {
3570 SavedModes |= (PrivateModes & bit); 4061 SavedModes |= (priv_modes & bit);
3571 return -1; 4062 return -1;
3572 } 4063 }
3573 else 4064 else
3574 { 4065 {
3575 if (mode == 'r') 4066 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 4068 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4069 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 4070 PrivMode (state, bit);
3580 } 4071 }
3581 4072
3582 return state; 4073 return state;
3583} 4074}
3584 4075
3585/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3586void 4077void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 4079{
3589 unsigned int i, j; 4080 unsigned int i, j;
3590 int state; 4081 int state;
3591 4082
3592 static const struct 4083 static const struct
… …
3601 { 3, PrivMode_132 }, 4092 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 4093 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 4099 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 4100 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 4103#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 4104 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 4105 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 4106 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 4107 // 45 margin bell NYI
3620 // 46 start logging 4108 // 46 start logging
… …
3660 } 4148 }
3661 4149
3662 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4151 switch (arg[i])
3664 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
3665 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4161 case 1049:
3666 if (Options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
3667 if (mode == 0) 4163 if (mode == 0)
3668 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
3669 else if (mode == 1) 4165 else if (mode == 1)
3670 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
3671 break; 4167 break;
… …
3682 * within VT52 mode 4178 * within VT52 mode
3683 */ 4179 */
3684 PrivMode (1, PrivMode_vt52); 4180 PrivMode (1, PrivMode_vt52);
3685 break; 4181 break;
3686 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4185 break;
3690 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
3691 if (state) 4187 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 4188 break;
3696 case 5: /* reverse video */ 4189 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
3698 break; 4191 break;
3699 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4196 scr_autowrap (state);
3704 break; 4197 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4202 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 4203#ifdef scrollBar_esc
3718 case scrollBar_esc: 4204 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
3720 { 4206 {
3721 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
3733 break; 4219 break;
3734 /* case 66: - application key pad */ 4220 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4221 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4222 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4223 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4224 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4225 break;
3740#if 0 4226#if 0
3741 case 1001: 4227 case 1001:
3742 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
3743#endif 4229#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
3749 break; 4232 break;
3750 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 4235 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4239 scr_erase_screen (2);
3760 scr_change_screen (state); 4240 scr_change_screen (state);
3761 break; 4241 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4243 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4246 scr_erase_screen (2);
3767 break; 4247 break;
3768 default: 4248 default:
3769 break; 4249 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4275 rendset = 0, rendstyle = ~RS_None;
3796 break; 4276 break;
3797 case 1: 4277 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4278 rendset = 1, rendstyle = RS_Bold;
3799 break; 4279 break;
3800 //case 2: // faint or second colour 4280 //case 2: // low intensity
4281 case 3:
4282 rendset = 1, rendstyle = RS_Italic;
4283 break;
3801 case 4: 4284 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4285 rendset = 1, rendstyle = RS_Uline;
3803 break; 4286 break;
3804 case 5: // slowly blinking 4287 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4288 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4300 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4301 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4302 //...
3820 //case 19: // ninth alt font 4303 //case 19: // ninth alt font
3821 //case 20: // gothic 4304 //case 20: // gothic
3822 case 21: // disable bold, faint 4305 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4306 rendset = 0, rendstyle = RS_Bold;
3824 break; 4307 break;
3825 case 22: 4308 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4309 rendset = 0, rendstyle = RS_Bold;
3827 break; 4310 break;
3828 //case 23: disable italic 4311 case 23: // disable italic
4312 rendset = 0, rendstyle = RS_Italic;
4313 break;
3829 case 24: 4314 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4315 rendset = 0, rendstyle = RS_Uline;
3831 break; 4316 break;
3832 case 25: 4317 case 25:
4318 rendset = 0, rendstyle = RS_Blink;
4319 break;
4320 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4321 rendset = 0, rendstyle = RS_Blink;
3834 break; 4322 break;
3835 case 27: 4323 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4324 rendset = 0, rendstyle = RS_RVid;
3837 break; 4325 break;
… …
3855 case 35: 4343 case 35:
3856 case 36: 4344 case 36:
3857 case 37: 4345 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4346 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4347 break;
3860#ifdef TTY_256COLOR 4348 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4349 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4350 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4351 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4352 i += 2;
3866 } 4353 }
3867 break; 4354 break;
3868#endif
3869 case 39: /* default fg */ 4355 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4356 scr_color (Color_fg, Color_fg);
3871 break; 4357 break;
3872 4358
3873 case 40: 4359 case 40:
… …
3878 case 45: 4364 case 45:
3879 case 46: 4365 case 46:
3880 case 47: 4366 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4368 break;
3883#ifdef TTY_256COLOR 4369 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4370 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4371 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4372 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4373 i += 2;
3889 } 4374 }
3890 break; 4375 break;
3891#endif
3892 case 49: /* default bg */ 4376 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
3894 break; 4378 break;
3895 4379
3896#ifndef NO_BRIGHTCOLOR 4380 //case 50: // not variable spacing
4381
4382#if !ENABLE_MINIMAL
3897 case 90: 4383 case 90:
3898 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
3899 case 92: 4385 case 92:
3900 case 93: 4386 case 93:
3901 case 94: 4387 case 94:
3902 case 95: 4388 case 95:
3903 case 96: 4389 case 96:
3904 case 97: 4390 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4391 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4392 break;
3908 case 100: 4393 case 100:
3909 case 101: /* set bright bg color */ 4394 case 101: /* set bright bg color */
3910 case 102: 4395 case 102:
3911 case 103: 4396 case 103:
3912 case 104: 4397 case 104:
3913 case 105: 4398 case 105:
3914 case 106: 4399 case 106:
3915 case 107: 4400 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4402 break;
3919#endif 4403#endif
3920
3921 } 4404 }
3922 } 4405 }
3923} 4406}
3924/*}}} */ 4407/*}}} */
3925 4408
… …
3929{ 4412{
3930 unicode_t ch, cmd = cmd_getc (); 4413 unicode_t ch, cmd = cmd_getc ();
3931 4414
3932 if (cmd == 'Q') 4415 if (cmd == 'Q')
3933 { /* query graphics */ 4416 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4417 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4418 return;
3936 } 4419 }
3937 /* swallow other graphics sequences until terminating ':' */ 4420 /* swallow other graphics sequences until terminating ':' */
3938 do 4421 do
3939 ch = cmd_getc (); 4422 ch = cmd_getc ();
… …
3949 */ 4432 */
3950void 4433void
3951rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
3952{ 4435{
3953 va_list arg_ptr; 4436 va_list arg_ptr;
3954 unsigned char buf[256]; 4437 char buf[256];
3955 4438
3956 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4441 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4442 tt_write (buf, strlen (buf));
3960} 4443}
3961 4444
3962/* ---------------------------------------------------------------------- */ 4445/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4446/* 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. 4447 * or generated by us in response to a query ESC sequence.
3965 */ 4448 */
4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4450
3966void 4451void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4453{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4455 return;
3970 4456
3971 if (len) 4457 if (pty->pty < 0)
4458 return;
4459
4460 if (v_buflen == 0)
4461 {
4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4463
4464 if ((unsigned int)written == len)
4465 return;
4466
4467 data += written;
4468 len -= written;
3972 { 4469 }
4470
4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4472
4473 memcpy (v_buffer + v_buflen, data, len);
4474 v_buflen += len;
4475
4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4477}
4478
4479void rxvt_term::pty_write ()
4480{
4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4482
4483 if (written > 0)
4484 {
4485 v_buflen -= written;
4486
3973 if (v_buflen == 0) 4487 if (v_buflen == 0)
3974 { 4488 {
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); 4489 free (v_buffer);
4002 v_buffer = 0; 4490 v_buffer = 0;
4003 v_buflen = 0; 4491 v_buflen = 0;
4004 4492
4005 pty_ev.set (EVENT_READ); 4493 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; 4494 return;
4018 } 4495 }
4496
4497 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4498 }
4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4500 pty_ev.set (EVENT_READ);
4020} 4501}
4021 4502
4022/*----------------------- end-of-file (C source) -----------------------*/ 4503/*----------------------- end-of-file (C source) -----------------------*/
4023 4504

Diff Legend

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