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

Diff Legend

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