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

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

Diff Legend

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