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.320 by root, Mon Apr 30 15:07:09 2007 UTC

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

Diff Legend

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