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.316 by root, Thu Dec 7 20:59:59 2006 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 (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1146 } 1490 }
1147 break; 1491 break;
1148 1492
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: 1493 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1178 { 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1179 int height, width; 1496 && ev.xproperty.state == PropertyNewValue)
1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1498
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; 1499 break;
1202 1500
1203 case SelectionClear: 1501 case SelectionClear:
1204 selection_clear (); 1502 selection_clear ();
1205 break; 1503 break;
1206 1504
1207 case SelectionNotify: 1505 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1506 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1508 break;
1212 1509
1213 case SelectionRequest: 1510 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1215 break; 1512 break;
1216 1513
1514 case MapNotify:
1515 mapped = 1;
1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break;
1521
1217 case UnmapNotify: 1522 case UnmapNotify:
1218 TermWin.mapped = 0; 1523 mapped = 0;
1219#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1221#endif 1526#endif
1222 break; 1527 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; 1528 break;
1230 1529
1231#ifdef TRANSPARENT 1530#ifdef TRANSPARENT
1232 case ReparentNotify: 1531 case ReparentNotify:
1233 rootwin_cb (ev); 1532 rootwin_cb (ev);
1234 break; 1533 break;
1235#endif /* TRANSPARENT */ 1534#endif /* TRANSPARENT */
1236 1535
1237 case GraphicsExpose: 1536 case GraphicsExpose:
1238 case Expose: 1537 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1538 if (ev.xany.window == vt)
1240 { 1539 {
1241 do 1540 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1245 1544
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1546
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1251 1550
1252 scr_refresh (refresh_type); 1551 want_refresh = 1;
1253 } 1552 }
1254 else 1553 else
1255 { 1554 {
1256 XEvent unused_event; 1555 XEvent unused_event;
1257 1556
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1259 ; 1558 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1560 ;
1262 1561
1263 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1264 { 1563 {
1265 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1266 scrollbar_show (0); 1565 scrollbar_show (0);
1267 } 1566 }
1268#ifdef MENUBAR
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose ();
1271#endif
1272 1567
1273#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1276#endif 1571#endif
1277 } 1572 }
1278 break; 1573 break;
1279 1574
1280 case MotionNotify: 1575 case MotionNotify:
1281#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1282 if (hidden_pointer) 1577 if (hidden_pointer)
1283 pointer_unblank (); 1578 pointer_unblank ();
1284#endif 1579#endif
1285#if MENUBAR 1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1286 if (isMenuBarWindow (ev.xany.window)) 1581 break;
1582
1583 if (ev.xany.window == vt)
1287 { 1584 {
1288 menubar_control (ev.xbutton); 1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1289 break; 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1290 } 1587 ; // 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))) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1589 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1300 ; 1591 ;
1301 1592
1302 XQueryPointer (display->display, TermWin.vt, 1593 XQueryPointer (dpy, vt,
1303 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1596 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1597 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1599 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1600 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1601 {
1311#endif 1602#endif
1603#if ISO_14755
1604 // 5.4
1605 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1606 {
1607 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1608 break;
1609 }
1610#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1611 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1612 ev.xbutton.state & Button3Mask ? 2 : 0);
1613
1314#ifdef SELECTION_SCROLLING 1614#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1615 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1616 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1617 {
1318 int dist; 1618 int dist;
1319 1619
1320 /* don't clobber the current delay if we are 1620 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1621 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1625
1326 /* save the event params so we can highlight 1626 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1627 * the selection in the pending-scroll loop
1328 */ 1628 */
1329 selection_save_x=ev.xbutton.x; 1629 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1630 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1631 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1632
1334 /* calc number of lines to scroll */ 1633 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1634 if (ev.xbutton.y < int_bwidth)
1336 { 1635 {
1337 scroll_selection_dir = UP; 1636 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1637 dist = int_bwidth - ev.xbutton.y;
1339 } 1638 }
1340 else 1639 else
1341 { 1640 {
1342 scroll_selection_dir = DN; 1641 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1642 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1643 }
1644
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1645 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1646 / SELECTION_SCROLL_LINE_SPEEDUP
1647 + 1;
1348 MIN_IT (scroll_selection_lines, 1648 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1649 SELECTION_SCROLL_MAX_LINES);
1350 } 1650 }
1351 else 1651 else
1352 { 1652 {
1353 /* we are within the text window, so we 1653 /* we are within the text window, so we
1354 * shouldn't be scrolling 1654 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1656 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1358 } 1658 }
1359#endif 1659#endif
1360#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1361
1362 } 1661 }
1363#endif 1662#endif
1364
1365 } 1663 }
1366 } 1664 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1666 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1370 MotionNotify, &ev)) ; 1668 MotionNotify, &ev))
1669 ;
1670
1371 XQueryPointer (display->display, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1372 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1674 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1675 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1677 scrollbar_size ());
1378 scr_refresh (refresh_type); 1678 want_refresh = 1;
1379 refresh_limit = 0; 1679 refresh_limit = 0;
1380 scrollbar_show (1); 1680 scrollbar_show (1);
1381 } 1681 }
1382 break; 1682 break;
1383 } 1683 }
1384}
1385 1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1711}
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM
1724 if (Input_Context != NULL)
1725 {
1726 IMSetPosition ();
1727 XSetICFocus (Input_Context);
1728 }
1729#endif
1730#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif
1734#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade])
1736 {
1737 pix_colors = pix_colors_focused;
1738 scr_recolour ();
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ENABLE_OVERLAY
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1386void 1796void
1387rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1798{
1389 SET_R (this); 1799 make_current ();
1390 SET_LOCALE (locale);
1391 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1392 switch (ev.type) 1806 switch (ev.type)
1393 { 1807 {
1394 case PropertyNotify: 1808 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 /* 1809 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1810 * 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. 1811 * use the property to determine the pixmap. We use it later on.
1407 */ 1812 */
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]) 1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1815 return;
1413 }
1414 1816
1415 /* FALLTHROUGH */ 1817 /* FALLTHROUGH */
1416 case ReparentNotify: 1818 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1419 break; 1821 break;
1822 }
1420#endif 1823# endif
1421 }
1422} 1824}
1825#endif
1423 1826
1424void 1827void
1425rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1426{ 1829{
1427 int reportmode = 0, clickintime; 1830 int reportmode = 0, clickintime;
1428 1831
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1832 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1833
1430 if (!bypass_keystate) 1834 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836
1432 /* 1837 /*
1433 * VT window processing of button press 1838 * VT window processing of button press
1434 */ 1839 */
1435 if (ev.window == TermWin.vt) 1840 if (ev.window == vt)
1436 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1438 if (reportmode) 1856 if (reportmode)
1439 { 1857 {
1440 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1445 { 1863 {
1446 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1447 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1448 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1449 { 1868 {
1450 /* only report double clicks */ 1869 /* only report double clicks */
1451 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1452 mouse_report (ev); 1871 mouse_report (ev);
… …
1471 } 1890 }
1472 else 1891 else
1473 { 1892 {
1474 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1476 switch (ev.button) 1896 switch (ev.button)
1477 { 1897 {
1478 case Button1: 1898 case Button1:
1899 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */
1901#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask);
1903#else
1904 selection.rect = false;
1905#endif
1906
1479 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1481 { 1909 {
1482 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1484 else 1912 else
1485 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1928 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1503 else 1931 else
1504 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933
1505 MEvent.button = Button3; 1934 MEvent.button = Button3;
1506 break; 1935 break;
1507 } 1936 }
1508 } 1937 }
1938
1509 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1510 return; 1940 return;
1511 } 1941 }
1512 1942
1513 /* 1943 /*
… …
1605 break; 2035 break;
1606 case R_SB_ALIGN_BOTTOM: 2036 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 2037 csrO = scrollBar.bot - scrollBar.top;
1608 break; 2038 break;
1609 } 2039 }
2040
1610 if (scrollBar.style == R_SB_XTERM 2041 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 2042 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 2043 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 2045
1615 scrollBar.setMotion (); 2046 scrollBar.setMotion ();
1616 break; 2047 break;
1617 2048
1618 case Button1: 2049 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2050 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1623 case Button3: 2054 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1625 { 2056 {
1626 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1629# else 2060# else
1630 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1631# endif 2062# endif
1632 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1635# else 2066# else
1636 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1637# endif 2068# endif
1638 else 2069 else
1639 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1640 } 2071 }
1641 else 2072 else
1642 { 2073 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2075 (nrow
1645 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2077 / scrollbar_size ()));
1647 } 2078 }
2079
1648 break; 2080 break;
1649 } 2081 }
1650 } 2082 }
2083
1651 return; 2084 return;
1652 } 2085 }
1653#if MENUBAR
1654 /*
1655 * Menubar window processing of button press
1656 */
1657 if (isMenuBarWindow (ev.window))
1658 menubar_control (ev);
1659#endif
1660} 2086}
1661 2087
1662void 2088void
1663rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1664{ 2090{
1665 int reportmode = 0; 2091 int reportmode = 0;
1666 2092
1667 csrO = 0; /* reset csr Offset */ 2093 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2094 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2095 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2096
1671 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1672 { 2098 {
1673 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1674 scrollbar_show (0); 2100 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH;
1677#endif
1678
1679 } 2101 }
2102
1680#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
1683#endif 2106#endif
2107
1684 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1685 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2113#if ISO_14755
2114 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return;
2117#endif
2118
1686 if (reportmode) 2119 if (reportmode)
1687 { 2120 {
1688 /* mouse report from vt window */ 2121 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2123 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2137 MEvent.button = AnyButton;
1705 mouse_report (ev); 2138 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2139#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2140 return;
1708 } 2141 }
2142
1709 /* 2143 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2144 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2145 * when overriding mouse reporting
1712 */ 2146 */
1713 if (PrivateModes & PrivMode_mouse_report 2147 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2148 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2149 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2150 selection_extend (ev.x, ev.y, 0);
1717 2151
1718 switch (ev.button) 2152 switch (ev.button)
1719 { 2153 {
1720 case Button1: 2154 case Button1:
1721 case Button3: 2155 case Button3:
1722 selection_make (ev.time); 2156 selection_make (ev.time);
1723 break; 2157 break;
2158
1724 case Button2: 2159 case Button2:
1725 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1726 break; 2162 break;
2163
1727#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
1728 case Button4: 2165 case Button4:
1729 case Button5: 2166 case Button5:
1730 { 2167 {
1731 int i; 2168 int i;
… …
1733 2170
1734 v = ev.button == Button4 ? UP : DN; 2171 v = ev.button == Button4 ? UP : DN;
1735 2172
1736 if (ev.state & ShiftMask) 2173 if (ev.state & ShiftMask)
1737 i = 1; 2174 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2175 else if (OPTION (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2176 i = nrow - 1;
1740 else 2177 else
1741 i = 5; 2178 i = 5;
1742 2179
1743# ifdef MOUSE_SLIP_WHEELING 2180# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2181 if (ev.state & ControlMask)
1745 { 2182 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2183 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2184 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; 2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2186
1750 if (slip_wheel_ev.at < NOW) 2187 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2189
1753 slip_wheel_ev.start (); 2190 slip_wheel_ev.start ();
1754 } 2191 }
1755 else 2192 else
1756 { 2193 {
1757# endif 2194# endif
1758# ifdef JUMP_MOUSE_WHEEL
1759 scr_page (v, i); 2195 scr_page (v, i);
1760 scr_refresh (SMOOTH_REFRESH);
1761 scrollbar_show (1); 2196 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 2197# ifdef MOUSE_SLIP_WHEELING
1771 } 2198 }
1772#endif 2199# endif
1773 } 2200 }
1774 break; 2201 break;
1775#endif 2202#endif
1776 } 2203 }
1777 } 2204 }
1778#ifdef MENUBAR
1779 else if (isMenuBarWindow (ev.window))
1780 menubar_control (ev);
1781#endif
1782} 2205}
1783 2206
1784#ifdef TRANSPARENT 2207#ifdef TRANSPARENT
1785#if TINTING 2208#if TINTING
1786/* taken from aterm-0.4.2 */ 2209/* taken from aterm-0.4.2 */
1787 2210
1788typedef uint32_t RUINT32T; 2211typedef uint32_t RUINT32T;
1789 2212
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{ 2214{
1792 int sh_r, sh_g, sh_b; 2215 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b; 2216 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2220 int i;
1798 2221
1799 Visual* visual = display->visual; 2222 Visual *visual = term->visual;
1800 2223
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2225
1803 /* for convenience */ 2226 /* for convenience */
1804 mask_r = visual->red_mask; 2227 mask_r = visual->red_mask;
… …
2028 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
2030 2453
2031 pchanged = 0; 2454 pchanged = 0;
2032 2455
2033 if (!(Options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2035 2458
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2038 2461
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2040 2463
2041 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2042 { 2465 {
2043 if (am_transparent) 2466 if (am_transparent)
2044 { 2467 {
2045 pchanged = 1; 2468 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2048 } 2471 }
2049 2472
2050 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2051 } 2474 }
2052 2475
2053 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False); 2477 XSync (dpy, False);
2055 2478
2056 /* 2479 /*
2057 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2060 */ 2483 */
2061 i = (xa[XA_XROOTPMAPID] 2484 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2065 2488
2066 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2071 2494
2072 if (!i || prop == NULL 2495 if (!i || prop == NULL
2073#if TINTING 2496#if TINTING
2074 || !rs[Rs_color + Color_tint] 2497 || !ISSET_PIXCOLOR (Color_tint)
2075#endif 2498#endif
2076 ) 2499 )
2077 have_pixmap = 0; 2500 have_pixmap = 0;
2078 else 2501 else
2079 { 2502 {
… …
2092 Window cr; 2515 Window cr;
2093 XImage *image; 2516 XImage *image;
2094 GC gc; 2517 GC gc;
2095 XGCValues gcvalue; 2518 XGCValues gcvalue;
2096 2519
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2524 nx = ny = 0;
2102 2525
… …
2112 nh += sy; 2535 nh += sy;
2113 ny = -sy; 2536 ny = -sy;
2114 sy = 0; 2537 sy = 0;
2115 } 2538 }
2116 2539
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2119 allowedxerror = -1; 2544 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2546
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2549 allowedxerror = 0;
2125 2550
2126 if (image == NULL) 2551 if (image == NULL)
2127 { 2552 {
2128 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2129 { 2554 {
2130 pchanged = 1; 2555 pchanged = 1;
2131 if (TermWin.pixmap != None) 2556 if (pixmap != None)
2132 { 2557 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (dpy, pixmap);
2134 TermWin.pixmap = None; 2559 pixmap = None;
2135 } 2560 }
2136 } 2561 }
2137 2562
2138 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2139 } 2564 }
2140 else 2565 else
2141 { 2566 {
2142 if (TermWin.pixmap != None) 2567 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (dpy, pixmap);
2144 2569
2145#if TINTING 2570#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2572 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2574
2575 rgba c;
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused [Color_tint].get (c);
2152 2577
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2154 } 2579 }
2155#endif 2580#endif
2156 2581
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2582 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); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2586 XFreeGC (dpy, gc);
2163 XDestroyImage (image); 2587 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2589 XClearWindow (dpy, parent[0]);
2166 2590
2167 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2592 pchanged = 1;
2169 2593
2170 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2171 } 2595 }
2172 } 2596 }
2173 2597
2174 if (!am_pixmap_trans) 2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2175 { 2601 {
2176 unsigned int n; 2602 unsigned int n;
2177 /* 2603 /*
2178 * InheritPixmap transparency 2604 * InheritPixmap transparency
2179 */ 2605 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2607 {
2183 oldp = TermWin.parent[i]; 2608 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2185 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2610 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2611
2189 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2190 { 2613 {
2191 if (oldp != None) 2614 if (oldp != None)
2192 pchanged = 1; 2615 pchanged = 1;
2193 2616
2194 break; 2617 break;
2195 } 2618 }
2196 2619
2197 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2198 pchanged = 1; 2621 pchanged = 1;
2199 } 2622 }
2200 2623
2201 n = 0; 2624 n = 0;
2202 2625
2203 if (pchanged) 2626 if (pchanged)
2204 {
2205 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2206 { 2628 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2630
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2632 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2634 break;
2213 } 2635 }
2214 } 2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2215 } 2639 {
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]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2642 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2224 } 2644 }
2225 else 2645 else
2226 { 2646 {
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++) 2647 for (n = 0; n < (unsigned int)i; n++)
2234 { 2648 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2650 XClearWindow (dpy, parent[n]);
2237 } 2651 }
2238 2652
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2240 am_transparent = 1; 2654 am_transparent = 1;
2241 } 2655 }
2242 2656
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2658 parent[i] = None;
2245 } 2659 }
2246 2660
2247 // this is experimental
2248 if (scrollBar.win) 2661 if (scrollBar.win)
2249 { 2662 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2253 scrollbar_show (0); 2665 scrollbar_show (0);
2254 } 2666 }
2255 2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2256 return pchanged; 2675 return pchanged;
2257} 2676}
2258#endif 2677#endif
2259 2678
2260/*}}} */ 2679/*}}} */
2261 2680
2262bool 2681bool
2263rxvt_term::cmd_parse () 2682rxvt_term::cmd_parse ()
2264{ 2683{
2265 bool flag = false; 2684 bool flag = false;
2266 unicode_t ch = NOCHAR; 2685 wchar_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here 2686 char *seq_begin; // remember start of esc-sequence here
2268 2687
2269 for (;;) 2688 for (;;)
2270 { 2689 {
2271 if (ch == NOCHAR) 2690 if (ch == NOCHAR)
2272 { 2691 {
2273 seq_begin = cmdbuf_ptr; 2692 seq_begin = cmdbuf_ptr;
2274 ch = next_char (); 2693 ch = next_char ();
2275 }
2276 2694
2277 if (ch == NOCHAR) // TODO: improve 2695 if (ch == NOCHAR)
2278 break; 2696 break;
2697 }
2279 2698
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2700 {
2701 if (!seen_input)
2702 {
2703 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs
2707 // then sometimes get the size wrong.
2708 // unfortunately other programs are even more buggy and dislike
2709 // being sent SIGWINCH, so only do it when we were in fact being
2710 // resized.
2711 if (seen_resize && cmd_pid)
2712 kill (-cmd_pid, SIGWINCH);
2713 }
2714
2282 /* Read a text string from the input buffer */ 2715 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2716 wchar_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2717 bool refreshnow = false;
2285 int nlines = 0; 2718 int nlines = 0;
2286 unicode_t *str = buf; 2719 wchar_t *str = buf;
2287 2720 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2721
2290 for (;;) 2722 for (;;)
2291 { 2723 {
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)) 2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2725 break;
2297 2726
2298 *str++ = ch; 2727 *str++ = ch;
2299 2728
2300 if (ch == C0_LF) 2729 if (ch == C0_LF || str >= eol)
2301 { 2730 {
2731 if (ch == C0_LF)
2302 nlines++; 2732 nlines++;
2733
2303 refresh_count++; 2734 refresh_count++;
2304 2735
2305 if (! (Options & Opt_jumpScroll) 2736 if (!OPTION (Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2738 {
2308 refreshnow = true; 2739 refreshnow = true;
2740 refresh_count = 0;
2309 ch = NOCHAR; 2741 ch = NOCHAR;
2310 break; 2742 break;
2311 } 2743 }
2312 2744
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2745 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2746 if (nlines >= nrow - 1)
2315 { 2747 {
2748 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2749 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2316 scr_add_lines (buf, nlines, str - buf); 2750 scr_add_lines (buf, str - buf, nlines);
2751
2317 nlines = 0; 2752 nlines = 0;
2318 str = buf; 2753 str = buf;
2754 eol = str + min (ncol, UBUFSIZ);
2319 } 2755 }
2756
2757 if (str >= eol)
2758 {
2759 if (eol >= buf + UBUFSIZ)
2760 {
2761 ch = NOCHAR;
2762 break;
2763 }
2764 else
2765 eol = min (eol + ncol, buf + UBUFSIZ);
2766 }
2767
2320 } 2768 }
2321 2769
2322 if (str >= buf + UBUFSIZ) 2770 seq_begin = cmdbuf_ptr;
2323 { 2771 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2772 }
2328 2773
2774 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2329 scr_add_lines (buf, nlines, str - buf); 2776 scr_add_lines (buf, str - buf, nlines);
2330 2777
2331 /* 2778 /*
2332 * If there have been a lot of new lines, then update the screen 2779 * 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. 2780 * 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 2781 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2782 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2783 */
2337 if (refreshnow) 2784 if (refreshnow)
2338 { 2785 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2787 refresh_limit++;
2341 else 2788 else
2342 { 2789 {
2343 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2344 scr_refresh (refresh_type); 2792 scr_refresh ();
2793 want_refresh = 1;
2345 } 2794 }
2346 } 2795 }
2347 2796
2348 } 2797 }
2349 else 2798 else
… …
2364 } 2813 }
2365 2814
2366 return flag; 2815 return flag;
2367} 2816}
2368 2817
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 2818// read the next character
2379unicode_t 2819wchar_t
2380rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2381{ 2821{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2823 {
2384 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++; 2826 return *cmdbuf_ptr++;
2387 2827
2388 wchar_t wc; 2828 wchar_t wc;
2389 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2830
2391 if (len == (size_t)-2) 2831 if (len == (size_t)-2)
2392 { 2832 {
2393 // the mbstate stores incomplete sequences. didn't know this :/ 2833 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp; 2834 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2835 break;
2396 } 2836 }
2397 2837
2398 if (len == (size_t)-1) 2838 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2840
2401 // assume wchar == unicode 2841 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2842 cmdbuf_ptr += len;
2403 return wc; 2843 return wc & UNICODE_MASK;
2404 } 2844 }
2405 2845
2406 return NOCHAR; 2846 return NOCHAR;
2407} 2847}
2848
2849// read the next octet
2850uint32_t
2851rxvt_term::next_octet () NOTHROW
2852{
2853 return cmdbuf_ptr < cmdbuf_endp
2854 ? (unsigned char)*cmdbuf_ptr++
2855 : NOCHAR;
2856}
2857
2858static class out_of_input out_of_input;
2408 2859
2409/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2410/* 2861/*
2411 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2412 * to the command. 2863 * to the command.
2413 */ 2864 */
2414unicode_t 2865wchar_t
2415rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2416{ 2867{
2417 unicode_t c = next_char (); 2868 wchar_t c = next_char ();
2418 2869
2419 if (c == NOCHAR) 2870 if (c == NOCHAR)
2420 throw out_of_input; 2871 throw out_of_input;
2421 2872
2422 return c; 2873 return c;
2423} 2874}
2424 2875
2425unicode_t 2876uint32_t
2426rxvt_term::cmd_get8 () 2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2427{ 2878{
2428 unicode_t c = next_octet (); 2879 uint32_t c = next_octet ();
2429 2880
2430 if (c == NOCHAR) 2881 if (c == NOCHAR)
2431 throw out_of_input; 2882 throw out_of_input;
2432 2883
2433 return c; 2884 return c;
… …
2533 case C0_ESC: 2984 case C0_ESC:
2534 process_escape_seq (); 2985 process_escape_seq ();
2535 break; 2986 break;
2536 case C0_ENQ: /* terminal Status */ 2987 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2988 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2989 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2540 else 2990 else
2541 tt_write ((unsigned char *)VT100_ANS, 2991 tt_write (VT100_ANS, strlen (VT100_ANS));
2542 (unsigned int)STRLEN (VT100_ANS));
2543 break; 2992 break;
2544 case C0_BEL: /* bell */ 2993 case C0_BEL: /* bell */
2545 scr_bell (); 2994 scr_bell ();
2546 break; 2995 break;
2547 case C0_BS: /* backspace */ 2996 case C0_BS: /* backspace */
… …
2646void 3095void
2647rxvt_term::process_escape_seq () 3096rxvt_term::process_escape_seq ()
2648{ 3097{
2649 unicode_t ch = cmd_getc (); 3098 unicode_t ch = cmd_getc ();
2650 3099
2651 if (PrivateModes & PrivMode_vt52) 3100 if (priv_modes & PrivMode_vt52)
2652 { 3101 {
2653 process_escape_vt52 (ch); 3102 process_escape_vt52 (ch);
2654 return; 3103 return;
2655 } 3104 }
2656 3105
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3121 break;
2673 case '+': 3122 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3124 break;
2676#ifndef NO_FRILLS 3125#if !ENABLE_MINIMAL
2677 case '6': 3126 case '6':
2678 scr_backindex (); 3127 scr_backindex ();
2679 break; 3128 break;
2680#endif 3129#endif
2681 case '7': 3130 case '7':
2682 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
2683 break; 3132 break;
2684 case '8': 3133 case '8':
2685 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
2686 break; 3135 break;
2687#ifndef NO_FRILLS 3136#if !ENABLE_MINIMAL
2688 case '9': 3137 case '9':
2689 scr_forwardindex (); 3138 scr_forwardindex ();
2690 break; 3139 break;
2691#endif 3140#endif
2692 case '=': 3141 case '=':
… …
2702 break; 3151 break;
2703 3152
2704 /* 8.3.87: NEXT LINE */ 3153 /* 8.3.87: NEXT LINE */
2705 case C1_NEL: /* ESC E */ 3154 case C1_NEL: /* ESC E */
2706 { 3155 {
2707 unicode_t nlcr[] = { C0_LF, C0_CR }; 3156 wchar_t nlcr[] = { C0_LF, C0_CR };
2708 scr_add_lines (nlcr, 1, 2); 3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2709 } 3158 }
2710 break; 3159 break;
2711 3160
2712 /* kidnapped escape sequence: Should be 8.3.48 */ 3161 /* kidnapped escape sequence: Should be 8.3.48 */
2713 case C1_ESA: /* ESC G */ 3162 case C1_ESA: /* ESC G */
… …
2735 process_dcs_seq (); 3184 process_dcs_seq ();
2736 break; 3185 break;
2737 3186
2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3187 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2739 case C1_SCI: /* ESC Z */ 3188 case C1_SCI: /* ESC Z */
2740 tt_write ((const unsigned char *)ESCZ_ANSWER, 3189 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2742 break; /* steal obsolete ESC [ c */ 3190 break; /* steal obsolete ESC [ c */
2743 3191
2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3192 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2745 case C1_CSI: /* ESC [ */ 3193 case C1_CSI: /* ESC [ */
2746 process_csi_seq (); 3194 process_csi_seq ();
… …
2855 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
2856 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
2857 if (arg[p] == -1) 3305 if (arg[p] == -1)
2858 arg[p] = ndef; 3306 arg[p] = ndef;
2859 3307
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 /* 3308 /*
2868 * private mode handling 3309 * private mode handling
2869 */ 3310 */
2870 if (priv) 3311 if (priv)
2871 { 3312 {
2872 switch (priv) 3313 switch (priv)
2873 { 3314 {
2874 case '>': 3315 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
2877 break; 3327 break;
2878 case '?': 3328 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3331 break;
… …
2986 3436
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3437 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3438 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3439 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3440 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3441 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3442 break;
2993 3443
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3444 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3445 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3446 break;
2998 3447
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3448 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3449 process_sgr_mode (nargs, arg);
3001 break; 3450 break;
… …
3008 break; 3457 break;
3009 case 6: /* CPR requested */ 3458 case 6: /* CPR requested */
3010 scr_report_position (); 3459 scr_report_position ();
3011 break; 3460 break;
3012 case 7: /* unofficial extension */ 3461 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3462 if (OPTION (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3463 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3464 break;
3016 case 8: /* unofficial extension */ 3465 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3467 break;
3019 } 3468 }
… …
3055 break; 3504 break;
3056 3505
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3506 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3507 if (arg[0] == 4)
3059 scr_insert_mode (0); 3508 scr_insert_mode (0);
3509 else if (arg[0] == 20)
3510 priv_modes &= ~PrivMode_LFNL;
3060 break; 3511 break;
3061 3512
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3513 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3514 if (arg[0] == 4)
3064 scr_insert_mode (1); 3515 scr_insert_mode (1);
3516 else if (arg[0] == 20)
3517 priv_modes |= PrivMode_LFNL;
3065 break; 3518 break;
3066 3519
3067 /* 3520 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3521 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3522 */
… …
3081 break; 3534 break;
3082 case CSI_75: 3535 case CSI_75:
3083 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3084 break; 3537 break;
3085 3538
3086#ifndef NO_FRILLS 3539#if !ENABLE_MINIMAL
3087 case CSI_74: 3540 case CSI_74:
3088 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3089 break; 3542 break;
3090#endif 3543#endif
3091 3544
… …
3098 break; 3551 break;
3099 } 3552 }
3100} 3553}
3101/*}}} */ 3554/*}}} */
3102 3555
3103#ifndef NO_FRILLS 3556#if !ENABLE_MINIMAL
3104/* ARGSUSED */ 3557/* ARGSUSED */
3105void 3558void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3560{
3108 int x, y; 3561 int x, y;
3109 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3110 Window wdummy; 3563 Window wdummy;
3564
3565 dLocal (Display *, dpy);
3111 3566
3112 if (nargs == 0) 3567 if (nargs == 0)
3113 return; 3568 return;
3114 3569
3115 switch (args[0]) 3570 switch (args[0])
3116 { 3571 {
3117 /* 3572 /*
3118 * commands 3573 * commands
3119 */ 3574 */
3120 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (dpy, parent[0]);
3122 break; 3577 break;
3123 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (dpy, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3580 break;
3127 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3129 break; 3583 break;
3130 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3586 break;
3133 case 5: /* raise window */ 3587 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3135 break; 3589 break;
3136 case 6: /* lower window */ 3590 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3138 break; 3592 break;
3139 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3140 scr_touch (true); 3594 scr_touch (true);
3141 break; 3595 break;
3142 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
3145 break; 3599 break;
3146 3600
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3601 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3602 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
3152 break; 3606 break;
3153
3154 3607
3155 /* 3608 /*
3156 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3157 */ 3610 */
3158 case 11: /* report window state */ 3611 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3614 break;
3162 case 13: /* report window position */ 3615 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3621 break;
3169 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3625 break;
3173 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3628 break;
3176 case 19: /* report window size (chars) */ 3629 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3631 break;
3179 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3633 {
3182 char *s; 3634 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s);
3185 } 3638 }
3186 break; 3639 break;
3187 case 21: /* report window title */ 3640 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3641 {
3190 char *s; 3642 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s);
3193 } 3646 }
3194 break; 3647 break;
3195 } 3648 }
3196} 3649}
3197#endif 3650#endif
3198 3651
3199/*----------------------------------------------------------------------*/ 3652/*----------------------------------------------------------------------*/
3200/* 3653/*
3201 * get input up until STRING TERMINATOR (or BEL) 3654 * get input up until STRING TERMINATOR (or BEL)
3202 * ends_how is terminator used. returned input must be free()'d 3655 * ends_how is terminator used. returned input must be free()'d
3203 */ 3656 */
3204unsigned char * 3657char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3658rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3659{
3207 unicode_t prev = 0, ch; 3660 unicode_t ch;
3661 bool seen_esc = false;
3208 unsigned int n = 0; 3662 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3663 wchar_t string[STRING_MAX];
3211 3664
3212 while ((ch = cmd_getc ()) != NOCHAR) 3665 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3666 {
3214 if (prev == C0_ESC) 3667 if (seen_esc)
3215 { 3668 {
3216 if (ch == 0x5c) /* 7bit ST */ 3669 if (ch == 0x5c) /* 7bit ST */
3217 break; 3670 break;
3218 else 3671 else
3219 return NULL; 3672 return NULL;
3220 } 3673 }
3674 else if (ch == C0_ESC)
3675 {
3676 seen_esc = true;
3677 continue;
3678 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3223 else if (ch < 0x20) 3683 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3225 3685
3226 if (n >= sizeof (string) - 1) 3686 seen_esc = false;
3687
3688 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3689 // stop at some sane length
3228 return NULL; 3690 return NULL;
3229 3691
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
3236 string[n++] = prev = ch; 3692 string[n++] = ch;
3237 } 3693 }
3238 3694
3239 string[n++] = '\0'; 3695 string[n++] = '\0';
3240 3696
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3698
3246 return s; 3699 return rxvt_wcstombs (string);
3247} 3700}
3248 3701
3249/*----------------------------------------------------------------------*/ 3702/*----------------------------------------------------------------------*/
3250/* 3703/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3704 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3252 */ 3705 */
3253void 3706void
3254rxvt_term::process_dcs_seq () 3707rxvt_term::process_dcs_seq ()
3255{ 3708{
3256 unsigned char *s; 3709 char *s;
3257 unicode_t eh; 3710 unicode_t eh;
3258 3711
3259 /* 3712 /*
3260 * Not handled yet 3713 * Not handled yet
3261 */ 3714 */
… …
3280 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3733 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3281 arg = arg * 10 + (ch - '0'); 3734 arg = arg * 10 + (ch - '0');
3282 3735
3283 if (ch == ';') 3736 if (ch == ';')
3284 { 3737 {
3285 unsigned char *s = get_to_st (eh); 3738 char *s = get_to_st (eh);
3286 3739
3287 if (s) 3740 if (s)
3288 { 3741 {
3289 process_xterm_seq (arg, (char *)s, eh); 3742 process_xterm_seq (arg, s, eh);
3290 free (s); 3743 free (s);
3291 } 3744 }
3292 } 3745 }
3293} 3746}
3294 3747
3295void 3748void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3297{ 3750{
3298 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3299 { 3752 {
3300 if (Options & Opt_insecure) 3753 rgba c;
3301 { 3754 pix_colors_focused[color].get (c);
3302 unsigned short r, g, b; 3755
3303 PixColorsFocused[color].get (display, r, g, b); 3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3305 }
3306 } 3762 }
3307 else 3763 else
3308 set_window_color (color, str); 3764 set_window_color (color, str);
3309} 3765}
3310 3766
3311/* 3767/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * 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 */ 3769 */
3336void 3770void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3338{ 3772{
3339 int changed = 0;
3340 int color; 3773 int color;
3341 char *buf, *name; 3774 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3776 int saveop = op;
3777
3778 dLocal (Display *, dpy);
3343 3779
3344 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3345 switch (op) 3785 switch (op)
3346 { 3786 {
3347 case XTerm_name: 3787 case XTerm_name:
3348 set_title (str); 3788 set_title (str);
3349 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
3354 set_title (str); 3794 set_title (str);
3355 break; 3795 break;
3356 case XTerm_property: 3796 case XTerm_property:
3357 if (str[0] == '?') 3797 if (str[0] == '?')
3358 { 3798 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3799 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3800 Atom actual_type;
3361 int actual_format; 3801 int actual_format;
3362 unsigned long nitems; 3802 unsigned long nitems;
3363 unsigned long bytes_after; 3803 unsigned long bytes_after;
3364 unsigned char *value = 0; 3804 unsigned char *value = 0;
3365 const char *str = ""; 3805 const char *str = "";
3366 3806
3367 if (prop 3807 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3812 && actual_type != None
3373 && actual_format == 8) 3813 && actual_format == 8)
3374 str = (const char *)(value); 3814 str = (const char *)(value);
3375 3815
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3377 3817
3378 XFree (value); 3818 XFree (value);
3379 } 3819 }
3380 else 3820 else
3381 { 3821 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3822 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3823
3384 if (eq) 3824 if (eq)
3385 { 3825 {
3386 *eq = 0; 3826 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3827 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 } 3828 }
3392 else 3829 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3830 XDeleteProperty (dpy, parent[0],
3394 display->atom (str)); 3831 display->atom (str));
3395 } 3832 }
3396 break; 3833 break;
3397 3834
3398 case XTerm_Color: 3835 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3836 for (buf = (char *)str; buf && *buf;)
3400 { 3837 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3838 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3839 break;
3403 3840
3404 *name++ = '\0'; 3841 *name++ = '\0';
3405 color = atoi (buf); 3842 color = atoi (buf) + minCOLOR;
3406 3843
3407 if (color < 0 || color >= TOTAL_COLORS) 3844 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3408 break; 3845 break;
3409 3846
3410 if ((buf = STRCHR (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3848 *buf++ = '\0';
3412 3849
3413 if (name[0] == '?' && !name[1]) 3850 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 } 3851 }
3425 break; 3852 break;
3426 case XTerm_Color00: 3853 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (op, Color_fg, str, resp);
3428 break; 3855 break;
3429 case XTerm_Color01: 3856 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (op, Color_bg, str, resp);
3431 break; 3858 break;
3432#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3433 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (op, Color_cursor, str, resp);
3435 break; 3862 break;
3436#endif 3863#endif
3437 case XTerm_Color_pointer_fg: 3864 case XTerm_Color_pointer_fg:
3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3439 break; 3866 break;
3440 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (op, Color_pointer_bg, str, resp);
3442 break; 3869 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#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: 3871 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (op, Color_RV, str, resp);
3452 break; 3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3881 break;
3882 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp);
3884 break;
3453#endif 3885#endif
3886#if TRANSPARENT && TINTING
3887 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp);
3454 3889
3890 check_our_parents ();
3891
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894
3895 break;
3896#endif
3897
3455 case XTerm_Pixmap: 3898 case Rxvt_Pixmap:
3899 {
3456 if (*str != ';') 3900 if (*str != ';')
3457 { 3901 {
3458#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3459 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3461#endif
3462 scr_touch (true); 3905 scr_touch (true);
3906#endif
3463 } 3907 }
3908
3909 int changed = 0;
3910
3464 while ((str = STRCHR (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3465 { 3912 {
3466 str++; 3913 str++;
3467#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3469#endif 3916#endif
3470
3471 } 3917 }
3918
3472 if (changed) 3919 if (changed)
3473 { 3920 {
3474#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3922 resize_pixmap ();
3476#endif
3477 scr_touch (true); 3923 scr_touch (true);
3924#endif
3478 } 3925 }
3926 }
3479 break; 3927 break;
3480 3928
3481 case XTerm_restoreFG: 3929 case Rxvt_restoreFG:
3482 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3483 break; 3931 break;
3484 case XTerm_restoreBG: 3932 case Rxvt_restoreBG:
3485 set_window_color (Color_bg, str); 3933 set_window_color (Color_bg, str);
3486 break; 3934 break;
3487 3935
3488 case XTerm_logfile: 3936 case XTerm_logfile:
3489 // TODO, when secure mode? 3937 // TODO, when secure mode?
3490 break; 3938 break;
3491 3939
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 3940#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3941 case Rxvt_dumpscreen: /* no error notices */
3540 { 3942 {
3541 int fd; 3943 int fd;
3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3944 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3543 { 3945 {
3544 scr_dump (fd); 3946 scr_dump (fd);
3545 close (fd); 3947 close (fd);
3546 } 3948 }
3547 } 3949 }
3950 break;
3951#endif
3952 case XTerm_font:
3953 op = URxvt_font;
3954 case URxvt_font:
3955#if ENABLE_STYLES
3956 case URxvt_boldFont:
3957 case URxvt_italicFont:
3958 case URxvt_boldItalicFont:
3959#endif
3960 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp);
3965 else
3966 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)];
3968
3969 res = strdup (str);
3970 allocated.push_back ((void *)res);
3971 set_fonts ();
3972 }
3973 break;
3974
3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
3984 case URxvt_locale:
3985 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3987 else
3988 {
3989 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale ();
3992 }
3993 break;
3994
3995 case URxvt_view_up:
3996 case URxvt_view_down:
3997 {
3998 int lines = atoi (str);
3999
4000 if (lines)
4001 scr_page (op == URxvt_view_up ? UP : DN, lines);
4002 else
4003 scr_erase_savelines ();
4004 }
4005
4006 break;
4007#endif
4008
4009#if ENABLE_PERL
4010 case URxvt_perl:
4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4012 ; // no responses yet
3548 break; 4013 break;
3549#endif 4014#endif
3550 } 4015 }
3551} 4016}
3552/*----------------------------------------------------------------------*/ 4017/*----------------------------------------------------------------------*/
… …
3566{ 4031{
3567 int state; 4032 int state;
3568 4033
3569 if (mode == 's') 4034 if (mode == 's')
3570 { 4035 {
3571 SavedModes |= (PrivateModes & bit); 4036 SavedModes |= (priv_modes & bit);
3572 return -1; 4037 return -1;
3573 } 4038 }
3574 else 4039 else
3575 { 4040 {
3576 if (mode == 'r') 4041 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 4043 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4044 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 4045 PrivMode (state, bit);
3581 } 4046 }
3582 4047
3583 return state; 4048 return state;
3584} 4049}
3585 4050
3586/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
3587void 4052void
3588rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3589{ 4054{
3590 unsigned int i, j; 4055 unsigned int i, j;
3591 int state; 4056 int state;
3592 4057
3593 static const struct 4058 static const struct
… …
3602 { 3, PrivMode_132 }, 4067 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 4068 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 4069 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 4070 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 4071 { 7, PrivMode_Autowrap },
4072 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 4073 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 4074 // 18, 19 printing-related
3609 { menuBar_esc, PrivMode_menuBar }, 4075 { 25, PrivMode_VisibleCursor },
3610#endif
3611#ifdef scrollBar_esc 4076#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 4077 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 4078#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 4079 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 4080 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 4081 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 4082 // 45 margin bell NYI
3621 // 46 start logging 4083 // 46 start logging
… …
3661 } 4123 }
3662 4124
3663 /* extra handling for values with state unkept */ 4125 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4126 switch (arg[i])
3665 { 4127 {
4128#if ENABLE_STYLES
4129 case 1021:
4130 set_option (Opt_intensityStyles, mode);
4131
4132 scr_touch (true);
4133 break;
4134#endif
3666 case 1048: /* alternative cursor save */ 4135 case 1048: /* alternative cursor save */
4136 case 1049:
3667 if (Options & Opt_secondaryScreen) 4137 if (OPTION (Opt_secondaryScreen))
3668 if (mode == 0) 4138 if (mode == 0)
3669 scr_cursor (RESTORE); 4139 scr_cursor (RESTORE);
3670 else if (mode == 1) 4140 else if (mode == 1)
3671 scr_cursor (SAVE); 4141 scr_cursor (SAVE);
3672 break; 4142 break;
… …
3683 * within VT52 mode 4153 * within VT52 mode
3684 */ 4154 */
3685 PrivMode (1, PrivMode_vt52); 4155 PrivMode (1, PrivMode_vt52);
3686 break; 4156 break;
3687 case 3: /* 80/132 */ 4157 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4158 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4159 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4160 break;
3691 case 4: /* smooth scrolling */ 4161 case 4: /* smooth scrolling */
3692 if (state) 4162 set_option (Opt_jumpScroll, !state);
3693 Options &= ~Opt_jumpScroll;
3694 else
3695 Options |= Opt_jumpScroll;
3696 break; 4163 break;
3697 case 5: /* reverse video */ 4164 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4165 scr_rvideo_mode (state);
3699 break; 4166 break;
3700 case 6: /* relative/absolute origins */ 4167 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4171 scr_autowrap (state);
3705 break; 4172 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4173 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4174 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4175 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4176 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4177 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 4178#ifdef scrollBar_esc
3719 case scrollBar_esc: 4179 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 4180 if (scrollbar_mapping (state))
3721 { 4181 {
3722 resize_all_windows (0, 0, 0); 4182 resize_all_windows (0, 0, 0);
… …
3734 break; 4194 break;
3735 /* case 66: - application key pad */ 4195 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4196 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4197 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4198 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4199 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4200 break;
3741#if 0 4201#if 0
3742 case 1001: 4202 case 1001:
3743 break; /* X11 mouse highlighting */ 4203 break; /* X11 mouse highlighting */
3744#endif 4204#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4205 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state)
3747 Options &= ~Opt_scrollTtyOutput;
3748 else
3749 Options |= Opt_scrollTtyOutput; 4206 set_option (Opt_scrollTtyOutput, !state);
3750 break; 4207 break;
3751 case 1011: /* scroll to bottom on key press */ 4208 case 1011: /* scroll to bottom on key press */
3752 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4209 set_option (Opt_scrollTtyKeypress, state);
3754 else
3755 Options &= ~Opt_scrollTtyKeypress;
3756 break; 4210 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4211 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4212 if (OPTION (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 4213 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4214 scr_erase_screen (2);
3761 scr_change_screen (state); 4215 scr_change_screen (state);
3762 break; 4216 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4217 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4218 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4219 if (OPTION (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 4220 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4221 scr_erase_screen (2);
3768 break; 4222 break;
3769 default: 4223 default:
3770 break; 4224 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4250 rendset = 0, rendstyle = ~RS_None;
3797 break; 4251 break;
3798 case 1: 4252 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4253 rendset = 1, rendstyle = RS_Bold;
3800 break; 4254 break;
3801 //case 2: // faint or second colour 4255 //case 2: // low intensity
4256 case 3:
4257 rendset = 1, rendstyle = RS_Italic;
4258 break;
3802 case 4: 4259 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4260 rendset = 1, rendstyle = RS_Uline;
3804 break; 4261 break;
3805 case 5: // slowly blinking 4262 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4263 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4275 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4276 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4277 //...
3821 //case 19: // ninth alt font 4278 //case 19: // ninth alt font
3822 //case 20: // gothic 4279 //case 20: // gothic
3823 case 21: // disable bold, faint 4280 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4281 rendset = 0, rendstyle = RS_Bold;
3825 break; 4282 break;
3826 case 22: 4283 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4284 rendset = 0, rendstyle = RS_Bold;
3828 break; 4285 break;
3829 //case 23: disable italic 4286 case 23: // disable italic
4287 rendset = 0, rendstyle = RS_Italic;
4288 break;
3830 case 24: 4289 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4290 rendset = 0, rendstyle = RS_Uline;
3832 break; 4291 break;
3833 case 25: 4292 case 25:
4293 rendset = 0, rendstyle = RS_Blink;
4294 break;
4295 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4296 rendset = 0, rendstyle = RS_Blink;
3835 break; 4297 break;
3836 case 27: 4298 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4299 rendset = 0, rendstyle = RS_RVid;
3838 break; 4300 break;
… …
3856 case 35: 4318 case 35:
3857 case 36: 4319 case 36:
3858 case 37: 4320 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4321 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4322 break;
3861#ifdef TTY_256COLOR 4323 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4324 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4325 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4326 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4327 i += 2;
3867 } 4328 }
3868 break; 4329 break;
3869#endif
3870 case 39: /* default fg */ 4330 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4331 scr_color (Color_fg, Color_fg);
3872 break; 4332 break;
3873 4333
3874 case 40: 4334 case 40:
… …
3879 case 45: 4339 case 45:
3880 case 46: 4340 case 46:
3881 case 47: 4341 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4342 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4343 break;
3884#ifdef TTY_256COLOR 4344 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4345 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4346 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4347 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4348 i += 2;
3890 } 4349 }
3891 break; 4350 break;
3892#endif
3893 case 49: /* default bg */ 4351 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
3895 break; 4353 break;
3896 4354
3897#ifndef NO_BRIGHTCOLOR 4355 //case 50: // not variable spacing
4356
4357#if !ENABLE_MINIMAL
3898 case 90: 4358 case 90:
3899 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
3900 case 92: 4360 case 92:
3901 case 93: 4361 case 93:
3902 case 94: 4362 case 94:
3903 case 95: 4363 case 95:
3904 case 96: 4364 case 96:
3905 case 97: 4365 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4367 break;
3909 case 100: 4368 case 100:
3910 case 101: /* set bright bg color */ 4369 case 101: /* set bright bg color */
3911 case 102: 4370 case 102:
3912 case 103: 4371 case 103:
3913 case 104: 4372 case 104:
3914 case 105: 4373 case 105:
3915 case 106: 4374 case 106:
3916 case 107: 4375 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4376 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4377 break;
3920#endif 4378#endif
3921
3922 } 4379 }
3923 } 4380 }
3924} 4381}
3925/*}}} */ 4382/*}}} */
3926 4383
… …
3930{ 4387{
3931 unicode_t ch, cmd = cmd_getc (); 4388 unicode_t ch, cmd = cmd_getc ();
3932 4389
3933 if (cmd == 'Q') 4390 if (cmd == 'Q')
3934 { /* query graphics */ 4391 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4392 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4393 return;
3937 } 4394 }
3938 /* swallow other graphics sequences until terminating ':' */ 4395 /* swallow other graphics sequences until terminating ':' */
3939 do 4396 do
3940 ch = cmd_getc (); 4397 ch = cmd_getc ();
… …
3950 */ 4407 */
3951void 4408void
3952rxvt_term::tt_printf (const char *fmt,...) 4409rxvt_term::tt_printf (const char *fmt,...)
3953{ 4410{
3954 va_list arg_ptr; 4411 va_list arg_ptr;
3955 unsigned char buf[256]; 4412 char buf[256];
3956 4413
3957 va_start (arg_ptr, fmt); 4414 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4415 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4416 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4417 tt_write (buf, strlen (buf));
3961} 4418}
3962 4419
3963/* ---------------------------------------------------------------------- */ 4420/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4421/* 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. 4422 * or generated by us in response to a query ESC sequence.
3966 */ 4423 */
4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4425
3967void 4426void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
3969{ 4428{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4430 return;
3971 4431
3972 if (len) 4432 if (pty->pty < 0)
4433 return;
4434
4435 if (v_buflen == 0)
4436 {
4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4438
4439 if ((unsigned int)written == len)
4440 return;
4441
4442 data += written;
4443 len -= written;
3973 { 4444 }
4445
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4447
4448 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len;
4450
4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4452}
4453
4454void rxvt_term::pty_write ()
4455{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4457
4458 if (written > 0)
4459 {
4460 v_buflen -= written;
4461
3974 if (v_buflen == 0) 4462 if (v_buflen == 0)
3975 { 4463 {
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); 4464 free (v_buffer);
4003 v_buffer = 0; 4465 v_buffer = 0;
4004 v_buflen = 0; 4466 v_buflen = 0;
4005 4467
4006 pty_ev.set (EVENT_READ); 4468 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; 4469 return;
4019 } 4470 }
4471
4472 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4473 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ);
4021} 4476}
4022 4477
4023/*----------------------- end-of-file (C source) -----------------------*/ 4478/*----------------------- end-of-file (C source) -----------------------*/
4024 4479

Diff Legend

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