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

Diff Legend

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