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

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

Diff Legend

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