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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.453 by sf-exg, Wed Aug 18 17:45:42 2010 UTC

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

Diff Legend

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