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.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

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

Diff Legend

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