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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.373 by root, Tue Dec 11 15:42:51 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
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61 67
62#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
63 69
64#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
89 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
91 97
92 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
113 XK_Escape, 0x238b, 118 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 119 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 120 XK_Print, 0x2399,
116 121
117 XK_space, 0x2423, 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,
118 XK_KP_Space, 0x2422, 130 XK_KP_Space, 0x2422,
131#endif
119 0, 132 0,
120}; 133};
121 134
122void 135void
123rxvt_term::iso14755_54 (int x, int y) 136rxvt_term::iso14755_54 (int x, int y)
124{ 137{
125 x = Pixel2Col (x); 138 x = Pixel2Col (x);
126 y = Pixel2Row (y); 139 y = Pixel2Row (y);
127 140
128 if (x < 0 || x >= TermWin.ncol 141 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 142 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 143 return;
131 144
132 for (;;) 145 for (;;)
133 { 146 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
135 150
136 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
137 { 152 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 153 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
140 break; 155 break;
141 } 156 }
142 157
143 x--; 158 x--;
144 } 159 }
145
146} 160}
147#endif
148 161
149#if ENABLE_OVERLAY
150void 162void
151rxvt_term::iso14755_51 (wchar_t ch) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 167 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 168 int len;
155 169
170 fname = rxvt_utf8towcs (f->name);
171
156#if ENABLE_COMBINING 172# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
158 { 174 {
159 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
162 } 178 }
163 else 179 else
164#endif 180# endif
165 { 181 {
182 ch2 = ch;
183
166 alloc = 0; 184 alloc = 0;
167 chr = &ch; 185 chr = &ch2;
168 len = 1; 186 len = 1;
169 } 187 }
170 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
171 scr_overlay_new (0, -1, 8 + 5, len); 212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 215
173 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
174 { 217 {
175 char buf[9]; 218 char buf[9];
176 219
177 ch = *chr++; 220 ch = *chr++;
178 221
179 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
182#if !UNICODE3 225# if !UNICODE3
183 if (ch >= 0x10000) 226 if (ch >= 0x10000)
184 ch = 0xfffd; 227 ch = 0xfffd;
185#endif 228# endif
186 scr_overlay_set (11, y, ch); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
187 scr_overlay_set (12, y, NOCHAR); 232 scr_overlay_set (12, y, NOCHAR, r);
188 } 233 }
189 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
190#if ENABLE_COMBINING 245# if ENABLE_COMBINING
191 if (alloc) 246 if (alloc)
192 delete [] alloc; 247 delete [] alloc;
193#endif 248# endif
194} 249}
195#endif 250#endif
196 251
197void 252void
198rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
215 mb[0] = ch[0]; 270 mb[0] = ch[0];
216 len = 1; 271 len = 1;
217 } 272 }
218 273
219 if (len > 0) 274 if (len > 0)
220 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
221 else 276 else
222 scr_bell (); 277 scr_bell ();
223 } 278 }
224 279
225 iso14755buf = 0; 280 iso14755buf = 0;
… …
242 297
243 return -1; 298 return -1;
244} 299}
245#endif 300#endif
246 301
247/*{{{ Convert the keypress event into a string */
248void 302void
249rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
250{ 304{
251 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
252 unsigned int newlen; 306 unsigned int newlen;
253 KeySym keysym; 307 KeySym keysym;
254#ifdef DEBUG_CMD
255 static int debug_key = 1; /* accessible by a debugger only */
256#endif
257 int valid_keysym; 308 int valid_keysym;
258 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
259 315
260 /* 316 /*
261 * 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
262 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
263 * 319 *
264 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
265 */ 321 */
266 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
269 325
270 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
271 { 327 {
272 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
281 Status status_return; 337 Status status_return;
282 338
283#if 0 339#if 0
284#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
285 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
286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
287 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
288 else 344 else
289#endif 345#endif
290#endif 346#endif
291 { 347 {
… …
293 349
294 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
298 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
301 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 360 SET_LOCALE (locale);
303 361
304 if (status_return == XLookupChars 362 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
326 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
327 } 385 }
328 else 386 else
329#endif 387#endif
330 { 388 {
331 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
332 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
333 } 391 }
334 392
335 if (valid_keysym) 393 if (valid_keysym)
336 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
337 if (TermWin.saveLines) 400 if (saveLines)
338 { 401 {
339#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 403 if (!ctrl && !meta)
341#else 404#else
342 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
343#endif 406#endif
344 { 407 {
345 int lnsppg; 408 int lnsppg;
346 409
347#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 412#else
350 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
351#endif 414#endif
352 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
353 { 416 {
354 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
355 return; 418 return;
… …
383 scr_move_to (0, 1); 446 scr_move_to (0, 1);
384 return; 447 return;
385 } 448 }
386 else if (keysym == XK_End) 449 else if (keysym == XK_End)
387 { 450 {
388 scr_move_to (1, 0); 451 scr_move_to (1, 1);
389 return; 452 return;
390 } 453 }
391 } 454 }
392#endif 455#endif
393 } 456 }
… …
404 { 467 {
405 switch (keysym) 468 switch (keysym)
406 { 469 {
407 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
410 return; 473 return;
411#if TODO // TODO 474#if TODO
412 /* rxvt extras */ 475 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 477 change_font (FONT_UP);
415 return; 478 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
433 { 496 {
434 commit_iso14755 (); 497 commit_iso14755 ();
435 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
436# if ISO_14755 499# if ISO_14755
437 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
438# endif 509# endif
439 return; 510 return;
440 } 511 }
441 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
442 { 513 {
… …
447# endif 518# endif
448 return; 519 return;
449 } 520 }
450 else 521 else
451 { 522 {
452# if ENABLE_OVERLAY 523# if ISO_14755
453 scr_overlay_off (); 524 scr_overlay_off ();
454# endif 525# endif
455 iso14755buf = 0; 526 iso14755buf = 0;
456 } 527 }
457 } 528 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
461 { 532 {
462 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY 534# if ISO_14755
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif 537# endif
467 } 538 }
468#endif 539#endif
469 540
470#ifdef PRINTPIPE 541#ifdef PRINTPIPE
471 if (keysym == XK_Print) 542 if (keysym == XK_Print)
472 { 543 {
473 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
474 return; 545 return;
475 } 546 }
476#endif 547#endif
477 548
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 550 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 { 551 {
483 unsigned int l; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
484 const unsigned char *kbuf0; 553 newlen = 1;
485 554#ifdef XK_KP_Home
486 kbuf0 = (Keysym_map[keysym & 0xFF]); 555 static const KeySym keypadtrans[] = {
487 l = (unsigned int)*kbuf0++; 556 XK_KP_7, // XK_KP_Home
488 557 XK_KP_4, // XK_KP_Left
489 /* escape prefix */ 558 XK_KP_8, // XK_KP_Up
490 if (meta 559 XK_KP_6, // XK_KP_Right
491# ifdef META8_OPTION 560 XK_KP_2, // XK_KP_Down
492 && meta_char == C0_ESC 561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
493# endif 567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
494 ) 570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
495 { 573 {
496 const unsigned char ch = C0_ESC; 574 unsigned int index = keysym - XK_KP_Home;
497 tt_write (&ch, 1); 575 keysym = kp ? keypadtrans[index] : XK_Home + index;
498 } 576 }
499 577 else if (keysym == XK_KP_Insert)
500 tt_write (kbuf0, l); 578 keysym = kp ? XK_KP_0 : XK_Insert;
501 return; 579#ifndef NO_DELETE_KEY
502 } 580 else if (keysym == XK_KP_Delete)
503 else 581 keysym = kp ? XK_KP_Decimal : XK_Delete;
504#endif 582#endif
505 { 583#endif
506 newlen = 1;
507 switch (keysym) 584 switch (keysym)
508 { 585 {
509#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
510 case XK_BackSpace: 587 case XK_BackSpace:
511 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
514 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
515 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
516 } 593 }
517 else 594 else
518 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
519 break; 596 break;
520#endif 597#endif
521#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
522 case XK_Delete: 599 case XK_Delete:
523 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
524 break; 601 break;
525#endif 602#endif
526 case XK_Tab: 603 case XK_Tab:
527 if (shft) 604 if (shft)
528 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
538#endif 615#endif
539 newlen = 0; 616 newlen = 0;
540 } 617 }
541 break; 618 break;
542 619
543#ifdef XK_KP_Left
544 case XK_KP_Up: /* \033Ox or standard */
545 case XK_KP_Down: /* \033Or or standard */
546 case XK_KP_Right: /* \033Ov or standard */
547 case XK_KP_Left: /* \033Ot or standard */
548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
549 {
550 strcpy (kbuf, "\033OZ");
551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
552 break;
553 }
554 else
555 /* translate to std. cursor key */
556 keysym = XK_Left + (keysym - XK_KP_Left);
557 /* FALLTHROUGH */
558#endif
559 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
560 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
561 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
562 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
563 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
573 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
574 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
575 break; 636 break;
576 637
577#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
578# ifdef XK_KP_Prior
579 case XK_KP_Prior:
580 /* allow shift to override */
581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
582 {
583 strcpy (kbuf, "\033Oy");
584 break;
585 }
586 /* FALLTHROUGH */
587# endif
588 case XK_Prior: 639 case XK_Prior:
589 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
590 break; 641 break;
591# ifdef XK_KP_Next
592 case XK_KP_Next:
593 /* allow shift to override */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
595 {
596 strcpy (kbuf, "\033Os");
597 break;
598 }
599 /* FALLTHROUGH */
600# endif
601 case XK_Next: 642 case XK_Next:
602 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
603 break; 644 break;
604#endif 645#endif
605 case XK_KP_Enter: 646 case XK_KP_Enter:
606 /* allow shift to override */ 647 /* allow shift to override */
607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
608 { 649 {
609 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
610 break; 651 break;
611 } 652 }
612 653
… …
624 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
625 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
626 } 667 }
627 break; 668 break;
628 669
629#ifdef XK_KP_Begin
630 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou");
632 break;
633
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif
642 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
646 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
662 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
663 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
664 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
665 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
666 /* allow shift to override */ 694 /* allow shift to override */
667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
668 { 696 {
669 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
670 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
671 } 699 }
672 else 700 else
… …
677 break; 705 break;
678 706
679 case XK_Find: 707 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
681 break; 709 break;
710
682 case XK_Insert: 711 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
684 break; 713 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 715 case DXK_Remove:
… …
690 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
691 break; 720 break;
692 case XK_Select: 721 case XK_Select:
693 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
694 break; 723 break;
695#ifdef XK_KP_End
696 case XK_KP_End:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Oq");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_End: 724 case XK_End:
706 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
707 break; 726 break;
708#ifdef XK_KP_Home
709 case XK_KP_Home:
710 /* allow shift to override */
711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
712 {
713 strcpy (kbuf, "\033Ow");
714 break;
715 }
716 /* FALLTHROUGH */
717#endif
718 case XK_Home: 727 case XK_Home:
719 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
720 break; 729 break;
721 730
722#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
776#undef FKEY 785#undef FKEY
777 default: 786 default:
778 newlen = 0; 787 newlen = 0;
779 break; 788 break;
780 } 789 }
790
781 if (newlen) 791 if (newlen)
782 len = strlen (kbuf); 792 len = strlen (kbuf);
783 } 793 }
784 794
785 /* 795 /*
… …
794 else if (ctrl && keysym == XK_minus) 804 else if (ctrl && keysym == XK_minus)
795 { 805 {
796 len = 1; 806 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
799 else 814 else
800 { 815 {
801#ifdef META8_OPTION 816#ifdef META8_OPTION
802 /* set 8-bit on */ 817 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
804 { 819 {
805 unsigned char *ch; 820 char *ch;
806 821
807 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
808 *ch |= 0x80; 823 *ch |= 0x80;
809 824
810 meta = 0; 825 meta = 0;
… …
812#endif 827#endif
813 /* nil */ ; 828 /* nil */ ;
814 } 829 }
815 } 830 }
816 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
817 if (len <= 0) 835 if (len <= 0)
818 return; /* not mapped */ 836 return; /* not mapped */
819 837
820 if (options & Opt_scrollTtyKeypress) 838 if (option (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 839 if (view_start)
822 { 840 {
823 TermWin.view_start = 0; 841 view_start = 0;
824 want_refresh = 1; 842 want_refresh = 1;
825 } 843 }
826 844
827 /* 845 /*
828 * these modifications only affect the static keybuffer 846 * these modifications only affect the static keybuffer
… …
843#ifdef META8_OPTION 861#ifdef META8_OPTION
844 && meta_char == C0_ESC 862 && meta_char == C0_ESC
845#endif 863#endif
846 ) 864 )
847 { 865 {
848 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
849 tt_write (&ch, 1); 867 tt_write (&ch, 1);
850 } 868 }
851 869
852#if defined(DEBUG_CMD)
853 /* Display keyboard buffer contents */
854 unsigned char *p;
855 int i;
856
857 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
858 for (i = 0, p = kbuf; i < len; i++, p++)
859 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
860 fprintf (stderr, "'\n");
861#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
863} 871}
864/*}}} */
865 872
866#if (MENUBAR_MAX) 873void
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 874rxvt_term::key_release (XKeyEvent &ev)
868/* attempt to `write' count to the input buffer */ 875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
950#if defined (KEYSYM_RESOURCE)
869unsigned int 951unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
871{ 953{
872 unsigned int n, s; 954 unsigned int n, s;
873 955
874 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
894 976
895 cmd_parse (); 977 cmd_parse ();
896 978
897 return 0; 979 return 0;
898} 980}
899#endif /* MENUBAR_MAX */ 981#endif
900 982
901void 983void
902rxvt_term::flush () 984rxvt_term::flush ()
903{ 985{
904#ifdef TRANSPARENT 986 flush_ev.stop ();
905 if (want_full_refresh) 987
988#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ())
906 { 990 {
907 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
908 scr_clear ();
909 scr_touch (false); 992 scr_touch (false);
910 } 993 }
911#endif 994#endif
912 995
913 if (want_refresh) 996 if (want_refresh)
914 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
915 scr_refresh (refresh_type); 1036 scr_refresh ();
916 scrollbar_show (1); 1037 scrollbar_show (1);
917#ifdef USE_XIM 1038#ifdef USE_XIM
918 IMSendSpot (); 1039 IMSendSpot ();
919#endif 1040#endif
920 } 1041 }
921 1042
922 display->flush (); 1043 display->flush ();
923
924 flush_ev.stop ();
925} 1044}
926 1045
927void 1046void
928rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
929{ 1048{
930 SET_R (this); 1049 make_current ();
931 SET_LOCALE (locale);
932 1050
933 display->flush (); 1051 display->flush ();
934 1052
935 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !ev_is_active (&flush_ev))
936 flush_ev.start (NOW + 0.01); 1054 flush_ev.again ();
937} 1055}
938 1056
939void 1057void
940rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
941{ 1059{
942 SET_R (this); 1060 make_current ();
943 SET_LOCALE (locale);
944 1061
945 refresh_limit = 1;
946 refresh_count = 0; 1062 refresh_count = 0;
947 flush (); 1063 flush ();
948} 1064}
949 1065
950#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
951void 1067void
952rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
953{ 1069{
954 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
955 want_refresh = 1; 1071 want_refresh = 1;
956
957 w.start (w.at + BLINK_INTERVAL);
958} 1072}
959#endif 1073#endif
960 1074
961#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
962void 1076void
963rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
964{ 1078{
965 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
966 { 1080 {
967 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
968 want_refresh = 1; 1082 want_refresh = 1;
969 w.start (w.at + TEXT_BLINK_INTERVAL);
970 } 1083 }
971} 1084}
972#endif 1085#endif
973 1086
974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
975void 1088void
976rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
977{ 1090{
978 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
979 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
980 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1; 1093 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
984 } 1095 w.stop ();
985} 1096}
986#endif 1097#endif
987 1098
988#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
989void 1100void
990rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
991{ 1102{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 { 1104 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1; 1106 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
998 } 1107 }
1108 else
1109 w.stop ();
999} 1110}
1000#endif 1111#endif
1001 1112
1002#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1003void 1114void
1004rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1005{ 1116{
1006 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1120 {
1010 refresh_type |= SMOOTH_REFRESH; 1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1011 want_refresh = 1; 1124 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 }
1126 else
1127 w.stop ();
1128}
1129#endif
1130
1131#if LINUX_YIELD_HACK
1132static struct event_handler
1133{
1134 ev::prepare yield_ev;
1135
1136 void yield_cb (ev::prepare &w, int revents)
1137 {
1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
1013 } 1147 }
1014} 1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
1015#endif 1154#endif
1016 1155
1017bool 1156bool
1018rxvt_term::pty_fill () 1157rxvt_term::pty_fill ()
1019{ 1158{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1160
1022 if (CBUFSIZ == n) 1161 if (CBUFSIZ == n)
1023 { 1162 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1164 n = 0;
1026 } 1165 }
1027 1166
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
1031 1170
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1033 1172
1034 if (n > 0) 1173 if (r > 0)
1035 { 1174 {
1036 cmdbuf_endp += n; 1175 cmdbuf_endp += r;
1037 return true; 1176 return true;
1038 } 1177 }
1039 else if (n < 0 && errno != EAGAIN) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1179 {
1180#if LINUX_YIELD_HACK
1181 if (display->is_local)
1182 event_handler.yield_ev.start ();
1183#endif
1184 }
1185 else
1186 {
1187 pty_ev.stop ();
1188
1189 if (!option (Opt_hold))
1040 destroy (); 1190 destroy ();
1041 1191 }
1192
1042 return false; 1193 return false;
1043} 1194}
1044 1195
1045void 1196void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1047{ 1198{
1048 SET_R (this); 1199 make_current ();
1049 SET_LOCALE (locale);
1050 1200
1051 if (revents & EVENT_WRITE) 1201 if (revents & ev::READ)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1203 while (pty_fill ())
1056 if (cmd_parse ()) 1204 if (cmd_parse ())
1057 break; 1205 break;
1206
1207 if (revents & ev::WRITE)
1208 pty_write ();
1058} 1209}
1059 1210
1060void 1211void
1061rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1062{ 1213{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1064 recolour_cursor (); 1215 recolour_cursor ();
1065 1216
1066#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1218 hidden_pointer = 0;
1068 1219
1069 if (options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1071#endif 1222#endif
1072} 1223}
1073 1224
1074#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1075void 1226void
1076rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1077{ 1228{
1078 if (! (options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1079 return; 1230 return;
1080 1231
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1082 XFlush (display->display); 1233 XFlush (dpy);
1083 1234
1084 hidden_pointer = 1; 1235 hidden_pointer = 1;
1085} 1236}
1086 1237
1087void 1238void
1088rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1089{ 1240{
1090 SET_R (this); 1241 make_current ();
1091 SET_LOCALE (locale);
1092 1242
1093 pointer_blank (); 1243 pointer_blank ();
1094} 1244}
1095#endif 1245#endif
1096 1246
1097void 1247void
1098rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1099{ 1249{
1100 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1101 int x, y; 1251 int x, y;
1252 int code = 32;
1102 1253
1103 x = ev.x; 1254 x = Pixel2Col (ev.x);
1104 y = ev.y; 1255 y = Pixel2Row (ev.y);
1105 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1106 1264
1107 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1108 button_number = 3; 1266 button_number = 3;
1109 else 1267 else
1110 { 1268 {
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1295 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1296 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1297#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1298 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1299#endif
1142
1143 } 1300 }
1144 1301
1145#ifdef DEBUG_MOUSEREPORT 1302#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1303 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1304 if (key_state & 16)
1148 fputc ('C', stderr); 1305 fputc ('C', stderr);
1149 if (key_state & 4) 1306 if (key_state & 4)
1150 fputc ('S', stderr); 1307 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1311 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1313 button_number,
1157 x + 1, 1314 x + 1,
1158 y + 1); 1315 y + 1);
1159#else 1316#endif
1317
1160 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1162 (32 + x + 1), 1320 (32 + x + 1),
1163 (32 + y + 1)); 1321 (32 + y + 1));
1164#endif
1165} 1322}
1166
1167#ifdef USING_W11LIB
1168void
1169rxvt_W11_process_x_event (XEvent *ev)
1170{
1171 rxvt_t *r = rxvt_get_r ();
1172
1173 x_cb (*ev);
1174}
1175#endif
1176 1323
1177/*{{{ process an X event */ 1324/*{{{ process an X event */
1178void 1325void
1179rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1180{ 1327{
1181 SET_R (this); 1328 make_current ();
1182 SET_LOCALE (locale);
1183 1329
1184#if defined(CURSOR_BLINK) 1330 dLocal (Display *, dpy);
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1186 {
1187 if (hidden_cursor)
1188 {
1189 hidden_cursor = 0;
1190 want_refresh = 1;
1191 }
1192 1331
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1332 if (ev.xany.window == vt
1194 } 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1195#endif 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1196
1197#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1199 {
1200 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease)
1203 if (hidden_pointer)
1204 pointer_unblank ();
1205
1206 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank ();
1208 }
1209#endif
1210
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return; 1335 return;
1214#endif
1215 1336
1337 // for XQueryPointer
1216 Window unused_root, unused_child; 1338 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1339 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1340 unsigned int unused_mask;
1219 1341
1220 switch (ev.type) 1342 switch (ev.type)
1221 { 1343 {
1222 case KeyPress: 1344 case KeyPress:
1223#if ISO_14755 1345 key_press (ev.xkey);
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
1226 lookup_key (ev.xkey);
1227
1228 break; 1346 break;
1229 1347
1230 case KeyRelease: 1348 case KeyRelease:
1231 { 1349 key_release (ev.xkey);
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
1291
1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1293 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R)
1296 mouse_slip_wheel_speed = 0;
1297#endif
1298 break; 1350 break;
1299 }
1300 1351
1301 case ButtonPress: 1352 case ButtonPress:
1302 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1303 break; 1354 break;
1304 1355
… …
1306 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1307 break; 1358 break;
1308 1359
1309 case ClientMessage: 1360 case ClientMessage:
1310 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1312 destroy ();
1313#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink))
1319 { 1363 {
1320 /* Get Dnd data */ 1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1321 Atom ActualType; 1365 {
1322 int ActualFormat; 1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1323 unsigned char *data; 1367 {
1324 unsigned long Size, RemainingBytes; 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1325 1369 {
1326 XGetWindowProperty (display->display, display->root, 1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1327 xa[XA_DNDSELECTION], 1371 destroy ();
1328 0L, 1000000L, 1372 }
1329 False, AnyPropertyType, 1373#if ENABLE_EWMH
1330 &ActualType, &ActualFormat, 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1331 &Size, &RemainingBytes, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1332 &data); 1377 &ev);
1333 XChangeProperty (display->display, display->root, 1378#endif
1334 XA_CUT_BUFFER0, XA_STRING, 1379 }
1335 8, PropModeReplace, 1380 }
1336 data, strlen (data)); 1381#if ENABLE_XEMBED
1337 XFree (data); 1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 {
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1389#endif
1340 } 1390 }
1341#endif /* OFFIX_DND */
1342 break;
1343
1344 case MappingNotify:
1345 XRefreshKeyboardMapping (&ev.xmapping);
1346 break; 1391 break;
1347 1392
1348 /* 1393 /*
1349 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1350 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1369 break; 1414 break;
1370 } 1415 }
1371 break; 1416 break;
1372 1417
1373 case FocusIn: 1418 case FocusIn:
1374 if (!TermWin.focus) 1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1422 focus_in ();
1423 break;
1424
1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1429 focus_out ();
1430 break;
1431
1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0])
1375 { 1437 {
1376 TermWin.focus = 1; 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1439 ;
1378#ifdef USE_XIM 1440
1379 if (Input_Context != NULL) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1442 {
1381 IMSetStatusPosition (); 1443 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1445 }
1384#endif 1446 else
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 { 1447 {
1392 pix_colors = pix_colors_focused; 1448#ifdef HAVE_BG_PIXMAP
1393 set_colorfgbg (); 1449 if (bgPixmap.window_position_sensitive ())
1394 scr_clear (); 1450 update_background ();
1395 scr_touch (true); 1451#endif
1396 } 1452 }
1397#endif 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1398
1399 } 1454 }
1400 break; 1455 break;
1401 1456
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent)
1447 {
1448 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif
1453 }
1454 break;
1455
1456 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1462
1461 break; 1463 break;
1462 1464
1463 case SelectionClear: 1465 case SelectionClear:
1464 selection_clear (); 1466 selection_clear ();
1465 break; 1467 break;
1466 1468
1467 case SelectionNotify: 1469 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1472 break;
1472 1473
1473 case SelectionRequest: 1474 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1475 break; 1476 break;
1476 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.again ();
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1477 case UnmapNotify: 1486 case UnmapNotify:
1478 TermWin.mapped = 0; 1487 mapped = 0;
1479#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1481#endif 1490#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1482 break; 1492 break;
1483
1484 case MapNotify:
1485 TermWin.mapped = 1;
1486#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif
1489 break;
1490
1491#ifdef TRANSPARENT
1492 case ReparentNotify:
1493 rootwin_cb (ev);
1494 break;
1495#endif /* TRANSPARENT */
1496 1493
1497 case GraphicsExpose: 1494 case GraphicsExpose:
1498 case Expose: 1495 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1496 if (ev.xany.window == vt)
1500 { 1497 {
1501 do 1498 do
1499 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1505 1504
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1506
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1511 1511 }
1512 scr_refresh (refresh_type); 1512 want_refresh = 1;
1513 } 1513 }
1514 else 1514 else
1515 { 1515 {
1516 XEvent unused_event; 1516 XEvent unused_event;
1517 1517
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1519 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1521 ;
1522 1522
1523 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1524 { 1524 {
1525 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1526 scrollbar_show (0); 1526 scrollbar_show (0);
1527 } 1527 }
1528#ifdef MENUBAR
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose ();
1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1537 } 1528 }
1538 break; 1529 break;
1539 1530
1540 case MotionNotify: 1531 case MotionNotify:
1541#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1542 if (hidden_pointer) 1533 if (hidden_pointer)
1543 pointer_unblank (); 1534 pointer_unblank ();
1544#endif 1535#endif
1545#if MENUBAR 1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1546 if (isMenuBarWindow (ev.xany.window)) 1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1540 break;
1541
1542 if (ev.xany.window == vt)
1547 { 1543 {
1548 menubar_control (ev.xbutton); 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1549 break; 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1550 } 1546 ; // nop
1551#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1553 break;
1554
1555 if (ev.xany.window == TermWin.vt)
1556 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1548 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1560 ; 1550 ;
1561 1551
1562 XQueryPointer (display->display, TermWin.vt, 1552 XQueryPointer (dpy, vt,
1563 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1555 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1556 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1558 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1559 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1560 {
1571#endif 1561#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1566 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1567 break;
1578 } 1568 }
1579#endif 1569#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1570 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1571 ev.xbutton.state & Button3Mask ? 2 : 0);
1572
1582#ifdef SELECTION_SCROLLING 1573#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1574 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1575 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1576 {
1586 int dist; 1577 int dist;
1587 1578
1588 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1590 */ 1581 */
1591 if (!sel_scroll_ev.active) 1582 if (!ev_is_active (&sel_scroll_ev))
1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1593 1584
1594 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1595 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1596 */ 1587 */
1597 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1589 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1590 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1591
1601 /* calc number of lines to scroll */ 1592 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1593 if (ev.xbutton.y < int_bwidth)
1603 { 1594 {
1604 scroll_selection_dir = UP; 1595 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1596 dist = int_bwidth - ev.xbutton.y;
1606 } 1597 }
1607 else 1598 else
1608 { 1599 {
1609 scroll_selection_dir = DN; 1600 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1601 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1602 }
1612 1603
1613 scroll_selection_lines = Pixel2Height (dist) 1604 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1605 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1606 + 1;
1616 MIN_IT (scroll_selection_lines, 1607 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1608 SELECTION_SCROLL_MAX_LINES);
1618 } 1609 }
1619 else 1610 else
1620 { 1611 {
1621 /* we are within the text window, so we 1612 /* we are within the text window, so we
1622 * shouldn't be scrolling 1613 * shouldn't be scrolling
1623 */ 1614 */
1624 if (sel_scroll_ev.active) 1615 if (ev_is_active (&sel_scroll_ev))
1625 sel_scroll_ev.stop(); 1616 sel_scroll_ev.stop();
1626 } 1617 }
1627#endif 1618#endif
1628#ifdef MOUSE_THRESHOLD 1619#ifdef MOUSE_THRESHOLD
1629 } 1620 }
1630#endif 1621#endif
1631 } 1622 }
1632 } 1623 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1625 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) ; 1627 MotionNotify, &ev))
1628 ;
1629
1637 XQueryPointer (display->display, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1638 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1633 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1634 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1636 scrollbar_size ());
1644 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1637 want_refresh = 1;
1646 scrollbar_show (1); 1638 scrollbar_show (1);
1647 } 1639 }
1648 break; 1640 break;
1649 } 1641 }
1650}
1651 1642
1652#if TRANSPARENT 1643#if defined(CURSOR_BLINK)
1644 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1645 {
1646 if (hidden_cursor)
1647 {
1648 hidden_cursor = 0;
1649 want_refresh = 1;
1650 }
1651
1652 cursor_blink_ev.again ();
1653 }
1654#endif
1655
1656#if defined(POINTER_BLANK)
1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1658 {
1659 if (ev.type == MotionNotify
1660 || ev.type == ButtonPress
1661 || ev.type == ButtonRelease)
1662 if (hidden_pointer)
1663 pointer_unblank ();
1664
1665 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank ();
1667 }
1668#endif
1669}
1670
1671void
1672rxvt_term::focus_in ()
1673{
1674 if (!focus)
1675 {
1676 focus = 1;
1677 want_refresh = 1;
1678
1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681#if USE_XIM
1682 if (Input_Context != NULL)
1683 {
1684 IMSetPosition ();
1685 XSetICFocus (Input_Context);
1686 }
1687#endif
1688#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1691#endif
1692#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade])
1694 {
1695 pix_colors = pix_colors_focused;
1696 scr_recolour ();
1697 }
1698#endif
1699#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell))
1701 {
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif
1709 }
1710}
1711
1712void
1713rxvt_term::focus_out ()
1714{
1715 if (focus)
1716 {
1717 focus = 0;
1718 want_refresh = 1;
1719
1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1721
1722#if ENABLE_FRILLS || ISO_14755
1723 if (iso14755buf)
1724 {
1725 iso14755buf = 0;
1726# if ISO_14755
1727 scr_overlay_off ();
1728# endif
1729 }
1730#endif
1731#if USE_XIM
1732 if (Input_Context != NULL)
1733 XUnsetICFocus (Input_Context);
1734#endif
1735#if CURSOR_BLINK
1736 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.stop ();
1738
1739 hidden_cursor = 0;
1740#endif
1741#if OFF_FOCUS_FADING
1742 if (rs[Rs_fade])
1743 {
1744 pix_colors = pix_colors_unfocused;
1745 scr_recolour ();
1746 }
1747#endif
1748 }
1749}
1750
1751void
1752rxvt_term::update_fade_color (unsigned int idx)
1753{
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 rgba c;
1758 pix_colors [Color_fade].get (c);
1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1760 }
1761#endif
1762}
1763
1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1653void 1765void
1654rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1767{
1656 SET_R (this); 1768 make_current ();
1657 SET_LOCALE (locale);
1658 1769
1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1772 return;
1773
1774# if ENABLE_TRANSPARENCY
1659 switch (ev.type) 1775 switch (ev.type)
1660 { 1776 {
1661 case PropertyNotify: 1777 case PropertyNotify:
1662 /* 1778 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1665 */ 1781 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1670 return; 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1671 1784 {
1672 /* FALLTHROUGH */ 1785 bgPixmap.set_root_pixmap ();
1673 case ReparentNotify: 1786 update_background ();
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1787 }
1675 want_refresh = want_full_refresh = 1;
1676 break; 1788 break;
1677 } 1789 }
1790# endif
1678} 1791}
1679#endif 1792#endif
1680 1793
1681void 1794void
1682rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1683{ 1796{
1684 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1685 1798
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1687 if (!bypass_keystate) 1801 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1803
1690 /* 1804 /*
1691 * VT window processing of button press 1805 * VT window processing of button press
1692 */ 1806 */
1693 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1694 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1695#if ISO_14755 1812#if ISO_14755
1696 // 5.4 1813 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1815 {
1699 iso14755_54 (ev.x, ev.y); 1816 iso14755_54 (ev.x, ev.y);
1700 return; 1817 return;
1701 } 1818 }
1702#endif 1819#endif
1703 1820
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1821 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1822
1705 if (reportmode) 1823 if (reportmode)
1706 { 1824 {
1707 /* mouse report from vt window */ 1825 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1826 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1827 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1828#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1829 if (ev.button == MEvent.button && clickintime)
1712 { 1830 {
1713 /* same button, within alloted time */ 1831 /* same button, within alloted time */
1714 MEvent.clicks++; 1832 MEvent.clicks++;
1833
1715 if (MEvent.clicks > 1) 1834 if (MEvent.clicks > 1)
1716 { 1835 {
1717 /* only report double clicks */ 1836 /* only report double clicks */
1718 MEvent.clicks = 2; 1837 MEvent.clicks = 2;
1719 mouse_report (ev); 1838 mouse_report (ev);
… …
1731 mouse_report (ev); 1850 mouse_report (ev);
1732 } 1851 }
1733#else 1852#else
1734 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1735 mouse_report (ev); 1854 mouse_report (ev);
1736#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1737 1856
1738 } 1857 }
1739 else 1858 else
1740 { 1859 {
1741 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1862
1743 switch (ev.button) 1863 switch (ev.button)
1744 { 1864 {
1745 case Button1: 1865 case Button1:
1866 /* allow meta + click to select rectangular areas */
1867 /* should be done in screen.C */
1868#if ENABLE_FRILLS
1869 selection.rect = !!(ev.state & ModMetaMask);
1870#else
1871 selection.rect = false;
1872#endif
1873
1746 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1748 { 1876 {
1749 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1751 else 1879 else
1752 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
… …
1826 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
1827 break; 1955 break;
1828 } 1956 }
1829 } 1957 }
1830 else 1958 else
1831#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
1832 1960
1833 { 1961 {
1834 char upordown = 0; 1962 char upordown = 0;
1835 1963
1836 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
1837 { 1965 {
1838 if (scrollbarnext_upButton (ev.y)) 1966 if (scrollbarnext_upButton (ev.y))
1839 upordown = -1; /* up */ 1967 upordown = -1; /* up */
… …
1848 upordown = 1; /* down */ 1976 upordown = 1; /* down */
1849 } 1977 }
1850 if (upordown) 1978 if (upordown)
1851 { 1979 {
1852#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1853 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1854#endif 1982#endif
1855 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
1856 { 1984 {
1857 if (upordown < 0) 1985 if (upordown < 0)
1858 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
1893 case Button3: 2021 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2022 if (scrollBar.style != R_SB_XTERM)
1895 { 2023 {
1896 if (scrollbar_above_slider (ev.y)) 2024 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2026 scr_page (UP, nrow - 1);
1899# else 2027# else
1900 scr_page (UP, TermWin.nrow / 4); 2028 scr_page (UP, nrow / 4);
1901# endif 2029# endif
1902 else if (scrollbar_below_slider (ev.y)) 2030 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2031# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2032 scr_page (DN, nrow - 1);
1905# else 2033# else
1906 scr_page (DN, TermWin.nrow / 4); 2034 scr_page (DN, nrow / 4);
1907# endif 2035# endif
1908 else 2036 else
1909 scrollBar.setMotion (); 2037 scrollBar.setMotion ();
1910 } 2038 }
1911 else 2039 else
1912 { 2040 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2041 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2042 (nrow
1915 * scrollbar_position (ev.y) 2043 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2044 / scrollbar_size ()));
1917 } 2045 }
1918 2046
1919 break; 2047 break;
1920 } 2048 }
1921 } 2049 }
2050
1922 return; 2051 return;
1923 } 2052 }
1924#if MENUBAR
1925 /*
1926 * Menubar window processing of button press
1927 */
1928 if (isMenuBarWindow (ev.window))
1929 menubar_control (ev);
1930#endif
1931} 2053}
1932 2054
1933void 2055void
1934rxvt_term::button_release (XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
1935{ 2057{
… …
1941 2063
1942 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
1943 { 2065 {
1944 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
1945 scrollbar_show (0); 2067 scrollbar_show (0);
1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1947 refresh_type &= ~SMOOTH_REFRESH;
1948#endif
1949 } 2068 }
1950 2069
1951#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2071 if (ev_is_active (&sel_scroll_ev))
1953 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
1954#endif 2073#endif
1955 2074
1956 if (ev.window == TermWin.vt) 2075 if (ev.window == vt)
1957 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
1958#if ISO_14755 2080#if ISO_14755
1959 // 5.4 2081 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2083 return;
1962#endif 2084#endif
2085
1963 if (reportmode) 2086 if (reportmode)
1964 { 2087 {
1965 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1966 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1967 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1978 mouse_report (ev); 2101 mouse_report (ev);
1979 } 2102 }
1980#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
1981 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1982 mouse_report (ev); 2105 mouse_report (ev);
1983#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1984 return; 2107 return;
1985 } 2108 }
1986 2109
1987 /* 2110 /*
1988 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
1997 { 2120 {
1998 case Button1: 2121 case Button1:
1999 case Button3: 2122 case Button3:
2000 selection_make (ev.time); 2123 selection_make (ev.time);
2001 break; 2124 break;
2125
2002 case Button2: 2126 case Button2:
2003 selection_request (ev.time, ev.x, ev.y); 2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2004 break; 2129 break;
2130
2005#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2006 case Button4: 2132 case Button4:
2007 case Button5: 2133 case Button5:
2008 { 2134 {
2009 int i; 2135 int i;
… …
2011 2137
2012 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2013 2139
2014 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2015 i = 1; 2141 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2142 else if (option (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2018 else 2144 else
2019 i = 5; 2145 i = 5;
2020 2146
2021# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2023 { 2149 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2153
2028 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030
2031 slip_wheel_ev.start ();
2032 } 2155 }
2033 else 2156 else
2034 { 2157 {
2035# endif 2158# endif
2036# ifdef JUMP_MOUSE_WHEEL
2037 scr_page (v, i); 2159 scr_page (v, i);
2038 scr_refresh (SMOOTH_REFRESH);
2039 scrollbar_show (1); 2160 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
2049 } 2162 }
2050#endif 2163# endif
2051 } 2164 }
2052 break; 2165 break;
2053#endif 2166#endif
2054 } 2167 }
2055 } 2168 }
2056#ifdef MENUBAR
2057 else if (isMenuBarWindow (ev.window))
2058 menubar_control (ev);
2059#endif
2060} 2169}
2061
2062#ifdef TRANSPARENT
2063#if TINTING
2064/* taken from aterm-0.4.2 */
2065
2066typedef uint32_t RUINT32T;
2067
2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2069{
2070 int sh_r, sh_g, sh_b;
2071 RUINT32T mask_r, mask_g, mask_b;
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i;
2076
2077 Visual* visual = display->visual;
2078
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080
2081 /* for convenience */
2082 mask_r = visual->red_mask;
2083 mask_g = visual->green_mask;
2084 mask_b = visual->blue_mask;
2085
2086 /* boring lookup table pre-initialization */
2087 switch (srcImage->bits_per_pixel) {
2088 case 15:
2089 if ((mask_r != 0x7c00) ||
2090 (mask_g != 0x03e0) ||
2091 (mask_b != 0x001f))
2092 return;
2093 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2094 lookup_r = lookup;
2095 lookup_g = lookup+32;
2096 lookup_b = lookup+32+32;
2097 sh_r = 10;
2098 sh_g = 5;
2099 sh_b = 0;
2100 break;
2101 case 16:
2102 if ((mask_r != 0xf800) ||
2103 (mask_g != 0x07e0) ||
2104 (mask_b != 0x001f))
2105 return;
2106 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2107 lookup_r = lookup;
2108 lookup_g = lookup+32;
2109 lookup_b = lookup+32+64;
2110 sh_r = 11;
2111 sh_g = 5;
2112 sh_b = 0;
2113 break;
2114 case 24:
2115 if ((mask_r != 0xff0000) ||
2116 (mask_g != 0x00ff00) ||
2117 (mask_b != 0x0000ff))
2118 return;
2119 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2120 lookup_r = lookup;
2121 lookup_g = lookup+256;
2122 lookup_b = lookup+256+256;
2123 sh_r = 16;
2124 sh_g = 8;
2125 sh_b = 0;
2126 break;
2127 case 32:
2128 if ((mask_r != 0xff0000) ||
2129 (mask_g != 0x00ff00) ||
2130 (mask_b != 0x0000ff))
2131 return;
2132 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2133 lookup_r = lookup;
2134 lookup_g = lookup+256;
2135 lookup_b = lookup+256+256;
2136 sh_r = 16;
2137 sh_g = 8;
2138 sh_b = 0;
2139 break;
2140 default:
2141 return; /* we do not support this color depth */
2142 }
2143
2144 /* prepare limits for color transformation (each channel is handled separately) */
2145 if (shade < 0) {
2146 shade = -shade;
2147 if (shade < 0) shade = 0;
2148 if (shade > 100) shade = 100;
2149
2150 lower_lim_r = 65535-rm;
2151 lower_lim_g = 65535-gm;
2152 lower_lim_b = 65535-bm;
2153
2154 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2155 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2156 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2157
2158 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2159 } else {
2160 if (shade < 0) shade = 0;
2161 if (shade > 100) shade = 100;
2162
2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2164
2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2168 }
2169
2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2172 {
2173 unsigned int tmp;
2174
2175 tmp = lower_lim_r;
2176 lower_lim_r = lower_lim_b;
2177 lower_lim_b = tmp;
2178
2179 tmp = upper_lim_r;
2180 upper_lim_r = upper_lim_b;
2181 upper_lim_b = tmp;
2182 }
2183
2184 /* fill our lookup tables */
2185 for (i = 0; i <= mask_r>>sh_r; i++)
2186 {
2187 RUINT32T tmp;
2188 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2189 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2190 lookup_r[i] = (tmp/65535)<<sh_r;
2191 }
2192 for (i = 0; i <= mask_g>>sh_g; i++)
2193 {
2194 RUINT32T tmp;
2195 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2196 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2197 lookup_g[i] = (tmp/65535)<<sh_g;
2198 }
2199 for (i = 0; i <= mask_b>>sh_b; i++)
2200 {
2201 RUINT32T tmp;
2202 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2203 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2204 lookup_b[i] = (tmp/65535)<<sh_b;
2205 }
2206
2207 /* apply table to input image (replacing colors by newly calculated ones) */
2208 switch (srcImage->bits_per_pixel)
2209 {
2210 case 15:
2211 {
2212 unsigned short *p1, *pf, *p, *pl;
2213 p1 = (unsigned short *) srcImage->data;
2214 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2215 while (p1 < pf)
2216 {
2217 p = p1;
2218 pl = p1 + srcImage->width;
2219 for (; p < pl; p++)
2220 {
2221 *p = lookup_r[(*p & 0x7c00)>>10] |
2222 lookup_g[(*p & 0x03e0)>> 5] |
2223 lookup_b[(*p & 0x001f)];
2224 }
2225 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2226 }
2227 break;
2228 }
2229 case 16:
2230 {
2231 unsigned short *p1, *pf, *p, *pl;
2232 p1 = (unsigned short *) srcImage->data;
2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2234 while (p1 < pf)
2235 {
2236 p = p1;
2237 pl = p1 + srcImage->width;
2238 for (; p < pl; p++)
2239 {
2240 *p = lookup_r[(*p & 0xf800)>>11] |
2241 lookup_g[(*p & 0x07e0)>> 5] |
2242 lookup_b[(*p & 0x001f)];
2243 }
2244 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2245 }
2246 break;
2247 }
2248 case 24:
2249 {
2250 unsigned char *p1, *pf, *p, *pl;
2251 p1 = (unsigned char *) srcImage->data;
2252 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2253 while (p1 < pf)
2254 {
2255 p = p1;
2256 pl = p1 + srcImage->width * 3;
2257 for (; p < pl; p += 3)
2258 {
2259 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2260 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2261 p[2] = lookup_r[(p[2] & 0x0000ff)];
2262 }
2263 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2264 }
2265 break;
2266 }
2267 case 32:
2268 {
2269 RUINT32T *p1, *pf, *p, *pl;
2270 p1 = (RUINT32T *) srcImage->data;
2271 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2272
2273 while (p1 < pf)
2274 {
2275 p = p1;
2276 pl = p1 + srcImage->width;
2277 for (; p < pl; p++)
2278 {
2279 *p = lookup_r[(*p & 0xff0000)>>16] |
2280 lookup_g[(*p & 0x00ff00)>> 8] |
2281 lookup_b[(*p & 0x0000ff)] |
2282 (*p & ~0xffffff);
2283 }
2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2285 }
2286 break;
2287 }
2288 }
2289
2290 free (lookup);
2291}
2292#endif
2293
2294/*
2295 * Check our parents are still who we think they are.
2296 * Do transparency updates if required
2297 */
2298int
2299rxvt_term::check_our_parents ()
2300{
2301 int i, pchanged, aformat, have_pixmap, rootdepth;
2302 unsigned long nitems, bytes_after;
2303 Atom atype;
2304 unsigned char *prop = NULL;
2305 Window root, oldp, *list;
2306 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr;
2308
2309 pchanged = 0;
2310
2311 if (!(options & Opt_transparent))
2312 return pchanged; /* Don't try any more */
2313
2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth;
2316
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2318
2319 if (rootdepth != wattr.depth)
2320 {
2321 if (am_transparent)
2322 {
2323 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0;
2326 }
2327
2328 return pchanged; /* Don't try any more */
2329 }
2330
2331 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False);
2333
2334 /*
2335 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that.
2338 */
2339 i = (xa[XA_XROOTPMAPID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success);
2343
2344 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success);
2349
2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
2355 have_pixmap = 0;
2356 else
2357 {
2358 have_pixmap = 1;
2359 rootpixmap = *(Pixmap *)prop;
2360 XFree (prop);
2361 }
2362
2363 if (have_pixmap)
2364 {
2365 /*
2366 * Copy display->root pixmap transparency
2367 */
2368 int sx, sy, nx, ny;
2369 unsigned int nw, nh;
2370 Window cr;
2371 XImage *image;
2372 GC gc;
2373 XGCValues gcvalue;
2374
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2376 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height;
2379 nx = ny = 0;
2380
2381 if (sx < 0)
2382 {
2383 nw += sx;
2384 nx = -sx;
2385 sx = 0;
2386 }
2387
2388 if (sy < 0)
2389 {
2390 nh += sy;
2391 ny = -sy;
2392 sy = 0;
2393 }
2394
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2397 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */
2402 allowedxerror = 0;
2403
2404 if (image == NULL)
2405 {
2406 if (am_transparent && am_pixmap_trans)
2407 {
2408 pchanged = 1;
2409 if (TermWin.pixmap != None)
2410 {
2411 XFreePixmap (display->display, TermWin.pixmap);
2412 TermWin.pixmap = None;
2413 }
2414 }
2415
2416 am_pixmap_trans = 0;
2417 }
2418 else
2419 {
2420 if (TermWin.pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap);
2422
2423#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint))
2425 {
2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2428
2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2430
2431 ShadeXImage (display, image, shade, rm, gm, bm);
2432 }
2433#endif
2434
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2436 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc);
2441 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]);
2444
2445 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1;
2447
2448 am_transparent = am_pixmap_trans = 1;
2449 }
2450 }
2451
2452 if (!am_pixmap_trans)
2453 {
2454 unsigned int n;
2455 /*
2456 * InheritPixmap transparency
2457 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2459 {
2460 oldp = TermWin.parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n);
2463 XFree (list);
2464
2465 if (TermWin.parent[i] == display->root)
2466 {
2467 if (oldp != None)
2468 pchanged = 1;
2469
2470 break;
2471 }
2472
2473 if (oldp != TermWin.parent[i])
2474 pchanged = 1;
2475 }
2476
2477 n = 0;
2478
2479 if (pchanged)
2480 {
2481 for (; n < (unsigned int)i; n++)
2482 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2487 break;
2488 }
2489 }
2490 }
2491
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2493 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */
2498 }
2499 else
2500 {
2501#if WAIT_FOR_WM
2502 /* wait (an arbitrary period) for the WM to do its thing
2503 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1);
2505#endif
2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2511
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2513 am_transparent = 1;
2514 }
2515
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None;
2518 }
2519
2520 // this is experimental
2521 if (scrollBar.win)
2522 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle ();
2526 scrollbar_show (0);
2527 }
2528
2529 return pchanged;
2530}
2531#endif
2532 2170
2533/*}}} */ 2171/*}}} */
2534 2172
2535bool 2173bool
2536rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
2537{ 2175{
2538 bool flag = false; 2176 bool flag = false;
2539 unicode_t ch = NOCHAR; 2177 wchar_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here 2178 char *seq_begin; // remember start of esc-sequence here
2541 2179
2542 for (;;) 2180 for (;;)
2543 { 2181 {
2544 if (ch == NOCHAR) 2182 if (ch == NOCHAR)
2545 { 2183 {
2546 seq_begin = cmdbuf_ptr; 2184 seq_begin = cmdbuf_ptr;
2547 ch = next_char (); 2185 ch = next_char ();
2548 }
2549 2186
2550 if (ch == NOCHAR) // TODO: improve 2187 if (ch == NOCHAR)
2551 break; 2188 break;
2189 }
2552 2190
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 { 2192 {
2555 if (!seen_input) 2193 if (!seen_input)
2556 { 2194 {
2557 seen_input = 1; 2195 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2196 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2197 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2198 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2199 // then sometimes get the size wrong.
2200 // unfortunately other programs are even more buggy and dislike
2201 // being sent SIGWINCH, so only do it when we were in fact being
2202 // resized.
2203 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2204 kill (-cmd_pid, SIGWINCH);
2563 } 2205 }
2564 2206
2565 /* Read a text string from the input buffer */ 2207 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2208 wchar_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2209 bool refreshnow = false;
2568 int nlines = 0; 2210 int nlines = 0;
2569 unicode_t *str = buf; 2211 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ);
2570 2213
2571 for (;;) 2214 for (;;)
2572 { 2215 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2217 break;
2575 2218
2576 *str++ = ch; 2219 *str++ = ch;
2577 2220
2578 if (ch == C0_LF) 2221 if (ch == C0_LF || str >= eol)
2579 { 2222 {
2223 if (ch == C0_LF)
2580 nlines++; 2224 nlines++;
2225
2581 refresh_count++; 2226 refresh_count++;
2582 2227
2583 if (!(options & Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2585 { 2229 {
2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2586 refreshnow = true; 2234 refreshnow = true;
2587 ch = NOCHAR; 2235 ch = NOCHAR;
2588 break; 2236 break;
2237 }
2589 } 2238 }
2590 2239
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2241 if (nlines >= nrow - 1)
2593 { 2242 {
2243 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2244 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2594 scr_add_lines (buf, nlines, str - buf); 2245 scr_add_lines (buf, str - buf, nlines);
2246
2595 nlines = 0; 2247 nlines = 0;
2596 str = buf; 2248 str = buf;
2249 eol = str + min (ncol, UBUFSIZ);
2597 } 2250 }
2598 }
2599 2251
2600 if (str >= buf + UBUFSIZ) 2252 if (str >= eol)
2601 { 2253 {
2254 if (eol >= buf + UBUFSIZ)
2255 {
2602 ch = NOCHAR; 2256 ch = NOCHAR;
2603 break; 2257 break;
2258 }
2259 else
2260 eol = min (eol + ncol, buf + UBUFSIZ);
2261 }
2262
2604 } 2263 }
2605 2264
2606 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2266 ch = next_char ();
2608 } 2267 }
2609 2268
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2610 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2611 2272
2612 /* 2273 /*
2613 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2614 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2615 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2616 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2277 */
2618 if (refreshnow) 2278 if (refreshnow)
2619 { 2279 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++;
2622 else
2623 {
2624 flag = true; 2280 flag = true;
2625 scr_refresh (refresh_type); 2281 scr_refresh ();
2626 } 2282 want_refresh = 1;
2627 } 2283 }
2628 2284
2629 } 2285 }
2630 else 2286 else
2631 { 2287 {
… …
2645 } 2301 }
2646 2302
2647 return flag; 2303 return flag;
2648} 2304}
2649 2305
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2659// read the next character 2306// read the next character
2660unicode_t 2307wchar_t
2661rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2662{ 2309{
2663 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2664 { 2311 {
2665 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2667 return *cmdbuf_ptr++; 2314 return *cmdbuf_ptr++;
2668 2315
2669 wchar_t wc; 2316 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2317 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671 2318
2672 if (len == (size_t)-2) 2319 if (len == (size_t)-2)
2673 { 2320 {
2674 // the mbstate stores incomplete sequences. didn't know this :/ 2321 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp; 2322 cmdbuf_ptr = cmdbuf_endp;
2676 break; 2323 break;
2677 } 2324 }
2678 2325
2679 if (len == (size_t)-1) 2326 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2328
2682 // assume wchar == unicode 2329 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2330 cmdbuf_ptr += len;
2684 return wc; 2331 return wc & UNICODE_MASK;
2685 } 2332 }
2686 2333
2687 return NOCHAR; 2334 return NOCHAR;
2688} 2335}
2336
2337// read the next octet
2338uint32_t
2339rxvt_term::next_octet () NOTHROW
2340{
2341 return cmdbuf_ptr < cmdbuf_endp
2342 ? (unsigned char)*cmdbuf_ptr++
2343 : NOCHAR;
2344}
2345
2346static class out_of_input out_of_input;
2689 2347
2690/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2691/* 2349/*
2692 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2693 * to the command. 2351 * to the command.
2694 */ 2352 */
2695unicode_t 2353wchar_t
2696rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2697{ 2355{
2698 unicode_t c = next_char (); 2356 wchar_t c = next_char ();
2699 2357
2700 if (c == NOCHAR) 2358 if (c == NOCHAR)
2701 throw out_of_input; 2359 throw out_of_input;
2702 2360
2703 return c; 2361 return c;
2704} 2362}
2705 2363
2706unicode_t 2364uint32_t
2707rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2708{ 2366{
2709 unicode_t c = next_octet (); 2367 uint32_t c = next_octet ();
2710 2368
2711 if (c == NOCHAR) 2369 if (c == NOCHAR)
2712 throw out_of_input; 2370 throw out_of_input;
2713 2371
2714 return c; 2372 return c;
… …
2778 { 2436 {
2779 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2780 break; /* done = 1 */ 2438 break; /* done = 1 */
2781 } 2439 }
2782 } 2440 }
2783 2441
2784 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2785 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2786 { 2444 {
2787 done = 1; 2445 done = 1;
2788 break; 2446 break;
… …
2790 } 2448 }
2791 } 2449 }
2792 2450
2793 pclose_printer (fd); 2451 pclose_printer (fd);
2794} 2452}
2795#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2796/*}}} */ 2454/*}}} */
2797 2455
2798/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2799enum { 2457enum {
2800 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2814 case C0_ESC: 2472 case C0_ESC:
2815 process_escape_seq (); 2473 process_escape_seq ();
2816 break; 2474 break;
2817 case C0_ENQ: /* terminal Status */ 2475 case C0_ENQ: /* terminal Status */
2818 if (rs[Rs_answerbackstring]) 2476 if (rs[Rs_answerbackstring])
2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2477 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2821 else 2478 else
2822 tt_write ((unsigned char *)VT100_ANS, 2479 tt_write (VT100_ANS, strlen (VT100_ANS));
2823 (unsigned int)strlen (VT100_ANS));
2824 break; 2480 break;
2825 case C0_BEL: /* bell */ 2481 case C0_BEL: /* bell */
2826 scr_bell (); 2482 scr_bell ();
2827 break; 2483 break;
2828 case C0_BS: /* backspace */ 2484 case C0_BS: /* backspace */
… …
2852 process_dcs_seq (); 2508 process_dcs_seq ();
2853 break; 2509 break;
2854 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
2855 process_csi_seq (); 2511 process_csi_seq ();
2856 break; 2512 break;
2857 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
2858 process_osc_seq (); 2514 process_osc_seq ();
2859 break; 2515 break;
2860#endif 2516#endif
2861 } 2517 }
2862} 2518}
… …
2952 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
2953 break; 2609 break;
2954 case '+': 2610 case '+':
2955 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
2956 break; 2612 break;
2957#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
2958 case '6': 2614 case '6':
2959 scr_backindex (); 2615 scr_backindex ();
2960 break; 2616 break;
2961#endif 2617#endif
2962 case '7': 2618 case '7':
2963 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
2964 break; 2620 break;
2965 case '8': 2621 case '8':
2966 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
2967 break; 2623 break;
2968#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
2969 case '9': 2625 case '9':
2970 scr_forwardindex (); 2626 scr_forwardindex ();
2971 break; 2627 break;
2972#endif 2628#endif
2973 case '=': 2629 case '=':
… …
2983 break; 2639 break;
2984 2640
2985 /* 8.3.87: NEXT LINE */ 2641 /* 8.3.87: NEXT LINE */
2986 case C1_NEL: /* ESC E */ 2642 case C1_NEL: /* ESC E */
2987 { 2643 {
2988 unicode_t nlcr[] = { C0_LF, C0_CR }; 2644 wchar_t nlcr[] = { C0_LF, C0_CR };
2989 scr_add_lines (nlcr, 1, 2); 2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2990 } 2646 }
2991 break; 2647 break;
2992 2648
2993 /* kidnapped escape sequence: Should be 8.3.48 */ 2649 /* kidnapped escape sequence: Should be 8.3.48 */
2994 case C1_ESA: /* ESC G */ 2650 case C1_ESA: /* ESC G */
… …
3016 process_dcs_seq (); 2672 process_dcs_seq ();
3017 break; 2673 break;
3018 2674
3019 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3020 case C1_SCI: /* ESC Z */ 2676 case C1_SCI: /* ESC Z */
3021 tt_write ((const unsigned char *)ESCZ_ANSWER, 2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3022 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3023 break; /* steal obsolete ESC [ c */ 2678 break; /* steal obsolete ESC [ c */
3024 2679
3025 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3026 case C1_CSI: /* ESC [ */ 2681 case C1_CSI: /* ESC [ */
3027 process_csi_seq (); 2682 process_csi_seq ();
… …
3089rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3090{ 2745{
3091 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3092 unsigned int nargs, p; 2747 unsigned int nargs, p;
3093 int n, ndef; 2748 int n, ndef;
3094 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3095 2750
3096 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3097 arg[--nargs] = 0;
3098 2752
3099 priv = 0; 2753 priv = 0;
3100 ch = cmd_getc (); 2754 ch = cmd_getc ();
3101 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3102 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3103 priv = ch; 2758 priv = ch;
3104 ch = cmd_getc (); 2759 ch = cmd_getc ();
3105 } 2760 }
3106 2761
3107 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
3136 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
3137 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
3138 if (arg[p] == -1) 2793 if (arg[p] == -1)
3139 arg[p] = ndef; 2794 arg[p] = ndef;
3140 2795
3141#ifdef DEBUG_CMD
3142 fprintf (stderr, "CSI ");
3143 for (p = 0; p < nargs; p++)
3144 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3145 fprintf (stderr, "%c\n", ch);
3146#endif
3147
3148 /* 2796 /*
3149 * private mode handling 2797 * private mode handling
3150 */ 2798 */
3151 if (priv) 2799 if (priv)
3152 { 2800 {
3153 switch (priv) 2801 switch (priv)
3154 { 2802 {
3155 case '>': 2803 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
3158 break; 2815 break;
3159 case '?': 2816 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 2819 break;
… …
3267 2924
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2925 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 2926 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 2927 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2928 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2929 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 2930 break;
3274 2931
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2932 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 2933 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3277 (unsigned int) (sizeof (VT100_ANS) - 1));
3278 break; 2934 break;
3279 2935
3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2936 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3281 process_sgr_mode (nargs, arg); 2937 process_sgr_mode (nargs, arg);
3282 break; 2938 break;
… …
3289 break; 2945 break;
3290 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3291 scr_report_position (); 2947 scr_report_position ();
3292 break; 2948 break;
3293 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 2950 if (option (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 2952 break;
3297 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 2955 break;
… …
3366 break; 3022 break;
3367 case CSI_75: 3023 case CSI_75:
3368 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3369 break; 3025 break;
3370 3026
3371#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
3372 case CSI_74: 3028 case CSI_74:
3373 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3374 break; 3030 break;
3375#endif 3031#endif
3376 3032
… …
3383 break; 3039 break;
3384 } 3040 }
3385} 3041}
3386/*}}} */ 3042/*}}} */
3387 3043
3388#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3389/* ARGSUSED */ 3045/* ARGSUSED */
3390void 3046void
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3048{
3393 int x, y; 3049 int x, y;
3394 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3395 Window wdummy; 3051 Window wdummy;
3052
3053 dLocal (Display *, dpy);
3396 3054
3397 if (nargs == 0) 3055 if (nargs == 0)
3398 return; 3056 return;
3399 3057
3400 switch (args[0]) 3058 switch (args[0])
3401 { 3059 {
3402 /* 3060 /*
3403 * commands 3061 * commands
3404 */ 3062 */
3405 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3064 XMapWindow (dpy, parent[0]);
3407 break; 3065 break;
3408 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3067 XIconifyWindow (dpy, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3068 break;
3412 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3414 break; 3071 break;
3415 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3074 break;
3418 case 5: /* raise window */ 3075 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3420 break; 3077 break;
3421 case 6: /* lower window */ 3078 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3423 break; 3080 break;
3424 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3425 scr_touch (true); 3082 scr_touch (true);
3426 break; 3083 break;
3427 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3085 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3086 (unsigned int) (args[1] * fheight));
3430 break; 3087 break;
3431 3088
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3089 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3090 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3092 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3093 (unsigned int) (args[1] * fheight));
3437 break; 3094 break;
3438
3439 3095
3440 /* 3096 /*
3441 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3442 */ 3098 */
3443 case 11: /* report window state */ 3099 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3102 break;
3447 case 13: /* report window position */ 3103 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3109 break;
3454 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3113 break;
3458 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3116 break;
3461 case 19: /* report window size (chars) */ 3117 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3119 break;
3464 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3465 { 3121 {
3466 char *s; 3122 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3125 XFree (s);
3470 } 3126 }
3471 break; 3127 break;
3472 case 21: /* report window title */ 3128 case 21: /* report window title */
3473 { 3129 {
3474 char *s; 3130 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3133 XFree (s);
3478 } 3134 }
3479 break; 3135 break;
3480 } 3136 }
3481} 3137}
… …
3484/*----------------------------------------------------------------------*/ 3140/*----------------------------------------------------------------------*/
3485/* 3141/*
3486 * get input up until STRING TERMINATOR (or BEL) 3142 * get input up until STRING TERMINATOR (or BEL)
3487 * ends_how is terminator used. returned input must be free()'d 3143 * ends_how is terminator used. returned input must be free()'d
3488 */ 3144 */
3489unsigned char * 3145char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3146rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3147{
3492 unicode_t prev = 0, ch; 3148 unicode_t ch;
3149 bool seen_esc = false;
3493 unsigned int n = 0; 3150 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3151 wchar_t string[STRING_MAX];
3496 3152
3497 while ((ch = cmd_getc ()) != NOCHAR) 3153 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3154 {
3499 if (prev == C0_ESC) 3155 if (seen_esc)
3500 { 3156 {
3501 if (ch == 0x5c) /* 7bit ST */ 3157 if (ch == 0x5c) /* 7bit ST */
3502 break; 3158 break;
3503 else 3159 else
3504 return NULL; 3160 return NULL;
3505 } 3161 }
3162 else if (ch == C0_ESC)
3163 {
3164 seen_esc = true;
3165 continue;
3166 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3508 else if (ch < 0x20) 3171 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3510 3173
3511 if (n >= sizeof (string) - 1) 3174 seen_esc = false;
3175
3176 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3177 // stop at some sane length
3513 return NULL; 3178 return NULL;
3514 3179
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
3521 string[n++] = prev = ch; 3180 string[n++] = ch;
3522 } 3181 }
3523 3182
3524 string[n++] = '\0'; 3183 string[n++] = '\0';
3525 3184
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3186
3531 return s; 3187 return rxvt_wcstombs (string);
3532} 3188}
3533 3189
3534/*----------------------------------------------------------------------*/ 3190/*----------------------------------------------------------------------*/
3535/* 3191/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3192 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3537 */ 3193 */
3538void 3194void
3539rxvt_term::process_dcs_seq () 3195rxvt_term::process_dcs_seq ()
3540{ 3196{
3541 unsigned char *s; 3197 char *s;
3542 unicode_t eh; 3198 unicode_t eh;
3543 3199
3544 /* 3200 /*
3545 * Not handled yet 3201 * Not handled yet
3546 */ 3202 */
… …
3565 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3221 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3566 arg = arg * 10 + (ch - '0'); 3222 arg = arg * 10 + (ch - '0');
3567 3223
3568 if (ch == ';') 3224 if (ch == ';')
3569 { 3225 {
3570 unsigned char *s = get_to_st (eh); 3226 char *s = get_to_st (eh);
3571 3227
3572 if (s) 3228 if (s)
3573 { 3229 {
3574 process_xterm_seq (arg, (char *)s, eh); 3230 process_xterm_seq (arg, s, eh);
3575 free (s); 3231 free (s);
3576 } 3232 }
3577 } 3233 }
3578} 3234}
3579 3235
3580void 3236void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3582{ 3238{
3583 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3584 { 3240 {
3585 unsigned short r, g, b; 3241 rgba c;
3586 pix_colors_focused[color].get (display, r, g, b); 3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3588 } 3250 }
3589 else 3251 else
3590 set_window_color (color, str); 3252 set_window_color (color, str);
3591} 3253}
3592 3254
3593/* 3255/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3256 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3257 */
3618void 3258void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3259rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3620{ 3260{
3621 int changed = 0;
3622 int color; 3261 int color;
3623 char *buf, *name; 3262 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3264 int saveop = op;
3265
3266 dLocal (Display *, dpy);
3625 3267
3626 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3627 switch (op) 3273 switch (op)
3628 { 3274 {
3629 case XTerm_name: 3275 case XTerm_name:
3630 set_title (str); 3276 set_title (str);
3631 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3636 set_title (str); 3282 set_title (str);
3637 break; 3283 break;
3638 case XTerm_property: 3284 case XTerm_property:
3639 if (str[0] == '?') 3285 if (str[0] == '?')
3640 { 3286 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3287 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3288 Atom actual_type;
3643 int actual_format; 3289 int actual_format;
3644 unsigned long nitems; 3290 unsigned long nitems;
3645 unsigned long bytes_after; 3291 unsigned long bytes_after;
3646 unsigned char *value = 0; 3292 unsigned char *value = 0;
3647 const char *str = ""; 3293 const char *str = "";
3648 3294
3649 if (prop 3295 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3300 && actual_type != None
3655 && actual_format == 8) 3301 && actual_format == 8)
3656 str = (const char *)(value); 3302 str = (const char *)(value);
3657 3303
3658 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3659 3305
3660 XFree (value); 3306 XFree (value);
3661 } 3307 }
3662 else 3308 else
3663 { 3309 {
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3310 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3311
3666 if (eq) 3312 if (eq)
3667 { 3313 {
3668 *eq = 0; 3314 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3315 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3316 }
3674 else 3317 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3318 XDeleteProperty (dpy, parent[0],
3676 display->atom (str)); 3319 display->atom (str));
3677 } 3320 }
3678 break; 3321 break;
3679 3322
3680 case XTerm_Color: 3323 case XTerm_Color:
… …
3682 { 3325 {
3683 if ((name = strchr (buf, ';')) == NULL) 3326 if ((name = strchr (buf, ';')) == NULL)
3684 break; 3327 break;
3685 3328
3686 *name++ = '\0'; 3329 *name++ = '\0';
3687 color = atoi (buf); 3330 color = atoi (buf) + minCOLOR;
3688 3331
3689 if (color < 0 || color >= TOTAL_COLORS) 3332 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3690 break; 3333 break;
3691 3334
3692 if ((buf = strchr (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3693 *buf++ = '\0'; 3336 *buf++ = '\0';
3694 3337
3695 if (name[0] == '?' && !name[1]) 3338 process_color_seq (op, color, name, resp);
3696 {
3697 unsigned short r, g, b;
3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3700 }
3701 else
3702 set_window_color (color + minCOLOR, name);
3703 } 3339 }
3704 break; 3340 break;
3705 case XTerm_Color00: 3341 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3707 break; 3343 break;
3708 case XTerm_Color01: 3344 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3710 break; 3346 break;
3711#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3712 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3714 break; 3350 break;
3715#endif 3351#endif
3716 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3717 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3718 break; 3354 break;
3719 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3721 break; 3357 break;
3722#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3723 case XTerm_Color_BD:
3724 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3725 break;
3726 case XTerm_Color_UL:
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break;
3729 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3731 break; 3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp);
3365 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp);
3369 break;
3370 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp);
3372 break;
3732#endif 3373#endif
3374#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp);
3377 {
3378 bool changed = false;
3379 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3733 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3734 case XTerm_Pixmap: 3391 case Rxvt_Pixmap:
3735 if (*str != ';') 3392 if (!strcmp (str, "?"))
3736 { 3393 {
3737#if XPM_BACKGROUND 3394 char str[256];
3738 scale_pixmap (""); /* reset to default scaling */ 3395
3739 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3740#endif 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3741 scr_touch (true); 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3742 } 3400 }
3743 while ((str = strchr (str, ';')) != NULL) 3401 else
3744 { 3402 {
3403 int changed = 0;
3404
3405 if (*str != ';')
3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3745 str++; 3417 str++;
3746#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3747 changed += scale_pixmap (str); 3419 changed++;
3748#endif 3420 str = strchr (str, ';');
3749 3421 }
3422 if (changed)
3423 update_background ();
3750 } 3424 }
3751 if (changed)
3752 {
3753#ifdef XPM_BACKGROUND
3754 resize_pixmap ();
3755#endif
3756 scr_touch (true);
3757 }
3758 break; 3425 break;
3426#endif
3759 3427
3760 case XTerm_restoreFG: 3428 case Rxvt_restoreFG:
3761 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3762 break; 3430 break;
3763 case XTerm_restoreBG: 3431 case Rxvt_restoreBG:
3764 set_window_color (Color_bg, str); 3432 set_window_color (Color_bg, str);
3765 break; 3433 break;
3766 3434
3767 case XTerm_logfile: 3435 case XTerm_logfile:
3768 // TODO, when secure mode? 3436 // TODO, when secure mode?
3769 break; 3437 break;
3770 3438
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR
3806 case XTerm_Menu:
3807 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break;
3810#endif
3811#if 0 3439#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3440 case Rxvt_dumpscreen: /* no error notices */
3813 { 3441 {
3814 int fd; 3442 int fd;
3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3443 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3816 { 3444 {
3817 scr_dump (fd); 3445 scr_dump (fd);
3818 close (fd); 3446 close (fd);
3819 } 3447 }
3820 } 3448 }
3449 break;
3450#endif
3451 case XTerm_font:
3452 op = URxvt_font;
3453 case URxvt_font:
3454#if ENABLE_STYLES
3455 case URxvt_boldFont:
3456 case URxvt_italicFont:
3457 case URxvt_boldItalicFont:
3458#endif
3459 if (query)
3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3462 ? fontset[op - URxvt_font]->fontdesc : "",
3463 resp);
3464 else
3465 {
3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
3467
3468 res = strdup (str);
3469 allocated.push_back ((void *)res);
3470 set_fonts ();
3471 }
3472 break;
3473
3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3483 case URxvt_locale:
3484 if (query)
3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3486 else
3487 {
3488 set_locale (str);
3489 pty->set_utf8_mode (enc_utf8);
3490 init_xlocale ();
3491 }
3492 break;
3493
3494 case URxvt_view_up:
3495 case URxvt_view_down:
3496 {
3497 int lines = atoi (str);
3498
3499 if (lines)
3500 scr_page (op == URxvt_view_up ? UP : DN, lines);
3501 else
3502 scr_erase_savelines ();
3503 }
3504
3505 break;
3506#endif
3507
3508#if ENABLE_PERL
3509 case URxvt_perl:
3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3511 ; // no responses yet
3821 break; 3512 break;
3822#endif 3513#endif
3823 } 3514 }
3824} 3515}
3825/*----------------------------------------------------------------------*/ 3516/*----------------------------------------------------------------------*/
… …
3856 return state; 3547 return state;
3857} 3548}
3858 3549
3859/* we're not using priv _yet_ */ 3550/* we're not using priv _yet_ */
3860void 3551void
3861rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3862{ 3553{
3863 unsigned int i, j; 3554 unsigned int i, j;
3864 int state; 3555 int state;
3865 3556
3866 static const struct 3557 static const struct
3867 { 3558 {
3868 const int argval; 3559 const int argval;
3869 const unsigned long bit; 3560 const unsigned long bit;
3870 }
3871
3872 argtopriv[] = { 3561 } argtopriv[] = {
3873 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
3874 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
3875 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
3876 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
3877 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
3878 { 6, PrivMode_relOrigin }, 3567 { 6, PrivMode_relOrigin },
3879 { 7, PrivMode_Autowrap }, 3568 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode 3569 // 8, bi-directional support mode
3881 { 9, PrivMode_MouseX10 }, 3570 { 9, PrivMode_MouseX10 },
3882#ifdef menuBar_esc
3883 { menuBar_esc, PrivMode_menuBar },
3884#endif
3885 // 18, 19 printing-related 3571 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor }, 3572 { 25, PrivMode_VisibleCursor },
3887#ifdef scrollBar_esc 3573#ifdef scrollBar_esc
3888 { scrollBar_esc, PrivMode_scrollBar }, 3574 { scrollBar_esc, PrivMode_scrollBar },
3889#endif 3575#endif
… …
3896 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3897#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3898 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3899#endif 3585#endif
3900 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3901 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3902 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3903 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3904 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3905 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3906 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3907 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3908 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
3934 } 3619 }
3935 3620
3936 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
3937 switch (arg[i]) 3622 switch (arg[i])
3938 { 3623 {
3624#if ENABLE_STYLES
3625 case 1021:
3626 set_option (Opt_intensityStyles, mode);
3627
3628 scr_touch (true);
3629 break;
3630#endif
3939 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
3632 case 1049:
3940 if (options & Opt_secondaryScreen) 3633 if (option (Opt_secondaryScreen))
3941 if (mode == 0) 3634 if (mode == 0)
3942 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
3943 else if (mode == 1) 3636 else if (mode == 1)
3944 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
3945 break; 3638 break;
… …
3957 */ 3650 */
3958 PrivMode (1, PrivMode_vt52); 3651 PrivMode (1, PrivMode_vt52);
3959 break; 3652 break;
3960 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 3656 break;
3964 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
3965 if (state)
3966 options &= ~Opt_jumpScroll;
3967 else
3968 options |= Opt_jumpScroll; 3658 set_option (Opt_jumpScroll, !state);
3969 break; 3659 break;
3970 case 5: /* reverse video */ 3660 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
3972 break; 3662 break;
3973 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
… …
3977 scr_autowrap (state); 3667 scr_autowrap (state);
3978 break; 3668 break;
3979 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
3980 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
3981 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
3982 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3983 break; 3673 break;
3984#ifdef menuBar_esc
3985 case menuBar_esc:
3986#ifdef MENUBAR
3987 map_menuBar (state);
3988#endif
3989 break;
3990#endif
3991#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3992 case scrollBar_esc: 3675 case scrollBar_esc:
3993 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
3994 { 3677 {
3995 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
4007 break; 3690 break;
4008 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4009 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4010 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4011 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4012 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4013 break; 3696 break;
4014#if 0
4015 case 1001: 3697 case 1002:
4016 break; /* X11 mouse highlighting */ 3698 case 1003:
4017#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state)
4020 options &= ~Opt_scrollTtyOutput;
4021 else
4022 options |= Opt_scrollTtyOutput; 3710 set_option (Opt_scrollTtyOutput, !state);
4023 break; 3711 break;
4024 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4025 if (state)
4026 options |= Opt_scrollTtyKeypress; 3713 set_option (Opt_scrollTtyKeypress, state);
4027 else
4028 options &= ~Opt_scrollTtyKeypress;
4029 break; 3714 break;
4030 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 3716 if (option (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 3718 scr_erase_screen (2);
4034 scr_change_screen (state); 3719 scr_change_screen (state);
4035 break; 3720 break;
4036 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 3722 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 3723 if (option (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 3725 scr_erase_screen (2);
4041 break; 3726 break;
4042 default: 3727 default:
4043 break; 3728 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 3754 rendset = 0, rendstyle = ~RS_None;
4070 break; 3755 break;
4071 case 1: 3756 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 3757 rendset = 1, rendstyle = RS_Bold;
4073 break; 3758 break;
4074 //case 2: // faint or second colour 3759 //case 2: // low intensity
4075 //case 3: // italic 3760 case 3:
3761 rendset = 1, rendstyle = RS_Italic;
3762 break;
4076 case 4: 3763 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 3764 rendset = 1, rendstyle = RS_Uline;
4078 break; 3765 break;
4079 case 5: // slowly blinking 3766 case 5: // slowly blinking
4080 case 6: // rapidly blinking 3767 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 3779 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 3780 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 3781 //...
4095 //case 19: // ninth alt font 3782 //case 19: // ninth alt font
4096 //case 20: // gothic 3783 //case 20: // gothic
4097 case 21: // disable bold, faint 3784 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 3785 rendset = 0, rendstyle = RS_Bold;
4099 break; 3786 break;
4100 case 22: 3787 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 3788 rendset = 0, rendstyle = RS_Bold;
4102 break; 3789 break;
4103 //case 23: disable italic 3790 case 23: // disable italic
3791 rendset = 0, rendstyle = RS_Italic;
3792 break;
4104 case 24: 3793 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 3794 rendset = 0, rendstyle = RS_Uline;
4106 break; 3795 break;
4107 case 25: 3796 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 3797 rendset = 0, rendstyle = RS_Blink;
4109 break; 3798 break;
4110 case 26: 3799 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 3800 rendset = 0, rendstyle = RS_Blink;
4112 break; 3801 break;
4113 case 27: 3802 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 3803 rendset = 0, rendstyle = RS_RVid;
4115 break; 3804 break;
… …
4133 case 35: 3822 case 35:
4134 case 36: 3823 case 36:
4135 case 37: 3824 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3825 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 3826 break;
4138#ifdef TTY_256COLOR 3827 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 3828 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 3829 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3830 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 3831 i += 2;
4144 } 3832 }
4145 break; 3833 break;
4146#endif
4147 case 39: /* default fg */ 3834 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 3835 scr_color (Color_fg, Color_fg);
4149 break; 3836 break;
4150 3837
4151 case 40: 3838 case 40:
… …
4156 case 45: 3843 case 45:
4157 case 46: 3844 case 46:
4158 case 47: 3845 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3846 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 3847 break;
4161#ifdef TTY_256COLOR 3848 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 3849 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 3850 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3851 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 3852 i += 2;
4167 } 3853 }
4168 break; 3854 break;
4169#endif
4170 case 49: /* default bg */ 3855 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
4172 break; 3857 break;
4173 3858
4174#ifndef NO_BRIGHTCOLOR 3859 //case 50: // not variable spacing
3860
3861#if !ENABLE_MINIMAL
4175 case 90: 3862 case 90:
4176 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
4177 case 92: 3864 case 92:
4178 case 93: 3865 case 93:
4179 case 94: 3866 case 94:
4180 case 95: 3867 case 95:
4181 case 96: 3868 case 96:
4182 case 97: 3869 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3870 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 3871 break;
4186 case 100: 3872 case 100:
4187 case 101: /* set bright bg color */ 3873 case 101: /* set bright bg color */
4188 case 102: 3874 case 102:
4189 case 103: 3875 case 103:
4190 case 104: 3876 case 104:
4191 case 105: 3877 case 105:
4192 case 106: 3878 case 106:
4193 case 107: 3879 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3880 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 3881 break;
4197#endif 3882#endif
4198
4199 } 3883 }
4200 } 3884 }
4201} 3885}
4202/*}}} */ 3886/*}}} */
4203 3887
… …
4206rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4207{ 3891{
4208 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4209 3893
4210 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4211 { /* query graphics */ 3896 /* query graphics */
4212 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4213 return; 3898 return;
4214 } 3899 }
4215 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4216 do 3901 do
… …
4227 */ 3912 */
4228void 3913void
4229rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
4230{ 3915{
4231 va_list arg_ptr; 3916 va_list arg_ptr;
4232 unsigned char buf[256]; 3917 char buf[256];
4233 3918
4234 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4236 va_end (arg_ptr); 3921 va_end (arg_ptr);
4237 tt_write (buf, strlen (buf)); 3922 tt_write (buf, strlen (buf));
… …
4239 3924
4240/* ---------------------------------------------------------------------- */ 3925/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 3926/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 3927 * or generated by us in response to a query ESC sequence.
4243 */ 3928 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930
4244void 3931void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
4246{ 3933{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
4248 3936
4249 if (len) 3937 if (pty->pty < 0)
3938 return;
3939
3940 if (v_buflen == 0)
3941 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943
3944 if ((unsigned int)written == len)
3945 return;
3946
3947 data += written;
3948 len -= written;
4250 { 3949 }
3950
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3952
3953 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len;
3955
3956 pty_ev.set (ev::READ | ev::WRITE);
3957}
3958
3959void rxvt_term::pty_write ()
3960{
3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3962
3963 if (written > 0)
3964 {
3965 v_buflen -= written;
3966
4251 if (v_buflen == 0) 3967 if (v_buflen == 0)
4252 { 3968 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 3969 free (v_buffer);
4280 v_buffer = 0; 3970 v_buffer = 0;
4281 v_buflen = 0;
4282 3971
4283 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 3973 return;
4296 } 3974 }
3975
3976 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 3977 }
3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3979 pty_ev.set (ev::READ);
4298} 3980}
4299 3981
4300/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4301 3983

Diff Legend

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