ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.328 by ayin, Mon Jun 11 17:40:15 2007 UTC

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

Diff Legend

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