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

Diff Legend

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