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

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

Diff Legend

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