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.116 by root, Wed Aug 4 03:29:28 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;
… …
306 newlen = 0; 596 newlen = 0;
307 } 597 }
308 break; 598 break;
309 599
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
1038 flush_ev.stop ();
1039
660#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
661 if (want_full_refresh) 1041 if (want_full_refresh)
662 { 1042 {
663 want_full_refresh = 0; 1043 want_full_refresh = 0;
664 scr_clear (); 1044 scr_clear ();
665 scr_touch (false); 1045 scr_touch (false);
666 want_refresh = 1;
667 } 1046 }
668#endif 1047#endif
669 1048
670 if (want_refresh) 1049 if (want_refresh)
671 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
672 scr_refresh (refresh_type); 1089 scr_refresh ();
673 scrollbar_show (1); 1090 scrollbar_show (1);
674#ifdef USE_XIM 1091#ifdef USE_XIM
675 IMSendSpot (); 1092 IMSendSpot ();
676#endif 1093#endif
677 } 1094 }
678 1095
679 display->flush (); 1096 display->flush ();
680
681 flush_ev.stop ();
682} 1097}
683 1098
684void 1099void
685rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
686{ 1101{
687 SET_R (this); 1102 make_current ();
688 SET_LOCALE (locale);
689 1103
690 display->flush (); 1104 display->flush ();
691 1105
692 if (!flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
694} 1108}
695 1109
696void 1110void
697rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
698{ 1112{
699 SET_R (this); 1113 make_current ();
700 SET_LOCALE (locale);
701 1114
702 refresh_limit = 1; 1115 refresh_limit = 1;
703 refresh_count = 0; 1116 refresh_count = 0;
704 flush (); 1117 flush ();
705} 1118}
… …
709rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
710{ 1123{
711 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
712 want_refresh = 1; 1125 want_refresh = 1;
713 1126
714 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
715} 1128}
716#endif 1129#endif
717 1130
718#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
719void 1132void
… …
733rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
734{ 1147{
735 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
736 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
737 { 1150 {
738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1; 1151 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
741 } 1153 }
742} 1154}
743#endif 1155#endif
… …
747rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
748{ 1160{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 { 1162 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1; 1164 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
755 } 1166 }
756} 1167}
757#endif 1168#endif
… …
762{ 1173{
763 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
764 || 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)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1177 {
767 refresh_type |= SMOOTH_REFRESH; 1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
768 want_refresh = 1; 1181 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1183 }
771} 1184}
772#endif 1185#endif
773 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
774bool 1212bool
775rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
776{ 1214{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778 1216
779 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
780 { 1218 {
781 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");
782 n = 0; 1220 n = 0;
783 } 1221 }
784 1222
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
788 1226
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
790 1228
791 if (n > 0) 1229 if (r > 0)
792 { 1230 {
793 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
794 return true; 1232 return true;
795 } 1233 }
796 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))
797 destroy (); 1246 destroy ();
1247 }
798 1248
799 return false; 1249 return false;
800} 1250}
801 1251
802void 1252void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1254{
805 SET_R (this); 1255 make_current ();
806 SET_LOCALE (locale);
807 1256
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1259 while (pty_fill ())
813 if (cmd_parse ()) 1260 if (cmd_parse ())
814 break; 1261 break;
1262
1263 if (revents & EVENT_WRITE)
1264 pty_write ();
815} 1265}
816 1266
817void 1267void
818rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
819{ 1269{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
821 recolour_cursor (); 1271 recolour_cursor ();
822 1272
823#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1274 hidden_pointer = 0;
825 1275
826 if (Options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
827 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1278#endif
829} 1279}
830 1280
831#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
832void 1282void
833rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
834{ 1284{
835 if (! (Options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
836 return; 1286 return;
837 1287
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
839 XFlush (display->display); 1289 XFlush (dpy);
840 1290
841 hidden_pointer = 1; 1291 hidden_pointer = 1;
842} 1292}
843 1293
844void 1294void
845rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
846{ 1296{
847 SET_R (this); 1297 make_current ();
848 SET_LOCALE (locale);
849 1298
850 pointer_blank (); 1299 pointer_blank ();
851} 1300}
852#endif 1301#endif
853 1302
… …
860 x = ev.x; 1309 x = ev.x;
861 y = ev.y; 1310 y = ev.y;
862 pixel_position (&x, &y); 1311 pixel_position (&x, &y);
863 1312
864 if (MEvent.button == AnyButton) 1313 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1314 button_number = 3;
867 }
868 else 1315 else
869 { 1316 {
870 button_number = MEvent.button - Button1; 1317 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1318 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1319 if (button_number >= 3)
873 button_number += (64 - 3); 1320 button_number += (64 - 3);
874 } 1321 }
875 1322
876 if (PrivateModes & PrivMode_MouseX10) 1323 if (priv_modes & PrivMode_MouseX10)
877 { 1324 {
878 /* 1325 /*
879 * do not report ButtonRelease 1326 * do not report ButtonRelease
880 * no state info allowed 1327 * no state info allowed
881 */ 1328 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1347#endif
901
902 } 1348 }
903 1349
904#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1352 if (key_state & 16)
907 fputc ('C', stderr); 1353 fputc ('C', stderr);
908 if (key_state & 4) 1354 if (key_state & 4)
909 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1359 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1361 button_number,
916 x + 1, 1362 x + 1,
917 y + 1); 1363 y + 1);
918#else 1364#endif
1365
919 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
921 (32 + x + 1), 1368 (32 + x + 1),
922 (32 + y + 1)); 1369 (32 + y + 1));
923#endif
924} 1370}
925
926#ifdef USING_W11LIB
927void
928rxvt_W11_process_x_event (XEvent *ev)
929{
930 rxvt_t *r = rxvt_get_r ();
931
932 x_cb (*ev);
933}
934#endif
935 1371
936/*{{{ process an X event */ 1372/*{{{ process an X event */
937void 1373void
938rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
939{ 1375{
940 SET_R (this); 1376 make_current ();
941 SET_LOCALE (locale);
942 1377
943#if defined(CURSOR_BLINK) 1378 dLocal (Display *, dpy);
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951 1379
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
953 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
954#endif 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
955
956#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 {
959 if (ev.type == MotionNotify
960 || ev.type == ButtonPress
961 || ev.type == ButtonRelease)
962 if (hidden_pointer)
963 pointer_unblank ();
964
965 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank ();
967 }
968#endif
969
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return; 1383 return;
973#endif
974 1384
1385 // for XQueryPointer
975 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1388 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1389
1028 switch (ev.type) 1390 switch (ev.type)
1029 { 1391 {
1030 case KeyPress: 1392 case KeyPress:
1031 lookup_key (ev.xkey); 1393 key_press (ev.xkey);
1032 break; 1394 break;
1033 1395
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease: 1396 case KeyRelease:
1036 { 1397 key_release (ev.xkey);
1037 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0;
1046 }
1047 break; 1398 break;
1048 }
1049#endif
1050 1399
1051 case ButtonPress: 1400 case ButtonPress:
1052 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1053 break; 1402 break;
1054 1403
… …
1056 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1057 break; 1406 break;
1058 1407
1059 case ClientMessage: 1408 case ClientMessage:
1060 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1062 destroy ();
1063#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink))
1069 { 1411 {
1070 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1071 Atom ActualType; 1413 {
1072 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1073 unsigned char *data; 1415 {
1074 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1075 1417 {
1076 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1077 xa[XA_DNDSELECTION], 1419 destroy ();
1078 0L, 1000000L, 1420 }
1079 False, AnyPropertyType, 1421#if ENABLE_EWMH
1080 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1081 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1082 &data); 1425 &ev);
1083 XChangeProperty (display->display, display->root, 1426#endif
1084 XA_CUT_BUFFER0, XA_STRING, 1427 }
1085 8, PropModeReplace, 1428 }
1086 data, STRLEN (data)); 1429#if ENABLE_XEMBED
1087 XFree (data); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1431 {
1089 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
1090 } 1438 }
1091#endif /* OFFIX_DND */
1092 break; 1439 break;
1093 1440
1094 case MappingNotify: 1441 case MappingNotify:
1095 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1096 break; 1443 break;
… …
1119 break; 1466 break;
1120 } 1467 }
1121 break; 1468 break;
1122 1469
1123 case FocusIn: 1470 case FocusIn:
1124 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])
1125 { 1486 {
1126 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1488 ;
1128#ifdef USE_XIM 1489
1129 if (Input_Context != NULL) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1130 XSetICFocus (Input_Context);
1131#endif
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 { 1491 {
1139 PixColors = PixColorsFocused; 1492 seen_resize = 1;
1140 set_colorfgbg (); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1141 scr_clear ();
1142 scr_touch (true);
1143 } 1494 }
1144#endif
1145 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
1146 } 1502 }
1147 break; 1503 break;
1148 1504
1149 case FocusOut:
1150 if (TermWin.focus)
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break;
1175
1176 case ConfigureNotify: 1505 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1178 { 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1179 int height, width; 1508 && ev.xproperty.state == PropertyNewValue)
1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1510
1181 do
1182 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1189 if (szHint.width != width || szHint.height != height)
1190 resize_all_windows (width, height, 1);
1191
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent)
1194 {
1195 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif
1200 }
1201 break; 1511 break;
1202 1512
1203 case SelectionClear: 1513 case SelectionClear:
1204 selection_clear (); 1514 selection_clear ();
1205 break; 1515 break;
1206 1516
1207 case SelectionNotify: 1517 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1518 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1519 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1520 break;
1212 1521
1213 case SelectionRequest: 1522 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1215 break; 1524 break;
1216 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
1217 case UnmapNotify: 1534 case UnmapNotify:
1218 TermWin.mapped = 0; 1535 mapped = 0;
1219#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1221#endif 1538#endif
1222 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1223
1224 case MapNotify:
1225 TermWin.mapped = 1;
1226#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif
1229 break; 1540 break;
1230 1541
1231#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1232 case ReparentNotify: 1543 case ReparentNotify:
1233 rootwin_cb (ev); 1544 rootwin_cb (ev);
1234 break; 1545 break;
1235#endif /* TRANSPARENT */ 1546#endif /* TRANSPARENT */
1236 1547
1237 case GraphicsExpose: 1548 case GraphicsExpose:
1238 case Expose: 1549 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == vt)
1240 { 1551 {
1241 do 1552 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1245 1556
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1558
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1251 1562
1252 scr_refresh (refresh_type); 1563 want_refresh = 1;
1253 } 1564 }
1254 else 1565 else
1255 { 1566 {
1256 XEvent unused_event; 1567 XEvent unused_event;
1257 1568
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1259 ; 1570 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1572 ;
1262 1573
1263 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1264 { 1575 {
1265 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1266 scrollbar_show (0); 1577 scrollbar_show (0);
1267 } 1578 }
1268#ifdef MENUBAR
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose ();
1271#endif
1272 1579
1273#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1276#endif 1583#endif
1277 } 1584 }
1278 break; 1585 break;
1279 1586
1280 case MotionNotify: 1587 case MotionNotify:
1281#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1282 if (hidden_pointer) 1589 if (hidden_pointer)
1283 pointer_unblank (); 1590 pointer_unblank ();
1284#endif 1591#endif
1285#if MENUBAR 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1286 if (isMenuBarWindow (ev.xany.window)) 1593 break;
1594
1595 if (ev.xany.window == vt)
1287 { 1596 {
1288 menubar_control (ev.xbutton); 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1289 break; 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1290 } 1599 ; // nop
1291#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1293 break;
1294
1295 if (ev.xany.window == TermWin.vt)
1296 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1601 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1300 ; 1603 ;
1301 1604
1302 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (dpy, vt,
1303 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1609 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1613 {
1311#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
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1314#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1629 {
1318 int dist; 1630 int dist;
1319 1631
1320 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1637
1326 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1328 */ 1640 */
1329 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1644
1334 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1336 { 1647 {
1337 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1339 } 1650 }
1340 else 1651 else
1341 { 1652 {
1342 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1655 }
1656
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1348 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1350 } 1662 }
1351 else 1663 else
1352 { 1664 {
1353 /* we are within the text window, so we 1665 /* we are within the text window, so we
1354 * shouldn't be scrolling 1666 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1668 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1669 sel_scroll_ev.stop();
1358 } 1670 }
1359#endif 1671#endif
1360#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1361
1362 } 1673 }
1363#endif 1674#endif
1364
1365 } 1675 }
1366 } 1676 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1678 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1370 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1371 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1372 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1687 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1689 scrollbar_size ());
1378 scr_refresh (refresh_type); 1690 want_refresh = 1;
1379 refresh_limit = 0; 1691 refresh_limit = 0;
1380 scrollbar_show (1); 1692 scrollbar_show (1);
1381 } 1693 }
1382 break; 1694 break;
1383 } 1695 }
1384}
1385 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
1386void 1821void
1387rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1823{
1389 SET_R (this); 1824 make_current ();
1390 SET_LOCALE (locale);
1391 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
1392 switch (ev.type) 1831 switch (ev.type)
1393 { 1832 {
1394 case PropertyNotify: 1833 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1834 /*
1405 * 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,
1406 * 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.
1407 */ 1837 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 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])
1412 return; 1840 return;
1413 }
1414 1841
1415 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1416 case ReparentNotify: 1843 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1419 break; 1846 break;
1847 }
1420#endif 1848# endif
1421 }
1422} 1849}
1850#endif
1423 1851
1424void 1852void
1425rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1426{ 1854{
1427 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1428 1856
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1430 if (!bypass_keystate) 1859 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1861
1432 /* 1862 /*
1433 * VT window processing of button press 1863 * VT window processing of button press
1434 */ 1864 */
1435 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1436 { 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
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1879 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1880
1438 if (reportmode) 1881 if (reportmode)
1439 { 1882 {
1440 /* mouse report from vt window */ 1883 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1884 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1885 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1445 { 1888 {
1446 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1447 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1448 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1449 { 1893 {
1450 /* only report double clicks */ 1894 /* only report double clicks */
1451 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1452 mouse_report (ev); 1896 mouse_report (ev);
… …
1471 } 1915 }
1472 else 1916 else
1473 { 1917 {
1474 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1920
1476 switch (ev.button) 1921 switch (ev.button)
1477 { 1922 {
1478 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
1479 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1481 { 1934 {
1482 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1484 else 1937 else
1485 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1953 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1503 else 1956 else
1504 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1958
1505 MEvent.button = Button3; 1959 MEvent.button = Button3;
1506 break; 1960 break;
1507 } 1961 }
1508 } 1962 }
1963
1509 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1510 return; 1965 return;
1511 } 1966 }
1512 1967
1513 /* 1968 /*
… …
1605 break; 2060 break;
1606 case R_SB_ALIGN_BOTTOM: 2061 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 2062 csrO = scrollBar.bot - scrollBar.top;
1608 break; 2063 break;
1609 } 2064 }
2065
1610 if (scrollBar.style == R_SB_XTERM 2066 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 2067 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 2068 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 2069 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 2070
1615 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1616 break; 2072 break;
1617 2073
1618 case Button1: 2074 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2075 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
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 }
2104
1648 break; 2105 break;
1649 } 2106 }
1650 } 2107 }
2108
1651 return; 2109 return;
1652 } 2110 }
1653#if MENUBAR
1654 /*
1655 * Menubar window processing of button press
1656 */
1657 if (isMenuBarWindow (ev.window))
1658 menubar_control (ev);
1659#endif
1660} 2111}
1661 2112
1662void 2113void
1663rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1664{ 2115{
1665 int reportmode = 0; 2116 int reportmode = 0;
1666 2117
1667 csrO = 0; /* reset csr Offset */ 2118 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2119 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2120 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2121
1671 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
1672 { 2123 {
1673 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
1674 scrollbar_show (0); 2125 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH;
1677#endif
1678
1679 } 2126 }
2127
1680#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
1683#endif 2131#endif
2132
1684 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1685 { 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
1686 if (reportmode) 2144 if (reportmode)
1687 { 2145 {
1688 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1705 mouse_report (ev); 2163 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2165 return;
1708 } 2166 }
2167
1709 /* 2168 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2170 * when overriding mouse reporting
1712 */ 2171 */
1713 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2173 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1717 2176
1718 switch (ev.button) 2177 switch (ev.button)
1719 { 2178 {
1720 case Button1: 2179 case Button1:
1721 case Button3: 2180 case Button3:
1722 selection_make (ev.time); 2181 selection_make (ev.time);
1723 break; 2182 break;
2183
1724 case Button2: 2184 case Button2:
1725 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);
1726 break; 2187 break;
2188
1727#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
1728 case Button4: 2190 case Button4:
1729 case Button5: 2191 case Button5:
1730 { 2192 {
1731 int i; 2193 int i;
… …
1733 2195
1734 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
1735 2197
1736 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1737 i = 1; 2199 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1740 else 2202 else
1741 i = 5; 2203 i = 5;
1742 2204
1743# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1745 { 2207 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
1747 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;
1748 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;
1749 2211
1750 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2214
1753 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
1754 } 2216 }
1755 else 2217 else
1756 { 2218 {
1757# endif 2219# endif
1758# ifdef JUMP_MOUSE_WHEEL
1759 scr_page (v, i); 2220 scr_page (v, i);
1760 scr_refresh (SMOOTH_REFRESH);
1761 scrollbar_show (1); 2221 scrollbar_show (1);
1762# else
1763 while (i--)
1764 {
1765 scr_page (v, 1);
1766 scr_refresh (SMOOTH_REFRESH);
1767 scrollbar_show (1);
1768 }
1769# endif
1770# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
1771 } 2223 }
1772#endif 2224# endif
1773 } 2225 }
1774 break; 2226 break;
1775#endif 2227#endif
1776 } 2228 }
1777 } 2229 }
1778#ifdef MENUBAR
1779 else if (isMenuBarWindow (ev.window))
1780 menubar_control (ev);
1781#endif
1782} 2230}
1783 2231
1784#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
1785#if TINTING 2233#if TINTING
1786/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
1787 2235
1788typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
1789 2237
1790void 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)
1791{ 2239{
1792 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2245 int i;
1798 2246
1799 Visual* visual = display->visual; 2247 Visual *visual = term->visual;
1800 2248
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2250
1803 /* for convenience */ 2251 /* for convenience */
1804 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2028 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2030 2478
2031 pchanged = 0; 2479 pchanged = 0;
2032 2480
2033 if (!(Options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2035 2483
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2038 2486
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2040 2488
2041 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2042 { 2490 {
2043 if (am_transparent) 2491 if (am_transparent)
2044 { 2492 {
2045 pchanged = 1; 2493 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2048 } 2496 }
2049 2497
2050 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2051 } 2499 }
2052 2500
2053 /* 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. */
2054 XSync (display->display, False); 2502 XSync (dpy, False);
2055 2503
2056 /* 2504 /*
2057 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2059 * 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.
2060 */ 2508 */
2061 i = (xa[XA_XROOTPMAPID] 2509 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2065 2513
2066 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2071 2519
2072 if (!i || prop == NULL 2520 if (!i || prop == NULL
2073#if TINTING 2521#if TINTING
2074 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2075#endif 2523#endif
2076 ) 2524 )
2077 have_pixmap = 0; 2525 have_pixmap = 0;
2078 else 2526 else
2079 { 2527 {
… …
2092 Window cr; 2540 Window cr;
2093 XImage *image; 2541 XImage *image;
2094 GC gc; 2542 GC gc;
2095 XGCValues gcvalue; 2543 XGCValues gcvalue;
2096 2544
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2549 nx = ny = 0;
2102 2550
… …
2112 nh += sy; 2560 nh += sy;
2113 ny = -sy; 2561 ny = -sy;
2114 sy = 0; 2562 sy = 0;
2115 } 2563 }
2116 2564
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2119 allowedxerror = -1; 2569 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2571
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2574 allowedxerror = 0;
2125 2575
2126 if (image == NULL) 2576 if (image == NULL)
2127 { 2577 {
2128 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2129 { 2579 {
2130 pchanged = 1; 2580 pchanged = 1;
2131 if (TermWin.pixmap != None) 2581 if (pixmap != None)
2132 { 2582 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2583 XFreePixmap (dpy, pixmap);
2134 TermWin.pixmap = None; 2584 pixmap = None;
2135 } 2585 }
2136 } 2586 }
2137 2587
2138 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2139 } 2589 }
2140 else 2590 else
2141 { 2591 {
2142 if (TermWin.pixmap != None) 2592 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2593 XFreePixmap (dpy, pixmap);
2144 2594
2145#if TINTING 2595#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2597 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2599
2600 rgba c;
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2152 2602
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2154 } 2604 }
2155#endif 2605#endif
2156 2606
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2158 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2611 XFreeGC (dpy, gc);
2163 XDestroyImage (image); 2612 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2614 XClearWindow (dpy, parent[0]);
2166 2615
2167 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2617 pchanged = 1;
2169 2618
2170 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2171 } 2620 }
2172 } 2621 }
2173 2622
2174 if (!am_pixmap_trans) 2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2175 { 2626 {
2176 unsigned int n; 2627 unsigned int n;
2177 /* 2628 /*
2178 * InheritPixmap transparency 2629 * InheritPixmap transparency
2179 */ 2630 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2632 {
2183 oldp = TermWin.parent[i]; 2633 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2185 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2635 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2636
2189 if (TermWin.parent[i] == display->root) 2637 if (parent[i] == display->root)
2190 { 2638 {
2191 if (oldp != None) 2639 if (oldp != None)
2192 pchanged = 1; 2640 pchanged = 1;
2193 2641
2194 break; 2642 break;
2195 } 2643 }
2196 2644
2197 if (oldp != TermWin.parent[i]) 2645 if (oldp != parent[i])
2198 pchanged = 1; 2646 pchanged = 1;
2199 } 2647 }
2200 2648
2201 n = 0; 2649 n = 0;
2202 2650
2203 if (pchanged) 2651 if (pchanged)
2204 {
2205 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2206 { 2653 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2655
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2657 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2659 break;
2213 } 2660 }
2214 } 2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2215 } 2664 {
2216
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2667 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2224 } 2669 }
2225 else 2670 else
2226 { 2671 {
2227#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1);
2231#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2234 { 2673 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2675 XClearWindow (dpy, parent[n]);
2237 } 2676 }
2238 2677
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2240 am_transparent = 1; 2679 am_transparent = 1;
2241 } 2680 }
2242 2681
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2683 parent[i] = None;
2245 } 2684 }
2246 2685
2247 // this is experimental
2248 if (scrollBar.win) 2686 if (scrollBar.win)
2249 { 2687 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2253 scrollbar_show (0); 2690 scrollbar_show (0);
2254 } 2691 }
2255 2692
2693 if (am_transparent)
2694 {
2695 want_refresh = want_full_refresh = 1;
2696 if (am_pixmap_trans)
2697 flush ();
2698 }
2699
2256 return pchanged; 2700 return pchanged;
2257} 2701}
2258#endif 2702#endif
2259 2703
2260/*}}} */ 2704/*}}} */
2261 2705
2262bool 2706bool
2263rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2264{ 2708{
2265 bool flag = false; 2709 bool flag = false;
2266 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2268 2712
2269 for (;;) 2713 for (;;)
2270 { 2714 {
2271 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2272 { 2716 {
2273 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2274 ch = next_char (); 2718 ch = next_char ();
2275 }
2276 2719
2277 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2278 break; 2721 break;
2722 }
2279 2723
2280 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)
2281 { 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
2282 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2742 bool refreshnow = false;
2285 int nlines = 0; 2743 int nlines = 0;
2286 unicode_t *str = buf; 2744 wchar_t *str = buf;
2287 2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2746
2290 for (;;) 2747 for (;;)
2291 { 2748 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 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))
2296 break; 2750 break;
2297 2751
2298 *str++ = ch; 2752 *str++ = ch;
2299 2753
2300 if (ch == C0_LF) 2754 if (ch == C0_LF || str >= eol)
2301 { 2755 {
2756 if (ch == C0_LF)
2302 nlines++; 2757 nlines++;
2758
2303 refresh_count++; 2759 refresh_count++;
2304 2760
2305 if (! (Options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2763 {
2308 refreshnow = true; 2764 refreshnow = true;
2765 refresh_count = 0;
2309 ch = NOCHAR; 2766 ch = NOCHAR;
2310 break; 2767 break;
2311 } 2768 }
2312 2769
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2771 if (nlines >= nrow - 1)
2315 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2316 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2317 nlines = 0; 2777 nlines = 0;
2318 str = buf; 2778 str = buf;
2779 eol = str + min (ncol, UBUFSIZ);
2319 } 2780 }
2781
2782 if (str >= eol)
2783 {
2784 if (eol >= buf + UBUFSIZ)
2785 {
2786 ch = NOCHAR;
2787 break;
2788 }
2789 else
2790 eol = min (eol + ncol, buf + UBUFSIZ);
2791 }
2792
2320 } 2793 }
2321 2794
2322 if (str >= buf + UBUFSIZ) 2795 seq_begin = cmdbuf_ptr;
2323 { 2796 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2797 }
2328 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2329 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2330 2802
2331 /* 2803 /*
2332 * 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
2333 * 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.
2334 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2808 */
2337 if (refreshnow) 2809 if (refreshnow)
2338 { 2810 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2812 refresh_limit++;
2341 else 2813 else
2342 { 2814 {
2343 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2344 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2345 } 2819 }
2346 } 2820 }
2347 2821
2348 } 2822 }
2349 else 2823 else
… …
2364 } 2838 }
2365 2839
2366 return flag; 2840 return flag;
2367} 2841}
2368 2842
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376}
2377
2378// read the next character 2843// read the next character
2379unicode_t 2844wchar_t
2380rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2381{ 2846{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2848 {
2384 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2387 2852
2388 wchar_t wc; 2853 wchar_t wc;
2389 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);
2390 2855
2391 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2392 { 2857 {
2393 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2860 break;
2396 } 2861 }
2397 2862
2398 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2399 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
2400 2865
2401 // assume wchar == unicode 2866 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2403 return wc; 2868 return wc & UNICODE_MASK;
2404 } 2869 }
2405 2870
2406 return NOCHAR; 2871 return NOCHAR;
2407} 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;
2408 2884
2409/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2410/* 2886/*
2411 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2412 * to the command. 2888 * to the command.
2413 */ 2889 */
2414unicode_t 2890wchar_t
2415rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2416{ 2892{
2417 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2418 2894
2419 if (c == NOCHAR) 2895 if (c == NOCHAR)
2420 throw out_of_input; 2896 throw out_of_input;
2421 2897
2422 return c; 2898 return c;
2423} 2899}
2424 2900
2425unicode_t 2901uint32_t
2426rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2427{ 2903{
2428 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2429 2905
2430 if (c == NOCHAR) 2906 if (c == NOCHAR)
2431 throw out_of_input; 2907 throw out_of_input;
2432 2908
2433 return c; 2909 return c;
… …
2533 case C0_ESC: 3009 case C0_ESC:
2534 process_escape_seq (); 3010 process_escape_seq ();
2535 break; 3011 break;
2536 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2540 else 3015 else
2541 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2542 (unsigned int)STRLEN (VT100_ANS));
2543 break; 3017 break;
2544 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2545 scr_bell (); 3019 scr_bell ();
2546 break; 3020 break;
2547 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
2646void 3120void
2647rxvt_term::process_escape_seq () 3121rxvt_term::process_escape_seq ()
2648{ 3122{
2649 unicode_t ch = cmd_getc (); 3123 unicode_t ch = cmd_getc ();
2650 3124
2651 if (PrivateModes & PrivMode_vt52) 3125 if (priv_modes & PrivMode_vt52)
2652 { 3126 {
2653 process_escape_vt52 (ch); 3127 process_escape_vt52 (ch);
2654 return; 3128 return;
2655 } 3129 }
2656 3130
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3146 break;
2673 case '+': 3147 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3149 break;
2676#ifndef NO_FRILLS 3150#if !ENABLE_MINIMAL
2677 case '6': 3151 case '6':
2678 scr_backindex (); 3152 scr_backindex ();
2679 break; 3153 break;
2680#endif 3154#endif
2681 case '7': 3155 case '7':
2682 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
2683 break; 3157 break;
2684 case '8': 3158 case '8':
2685 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
2686 break; 3160 break;
2687#ifndef NO_FRILLS 3161#if !ENABLE_MINIMAL
2688 case '9': 3162 case '9':
2689 scr_forwardindex (); 3163 scr_forwardindex ();
2690 break; 3164 break;
2691#endif 3165#endif
2692 case '=': 3166 case '=':
… …
2702 break; 3176 break;
2703 3177
2704 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
2705 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
2706 { 3180 {
2707 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
2708 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2709 } 3183 }
2710 break; 3184 break;
2711 3185
2712 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
2713 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
2735 process_dcs_seq (); 3209 process_dcs_seq ();
2736 break; 3210 break;
2737 3211
2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2739 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
2740 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2742 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
2743 3216
2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2745 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
2746 process_csi_seq (); 3219 process_csi_seq ();
… …
2855 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
2856 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
2857 if (arg[p] == -1) 3330 if (arg[p] == -1)
2858 arg[p] = ndef; 3331 arg[p] = ndef;
2859 3332
2860#ifdef DEBUG_CMD
2861 fprintf (stderr, "CSI ");
2862 for (p = 0; p < nargs; p++)
2863 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2864 fprintf (stderr, "%c\n", ch);
2865#endif
2866
2867 /* 3333 /*
2868 * private mode handling 3334 * private mode handling
2869 */ 3335 */
2870 if (priv) 3336 if (priv)
2871 { 3337 {
2872 switch (priv) 3338 switch (priv)
2873 { 3339 {
2874 case '>': 3340 case '>':
2875 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 //
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
2877 break; 3352 break;
2878 case '?': 3353 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3356 break;
… …
2986 3461
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3462 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3463 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3464 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3467 break;
2993 3468
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3471 break;
2998 3472
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
3001 break; 3475 break;
… …
3008 break; 3482 break;
3009 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3010 scr_report_position (); 3484 scr_report_position ();
3011 break; 3485 break;
3012 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3487 if (option (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3489 break;
3016 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3492 break;
3019 } 3493 }
… …
3055 break; 3529 break;
3056 3530
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3531 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3532 if (arg[0] == 4)
3059 scr_insert_mode (0); 3533 scr_insert_mode (0);
3534 else if (arg[0] == 20)
3535 priv_modes &= ~PrivMode_LFNL;
3060 break; 3536 break;
3061 3537
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3538 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3539 if (arg[0] == 4)
3064 scr_insert_mode (1); 3540 scr_insert_mode (1);
3541 else if (arg[0] == 20)
3542 priv_modes |= PrivMode_LFNL;
3065 break; 3543 break;
3066 3544
3067 /* 3545 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3546 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3547 */
… …
3081 break; 3559 break;
3082 case CSI_75: 3560 case CSI_75:
3083 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3084 break; 3562 break;
3085 3563
3086#ifndef NO_FRILLS 3564#if !ENABLE_MINIMAL
3087 case CSI_74: 3565 case CSI_74:
3088 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3089 break; 3567 break;
3090#endif 3568#endif
3091 3569
… …
3098 break; 3576 break;
3099 } 3577 }
3100} 3578}
3101/*}}} */ 3579/*}}} */
3102 3580
3103#ifndef NO_FRILLS 3581#if !ENABLE_MINIMAL
3104/* ARGSUSED */ 3582/* ARGSUSED */
3105void 3583void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3585{
3108 int x, y; 3586 int x, y;
3109 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3110 Window wdummy; 3588 Window wdummy;
3589
3590 dLocal (Display *, dpy);
3111 3591
3112 if (nargs == 0) 3592 if (nargs == 0)
3113 return; 3593 return;
3114 3594
3115 switch (args[0]) 3595 switch (args[0])
3116 { 3596 {
3117 /* 3597 /*
3118 * commands 3598 * commands
3119 */ 3599 */
3120 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3601 XMapWindow (dpy, parent[0]);
3122 break; 3602 break;
3123 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3604 XIconifyWindow (dpy, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3605 break;
3127 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3129 break; 3608 break;
3130 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3611 break;
3133 case 5: /* raise window */ 3612 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3135 break; 3614 break;
3136 case 6: /* lower window */ 3615 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3138 break; 3617 break;
3139 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3140 scr_touch (true); 3619 scr_touch (true);
3141 break; 3620 break;
3142 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3622 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3623 (unsigned int) (args[1] * fheight));
3145 break; 3624 break;
3146 3625
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3626 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3627 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3629 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
3152 break; 3631 break;
3153
3154 3632
3155 /* 3633 /*
3156 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3157 */ 3635 */
3158 case 11: /* report window state */ 3636 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3639 break;
3162 case 13: /* report window position */ 3640 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3646 break;
3169 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3650 break;
3173 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3653 break;
3176 case 19: /* report window size (chars) */ 3654 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3656 break;
3179 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3658 {
3182 char *s; 3659 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3184 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);
3185 } 3663 }
3186 break; 3664 break;
3187 case 21: /* report window title */ 3665 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3666 {
3190 char *s; 3667 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3192 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);
3193 } 3671 }
3194 break; 3672 break;
3195 } 3673 }
3196} 3674}
3197#endif 3675#endif
3198 3676
3199/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3200/* 3678/*
3201 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3202 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3203 */ 3681 */
3204unsigned char * 3682char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3684{
3207 unicode_t prev = 0, ch; 3685 unicode_t ch;
3686 bool seen_esc = false;
3208 unsigned int n = 0; 3687 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3688 wchar_t string[STRING_MAX];
3211 3689
3212 while ((ch = cmd_getc ()) != NOCHAR) 3690 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3691 {
3214 if (prev == C0_ESC) 3692 if (seen_esc)
3215 { 3693 {
3216 if (ch == 0x5c) /* 7bit ST */ 3694 if (ch == 0x5c) /* 7bit ST */
3217 break; 3695 break;
3218 else 3696 else
3219 return NULL; 3697 return NULL;
3220 } 3698 }
3699 else if (ch == C0_ESC)
3700 {
3701 seen_esc = true;
3702 continue;
3703 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3223 else if (ch < 0x20) 3708 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3225 3710
3226 if (n >= sizeof (string) - 1) 3711 seen_esc = false;
3712
3713 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3714 // stop at some sane length
3228 return NULL; 3715 return NULL;
3229 3716
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
3236 string[n++] = prev = ch; 3717 string[n++] = ch;
3237 } 3718 }
3238 3719
3239 string[n++] = '\0'; 3720 string[n++] = '\0';
3240 3721
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3723
3246 return s; 3724 return rxvt_wcstombs (string);
3247} 3725}
3248 3726
3249/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3250/* 3728/*
3251 * 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)'
3252 */ 3730 */
3253void 3731void
3254rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3255{ 3733{
3256 unsigned char *s; 3734 char *s;
3257 unicode_t eh; 3735 unicode_t eh;
3258 3736
3259 /* 3737 /*
3260 * Not handled yet 3738 * Not handled yet
3261 */ 3739 */
… …
3280 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3281 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3282 3760
3283 if (ch == ';') 3761 if (ch == ';')
3284 { 3762 {
3285 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3286 3764
3287 if (s) 3765 if (s)
3288 { 3766 {
3289 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3290 free (s); 3768 free (s);
3291 } 3769 }
3292 } 3770 }
3293} 3771}
3294 3772
3295void 3773void
3296rxvt_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)
3297{ 3775{
3298 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3299 { 3777 {
3300 if (Options & Opt_insecure) 3778 rgba c;
3301 { 3779 pix_colors_focused[color].get (c);
3302 unsigned short r, g, b; 3780
3303 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
3304 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);
3305 }
3306 } 3787 }
3307 else 3788 else
3308 set_window_color (color, str); 3789 set_window_color (color, str);
3309} 3790}
3310 3791
3311/* 3792/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3794 */
3336void 3795void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3338{ 3797{
3339 int changed = 0;
3340 int color; 3798 int color;
3341 char *buf, *name; 3799 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3801 int saveop = op;
3802
3803 dLocal (Display *, dpy);
3343 3804
3344 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
3345 switch (op) 3810 switch (op)
3346 { 3811 {
3347 case XTerm_name: 3812 case XTerm_name:
3348 set_title (str); 3813 set_title (str);
3349 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3354 set_title (str); 3819 set_title (str);
3355 break; 3820 break;
3356 case XTerm_property: 3821 case XTerm_property:
3357 if (str[0] == '?') 3822 if (str[0] == '?')
3358 { 3823 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3824 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3825 Atom actual_type;
3361 int actual_format; 3826 int actual_format;
3362 unsigned long nitems; 3827 unsigned long nitems;
3363 unsigned long bytes_after; 3828 unsigned long bytes_after;
3364 unsigned char *value = 0; 3829 unsigned char *value = 0;
3365 const char *str = ""; 3830 const char *str = "";
3366 3831
3367 if (prop 3832 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3837 && actual_type != None
3373 && actual_format == 8) 3838 && actual_format == 8)
3374 str = (const char *)(value); 3839 str = (const char *)(value);
3375 3840
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3377 3842
3378 XFree (value); 3843 XFree (value);
3379 } 3844 }
3380 else 3845 else
3381 { 3846 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3847 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3848
3384 if (eq) 3849 if (eq)
3385 { 3850 {
3386 *eq = 0; 3851 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3852 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3853 }
3392 else 3854 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3855 XDeleteProperty (dpy, parent[0],
3394 display->atom (str)); 3856 display->atom (str));
3395 } 3857 }
3396 break; 3858 break;
3397 3859
3398 case XTerm_Color: 3860 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3861 for (buf = (char *)str; buf && *buf;)
3400 { 3862 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3864 break;
3403 3865
3404 *name++ = '\0'; 3866 *name++ = '\0';
3405 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3406 3868
3407 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3408 break; 3870 break;
3409 3871
3410 if ((buf = STRCHR (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3873 *buf++ = '\0';
3412 3874
3413 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3414 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 }
3422 else
3423 set_window_color (color + minCOLOR, name);
3424 } 3876 }
3425 break; 3877 break;
3426 case XTerm_Color00: 3878 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3428 break; 3880 break;
3429 case XTerm_Color01: 3881 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3431 break; 3883 break;
3432#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3433 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3435 break; 3887 break;
3436#endif 3888#endif
3437 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3439 break; 3891 break;
3440 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3442 break; 3894 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break;
3447 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break;
3450 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3452 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;
3453#endif 3910#endif
3911#if TRANSPARENT && TINTING
3912 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp);
3454 3914
3915 check_our_parents ();
3916
3917 if (am_transparent)
3918 want_full_refresh = want_refresh = 1;
3919
3920 break;
3921#endif
3922
3455 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3456 if (*str != ';') 3925 if (*str != ';')
3457 { 3926 {
3458#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3459 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3461#endif
3462 scr_touch (true); 3930 scr_touch (true);
3931#endif
3463 } 3932 }
3933
3934 int changed = 0;
3935
3464 while ((str = STRCHR (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3465 { 3937 {
3466 str++; 3938 str++;
3467#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3469#endif 3941#endif
3470
3471 } 3942 }
3943
3472 if (changed) 3944 if (changed)
3473 { 3945 {
3474#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3947 resize_pixmap ();
3476#endif
3477 scr_touch (true); 3948 scr_touch (true);
3949#endif
3478 } 3950 }
3951 }
3479 break; 3952 break;
3480 3953
3481 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3482 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3483 break; 3956 break;
3484 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3485 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3486 break; 3959 break;
3487 3960
3488 case XTerm_logfile: 3961 case XTerm_logfile:
3489 // TODO, when secure mode? 3962 // TODO, when secure mode?
3490 break; 3963 break;
3491 3964
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break;
3537#endif
3538#if 0 3965#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3540 { 3967 {
3541 int fd; 3968 int fd;
3542 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)
3543 { 3970 {
3544 scr_dump (fd); 3971 scr_dump (fd);
3545 close (fd); 3972 close (fd);
3546 } 3973 }
3547 } 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
3548 break; 4038 break;
3549#endif 4039#endif
3550 } 4040 }
3551} 4041}
3552/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3566{ 4056{
3567 int state; 4057 int state;
3568 4058
3569 if (mode == 's') 4059 if (mode == 's')
3570 { 4060 {
3571 SavedModes |= (PrivateModes & bit); 4061 SavedModes |= (priv_modes & bit);
3572 return -1; 4062 return -1;
3573 } 4063 }
3574 else 4064 else
3575 { 4065 {
3576 if (mode == 'r') 4066 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 4068 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4069 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 4070 PrivMode (state, bit);
3581 } 4071 }
3582 4072
3583 return state; 4073 return state;
3584} 4074}
3585 4075
3586/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3587void 4077void
3588rxvt_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)
3589{ 4079{
3590 unsigned int i, j; 4080 unsigned int i, j;
3591 int state; 4081 int state;
3592 4082
3593 static const struct 4083 static const struct
… …
3602 { 3, PrivMode_132 }, 4092 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 4093 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 4099 // 18, 19 printing-related
3609 { menuBar_esc, PrivMode_menuBar }, 4100 { 25, PrivMode_VisibleCursor },
3610#endif
3611#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 4103#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 4104 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 4105 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 4106 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 4107 // 45 margin bell NYI
3621 // 46 start logging 4108 // 46 start logging
… …
3661 } 4148 }
3662 4149
3663 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4151 switch (arg[i])
3665 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
3666 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4161 case 1049:
3667 if (Options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 4163 if (mode == 0)
3669 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
3670 else if (mode == 1) 4165 else if (mode == 1)
3671 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
3672 break; 4167 break;
… …
3683 * within VT52 mode 4178 * within VT52 mode
3684 */ 4179 */
3685 PrivMode (1, PrivMode_vt52); 4180 PrivMode (1, PrivMode_vt52);
3686 break; 4181 break;
3687 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4185 break;
3691 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
3692 if (state) 4187 set_option (Opt_jumpScroll, !state);
3693 Options &= ~Opt_jumpScroll;
3694 else
3695 Options |= Opt_jumpScroll;
3696 break; 4188 break;
3697 case 5: /* reverse video */ 4189 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
3699 break; 4191 break;
3700 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4196 scr_autowrap (state);
3705 break; 4197 break;
3706 /* 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 */
3707 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4202 break;
3711#ifdef menuBar_esc
3712 case menuBar_esc:
3713#ifdef MENUBAR
3714 map_menuBar (state);
3715#endif
3716 break;
3717#endif
3718#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
3719 case scrollBar_esc: 4204 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
3721 { 4206 {
3722 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
3734 break; 4219 break;
3735 /* case 66: - application key pad */ 4220 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4221 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4222 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4223 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4224 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4225 break;
3741#if 0 4226#if 0
3742 case 1001: 4227 case 1001:
3743 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
3744#endif 4229#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state)
3747 Options &= ~Opt_scrollTtyOutput;
3748 else
3749 Options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
3750 break; 4232 break;
3751 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
3752 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
3754 else
3755 Options &= ~Opt_scrollTtyKeypress;
3756 break; 4235 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4239 scr_erase_screen (2);
3761 scr_change_screen (state); 4240 scr_change_screen (state);
3762 break; 4241 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4243 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4246 scr_erase_screen (2);
3768 break; 4247 break;
3769 default: 4248 default:
3770 break; 4249 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4275 rendset = 0, rendstyle = ~RS_None;
3797 break; 4276 break;
3798 case 1: 4277 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4278 rendset = 1, rendstyle = RS_Bold;
3800 break; 4279 break;
3801 //case 2: // faint or second colour 4280 //case 2: // low intensity
4281 case 3:
4282 rendset = 1, rendstyle = RS_Italic;
4283 break;
3802 case 4: 4284 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4285 rendset = 1, rendstyle = RS_Uline;
3804 break; 4286 break;
3805 case 5: // slowly blinking 4287 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4288 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4300 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4301 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4302 //...
3821 //case 19: // ninth alt font 4303 //case 19: // ninth alt font
3822 //case 20: // gothic 4304 //case 20: // gothic
3823 case 21: // disable bold, faint 4305 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4306 rendset = 0, rendstyle = RS_Bold;
3825 break; 4307 break;
3826 case 22: 4308 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4309 rendset = 0, rendstyle = RS_Bold;
3828 break; 4310 break;
3829 //case 23: disable italic 4311 case 23: // disable italic
4312 rendset = 0, rendstyle = RS_Italic;
4313 break;
3830 case 24: 4314 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4315 rendset = 0, rendstyle = RS_Uline;
3832 break; 4316 break;
3833 case 25: 4317 case 25:
4318 rendset = 0, rendstyle = RS_Blink;
4319 break;
4320 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4321 rendset = 0, rendstyle = RS_Blink;
3835 break; 4322 break;
3836 case 27: 4323 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4324 rendset = 0, rendstyle = RS_RVid;
3838 break; 4325 break;
… …
3856 case 35: 4343 case 35:
3857 case 36: 4344 case 36:
3858 case 37: 4345 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4346 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4347 break;
3861#ifdef TTY_256COLOR 4348 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4349 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4350 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4351 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4352 i += 2;
3867 } 4353 }
3868 break; 4354 break;
3869#endif
3870 case 39: /* default fg */ 4355 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4356 scr_color (Color_fg, Color_fg);
3872 break; 4357 break;
3873 4358
3874 case 40: 4359 case 40:
… …
3879 case 45: 4364 case 45:
3880 case 46: 4365 case 46:
3881 case 47: 4366 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4367 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4368 break;
3884#ifdef TTY_256COLOR 4369 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4370 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4371 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4372 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4373 i += 2;
3890 } 4374 }
3891 break; 4375 break;
3892#endif
3893 case 49: /* default bg */ 4376 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
3895 break; 4378 break;
3896 4379
3897#ifndef NO_BRIGHTCOLOR 4380 //case 50: // not variable spacing
4381
4382#if !ENABLE_MINIMAL
3898 case 90: 4383 case 90:
3899 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
3900 case 92: 4385 case 92:
3901 case 93: 4386 case 93:
3902 case 94: 4387 case 94:
3903 case 95: 4388 case 95:
3904 case 96: 4389 case 96:
3905 case 97: 4390 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4391 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4392 break;
3909 case 100: 4393 case 100:
3910 case 101: /* set bright bg color */ 4394 case 101: /* set bright bg color */
3911 case 102: 4395 case 102:
3912 case 103: 4396 case 103:
3913 case 104: 4397 case 104:
3914 case 105: 4398 case 105:
3915 case 106: 4399 case 106:
3916 case 107: 4400 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4402 break;
3920#endif 4403#endif
3921
3922 } 4404 }
3923 } 4405 }
3924} 4406}
3925/*}}} */ 4407/*}}} */
3926 4408
… …
3930{ 4412{
3931 unicode_t ch, cmd = cmd_getc (); 4413 unicode_t ch, cmd = cmd_getc ();
3932 4414
3933 if (cmd == 'Q') 4415 if (cmd == 'Q')
3934 { /* query graphics */ 4416 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4417 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4418 return;
3937 } 4419 }
3938 /* swallow other graphics sequences until terminating ':' */ 4420 /* swallow other graphics sequences until terminating ':' */
3939 do 4421 do
3940 ch = cmd_getc (); 4422 ch = cmd_getc ();
… …
3950 */ 4432 */
3951void 4433void
3952rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
3953{ 4435{
3954 va_list arg_ptr; 4436 va_list arg_ptr;
3955 unsigned char buf[256]; 4437 char buf[256];
3956 4438
3957 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4441 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4442 tt_write (buf, strlen (buf));
3961} 4443}
3962 4444
3963/* ---------------------------------------------------------------------- */ 4445/* ---------------------------------------------------------------------- */
3964/* 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,
3965 * or generated by us in response to a query ESC sequence. 4447 * or generated by us in response to a query ESC sequence.
3966 */ 4448 */
4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4450
3967void 4451void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
3969{ 4453{
3970 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;
3971 4456
3972 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;
3973 { 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
3974 if (v_buflen == 0) 4487 if (v_buflen == 0)
3975 { 4488 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4489 free (v_buffer);
4003 v_buffer = 0; 4490 v_buffer = 0;
4004 v_buflen = 0; 4491 v_buflen = 0;
4005 4492
4006 pty_ev.set (EVENT_READ); 4493 pty_ev.set (EVENT_READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4494 return;
4019 } 4495 }
4496
4497 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4498 }
4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4500 pty_ev.set (EVENT_READ);
4021} 4501}
4022 4502
4023/*----------------------- end-of-file (C source) -----------------------*/ 4503/*----------------------- end-of-file (C source) -----------------------*/
4024 4504

Diff Legend

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