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

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

Diff Legend

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