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.352 by ayin, Sun Sep 9 10:35:00 2007 UTC

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

Diff Legend

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