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

Diff Legend

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