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.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs.
Revision 1.538 by sf-exg, Thu Apr 11 08:13:43 2013 UTC

… …
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>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2007 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
305{ 407{
306 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
307 KeySym keysym; 409 KeySym keysym;
308 int valid_keysym; 410 int valid_keysym;
… …
321 */ 423 */
322 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
325 427
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 428 kbuf[0] = 0;
333 429
334#ifdef USE_XIM 430#if USE_XIM
335 if (Input_Context) 431 if (Input_Context)
336 { 432 {
337 Status status_return; 433 Status status_return;
338 434
339#if 0 435#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 508#else
413 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
414#endif 510#endif
511 max_it (lnsppg, 1);
512
415 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
416 { 514 {
417 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
418 return; 516 return;
419 } 517 }
420 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
421 { 519 {
422 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
423 return; 521 return;
424 } 522 }
425 } 523 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
428 { 526 {
429 if (keysym == XK_Up) 527 if (keysym == XK_Up)
430 { 528 {
431 scr_page (UP, 1); 529 scr_page (1);
432 return; 530 return;
433 } 531 }
434 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
435 { 533 {
436 scr_page (DN, 1); 534 scr_page (-1);
437 return; 535 return;
438 } 536 }
439 } 537 }
440#endif 538#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
443 { 541 {
444 if (keysym == XK_Home) 542 if (keysym == XK_Home)
445 { 543 {
446 scr_move_to (0, 1); 544 scr_changeview (top_row);
447 return; 545 return;
448 } 546 }
449 else if (keysym == XK_End) 547 else if (keysym == XK_End)
450 { 548 {
451 scr_move_to (1, 1); 549 scr_changeview (0);
452 return; 550 return;
453 } 551 }
454 } 552 }
455#endif 553#endif
456 } 554 }
… …
472 selection_request (ev.time); 570 selection_request (ev.time);
473 return; 571 return;
474#if TODO 572#if TODO
475 /* rxvt extras */ 573 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 575 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 577 return;
482#endif 578#endif
483 } 579 }
484 } 580 }
485 } 581 }
486 582
487#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 584 // ISO 14755 support
489 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 586 {
491 int hv; 587 int hv;
492 588
493 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 620 scr_overlay_off ();
525# endif 621# endif
526 iso14755buf = 0; 622 iso14755buf = 0;
527 } 623 }
528 } 624 }
625 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
532 { 629 {
533 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 631# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 643 }
547#endif 644#endif
548 645
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 647 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 649 unsigned int newlen = 1;
553#ifdef XK_KP_Home 650
554 static const KeySym keypadtrans[] = { 651 if (ev.state & ModNumLockMask)
555 XK_KP_7, // XK_KP_Home 652 kp = false;
556 XK_KP_4, // XK_KP_Left 653
557 XK_KP_8, // XK_KP_Up 654 keysym = translate_keypad (keysym, kp);
558 XK_KP_6, // XK_KP_Right 655
559 XK_KP_2, // XK_KP_Down 656 switch (keysym)
560#ifndef UNSHIFTED_SCROLLKEYS 657 {
561 XK_KP_9, // XK_KP_Prior 658#ifndef NO_BACKSPACE_KEY
562 XK_KP_3, // XK_KP_Next 659 case XK_BackSpace:
563#else 660 if (priv_modes & PrivMode_HaveBackSpace)
564 XK_Prior, 661 {
565 XK_Next, 662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
566#endif 663 ^ !!ctrl) ? '\b' : '\177';
567 XK_KP_1, // XK_KP_End 664 kbuf[1] = '\0';
568 XK_KP_5, // XK_KP_Begin
569 }; 665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
570 691
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
572 { 772 {
573 unsigned int index = keysym - XK_KP_Home; 773 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
575 } 778 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
583 switch (keysym)
584 {
585#ifndef NO_BACKSPACE_KEY
586 case XK_BackSpace:
587 if (priv_modes & PrivMode_HaveBackSpace)
588 {
589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590 ^ !!ctrl) ? '\b' : '\177';
591 kbuf[1] = '\0';
592 }
593 else
594 strcpy (kbuf, rs[Rs_backspace_key]);
595 break; 779 break;
596#endif
597#ifndef NO_DELETE_KEY
598 case XK_Delete:
599 strcpy (kbuf, rs[Rs_delete_key]);
600 break;
601#endif
602 case XK_Tab:
603 if (shft)
604 strcpy (kbuf, "\033[Z");
605 else
606 {
607#ifdef CTRL_TAB_MAKES_META
608 if (ctrl)
609 meta = 1;
610#endif
611#ifdef MOD4_TAB_MAKES_META
612 if (ev.state & Mod4Mask)
613 meta = 1;
614#endif
615 newlen = 0;
616 }
617 break;
618
619 case XK_Up: /* "\033[A" */
620 case XK_Down: /* "\033[B" */
621 case XK_Right: /* "\033[C" */
622 case XK_Left: /* "\033[D" */
623 strcpy (kbuf, "\033[Z");
624 kbuf[2] = "DACB"[keysym - XK_Left];
625 /* do Shift first */
626 if (shft)
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 else if (ctrl)
629 {
630 kbuf[1] = 'O';
631 kbuf[2] = "dacb"[keysym - XK_Left];
632 }
633 else if (priv_modes & PrivMode_aplCUR)
634 kbuf[1] = 'O';
635 break;
636
637#ifndef UNSHIFTED_SCROLLKEYS
638 case XK_Prior:
639 strcpy (kbuf, "\033[5~");
640 break;
641 case XK_Next:
642 strcpy (kbuf, "\033[6~");
643 break;
644#endif
645 case XK_KP_Enter:
646 /* allow shift to override */
647 if (kp)
648 {
649 strcpy (kbuf, "\033OM");
650 break;
651 }
652
653 /* FALLTHROUGH */
654
655 case XK_Return:
656 if (priv_modes & PrivMode_LFNL)
657 {
658 kbuf[0] = '\015';
659 kbuf[1] = '\012';
660 kbuf[2] = '\0';
661 }
662 else
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\0';
666 }
667 break;
668
669 case XK_KP_F1: /* "\033OP" */
670 case XK_KP_F2: /* "\033OQ" */
671 case XK_KP_F3: /* "\033OR" */
672 case XK_KP_F4: /* "\033OS" */
673 strcpy (kbuf, "\033OP");
674 kbuf[2] += (keysym - XK_KP_F1);
675 break;
676
677 case XK_KP_Multiply: /* "\033Oj" : "*" */
678 case XK_KP_Add: /* "\033Ok" : "+" */
679 case XK_KP_Separator: /* "\033Ol" : "," */
680 case XK_KP_Subtract: /* "\033Om" : "-" */
681 case XK_KP_Decimal: /* "\033On" : "." */
682 case XK_KP_Divide: /* "\033Oo" : "/" */
683 case XK_KP_0: /* "\033Op" : "0" */
684 case XK_KP_1: /* "\033Oq" : "1" */
685 case XK_KP_2: /* "\033Or" : "2" */
686 case XK_KP_3: /* "\033Os" : "3" */
687 case XK_KP_4: /* "\033Ot" : "4" */
688 case XK_KP_5: /* "\033Ou" : "5" */
689 case XK_KP_6: /* "\033Ov" : "6" */
690 case XK_KP_7: /* "\033Ow" : "7" */
691 case XK_KP_8: /* "\033Ox" : "8" */
692 case XK_KP_9: /* "\033Oy" : "9" */
693 /* allow shift to override */
694 if (kp)
695 {
696 strcpy (kbuf, "\033Oj");
697 kbuf[2] += (keysym - XK_KP_Multiply);
698 }
699 else
700 {
701 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702 kbuf[1] = '\0';
703 }
704 break;
705
706 case XK_Find:
707 strcpy (kbuf, "\033[1~");
708 break;
709
710 case XK_Insert:
711 strcpy (kbuf, "\033[2~");
712 break;
713#ifdef DXK_Remove /* support for DEC remove like key */
714 case DXK_Remove:
715 /* FALLTHROUGH */
716#endif
717 case XK_Execute:
718 strcpy (kbuf, "\033[3~");
719 break;
720 case XK_Select:
721 strcpy (kbuf, "\033[4~");
722 break;
723 case XK_End:
724 strcpy (kbuf, KS_END);
725 break;
726 case XK_Home:
727 strcpy (kbuf, KS_HOME);
728 break;
729
730#define FKEY(n, fkey) \
731 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733 case XK_F1: /* "\033[11~" */
734 case XK_F2: /* "\033[12~" */
735 case XK_F3: /* "\033[13~" */
736 case XK_F4: /* "\033[14~" */
737 case XK_F5: /* "\033[15~" */
738 FKEY (11, XK_F1);
739 break;
740 case XK_F6: /* "\033[17~" */
741 case XK_F7: /* "\033[18~" */
742 case XK_F8: /* "\033[19~" */
743 case XK_F9: /* "\033[20~" */
744 case XK_F10: /* "\033[21~" */
745 FKEY (17, XK_F6);
746 break;
747 case XK_F11: /* "\033[23~" */
748 case XK_F12: /* "\033[24~" */
749 case XK_F13: /* "\033[25~" */
750 case XK_F14: /* "\033[26~" */
751 FKEY (23, XK_F11);
752 break;
753 case XK_F15: /* "\033[28~" */
754 case XK_F16: /* "\033[29~" */
755 FKEY (28, XK_F15);
756 break;
757 case XK_Help: /* "\033[28~" */
758 FKEY (28, XK_Help);
759 break;
760 case XK_Menu: /* "\033[29~" */
761 FKEY (29, XK_Menu);
762 break;
763 case XK_F17: /* "\033[31~" */
764 case XK_F18: /* "\033[32~" */
765 case XK_F19: /* "\033[33~" */
766 case XK_F20: /* "\033[34~" */
767 case XK_F21: /* "\033[35~" */
768 case XK_F22: /* "\033[36~" */
769 case XK_F23: /* "\033[37~" */
770 case XK_F24: /* "\033[38~" */
771 case XK_F25: /* "\033[39~" */
772 case XK_F26: /* "\033[40~" */
773 case XK_F27: /* "\033[41~" */
774 case XK_F28: /* "\033[42~" */
775 case XK_F29: /* "\033[43~" */
776 case XK_F30: /* "\033[44~" */
777 case XK_F31: /* "\033[45~" */
778 case XK_F32: /* "\033[46~" */
779 case XK_F33: /* "\033[47~" */
780 case XK_F34: /* "\033[48~" */
781 case XK_F35: /* "\033[49~" */
782 FKEY (31, XK_F17);
783 break;
784#undef FKEY
785 default:
786 newlen = 0;
787 break;
788 } 780 }
789 781
790 if (newlen) 782 if (newlen)
791 len = strlen (kbuf); 783 len = strlen (kbuf);
792 784
785 if (len > 0)
786 {
793 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
794 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
795 */ 801 */
796#ifdef META8_OPTION 802#ifdef META8_OPTION
797 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
798 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
799#endif 805#endif
806 }
800 807
801 } 808 }
802 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
803 { 810 {
804 len = 1; 811 len = 1;
… …
838 { 845 {
839 view_start = 0; 846 view_start = 0;
840 want_refresh = 1; 847 want_refresh = 1;
841 } 848 }
842 849
843 /*
844 * these modifications only affect the static keybuffer
845 * pass Shift/Control indicators for function keys ending with `~'
846 *
847 * eg,
848 * Prior = "ESC[5~"
849 * Shift+Prior = "ESC[5$"
850 * Ctrl+Prior = "ESC[5^"
851 * Ctrl+Shift+Prior = "ESC[5@"
852 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
853 */
854 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
855 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
856
857 /* escape prefix */ 850 /* escape prefix */
858 if (meta 851 if (meta
859#ifdef META8_OPTION 852#ifdef META8_OPTION
860 && meta_char == C0_ESC 853 && meta_char == C0_ESC
861#endif 854#endif
… …
866 } 859 }
867 860
868 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
869} 862}
870 863
871void 864void ecb_cold
872rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
873{ 866{
874#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
875 KeySym keysym; 868 KeySym keysym;
876 869
… …
896 commit_iso14755 (); 889 commit_iso14755 ();
897 890
898 return; 891 return;
899 } 892 }
900 893
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
902 if (i[0] == keysym) 895 if (i[0] == keysym)
903 { 896 {
904 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 (); 898 commit_iso14755 ();
906 899
… …
943 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
944 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
945#endif 938#endif
946} 939}
947 940
948#if defined (KEYSYM_RESOURCE)
949unsigned int
950rxvt_term::cmd_write (const char *str, unsigned int count)
951{
952 unsigned int n, s;
953
954 n = cmdbuf_ptr - cmdbuf_base;
955 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
956
957 if (n > 0 && s < count)
958 {
959 memmove (cmdbuf_base, cmdbuf_ptr,
960 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
961 cmdbuf_ptr = cmdbuf_base;
962 cmdbuf_endp -= n;
963 s += n;
964 }
965
966 if (count > s)
967 {
968 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
969 count = s;
970 }
971
972 for (; count--;)
973 *cmdbuf_endp++ = *str++;
974
975 cmd_parse ();
976
977 return 0;
978}
979#endif
980
981void 941void
982rxvt_term::flush () 942rxvt_term::flush ()
983{ 943{
984 flush_ev.stop (); 944 flush_ev.stop ();
985 945
986#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
987 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
988 { 948 {
989// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
990 scr_touch (false); 950 scr_touch (false);
991 } 951 }
992#endif 952#endif
993 953
994 if (want_refresh) 954 if (want_refresh)
… …
1030 } 990 }
1031 while (row < end_row); 991 while (row < end_row);
1032 } 992 }
1033 993
1034 scr_refresh (); 994 scr_refresh ();
1035 scrollbar_show (1); 995 scrollBar.show (1);
1036#ifdef USE_XIM 996#if USE_XIM
1037 IMSendSpot (); 997 im_send_spot ();
1038#endif 998#endif
1039 } 999 }
1040 1000
1041 display->flush (); 1001 display->flush ();
1042} 1002}
1043 1003
1044/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1045void 1005void
1046rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1047{ 1007{
1048 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1059 refresh_count = 0; 1019 refresh_count = 0;
1060 flush (); 1020 flush ();
1061} 1021}
1062 1022
1063#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1064void 1039void
1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1066{ 1041{
1067 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1068 want_refresh = 1; 1043 want_refresh = 1;
… …
1087 1062
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1064void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1066{
1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1094 { 1069 {
1095 want_refresh = 1; 1070 want_refresh = 1;
1096 refresh_check (); 1071 refresh_check ();
1097 } 1072 }
1098 else 1073 else
… …
1142 { 1117 {
1143 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1147 1125
1148 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1150 1128
1151 w.stop (); 1129 w.stop ();
1152 } 1130 }
1153 1131
… …
1156 { 1134 {
1157 } 1135 }
1158} event_handler; 1136} event_handler;
1159#endif 1137#endif
1160 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1161bool 1172bool
1162rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1163{ 1174{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1165 1176
1166 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1178
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1169 n = 0;
1170 } 1180 {
1171 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1173 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1175 1186
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1188
1178 if (r > 0) 1189 if (r > 0)
1179 { 1190 {
1180 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1181 return true; 1192 return true;
… …
1203{ 1214{
1204 make_current (); 1215 make_current ();
1205 1216
1206 if (revents & ev::READ) 1217 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1220 cmd_parse ();
1210 break;
1211 1221
1212 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1213 pty_write (); 1223 pty_write ();
1214 1224
1215 refresh_check (); 1225 refresh_check ();
1216} 1226}
1217 1227
1218void 1228void ecb_cold
1219rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1220{ 1230{
1221 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1222 recolour_cursor (); 1232 recolour_cursor ();
1223 1233
… …
1228 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1229#endif 1239#endif
1230} 1240}
1231 1241
1232#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1233void 1243void ecb_cold
1234rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1235{ 1245{
1236 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1237 return; 1247 return;
1238 1248
… …
1240 XFlush (dpy); 1250 XFlush (dpy);
1241 1251
1242 hidden_pointer = 1; 1252 hidden_pointer = 1;
1243} 1253}
1244 1254
1245void 1255void ecb_cold
1246rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1247{ 1257{
1248 make_current (); 1258 make_current ();
1249 1259
1250 pointer_blank (); 1260 pointer_blank ();
… …
1256{ 1266{
1257 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1258 int x, y; 1268 int x, y;
1259 int code = 32; 1269 int code = 32;
1260 1270
1261 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1262 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1263 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1264 { 1275 {
1265 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1266 return; 1277 return;
1278
1267 mouse_row = x; 1279 mouse_row = x;
1268 mouse_col = y; 1280 mouse_col = y;
1269 code += 32; 1281 code += 32;
1270 } 1282 }
1271 1283
… …
1274 else 1286 else
1275 { 1287 {
1276 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1277 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1278 if (button_number >= 3) 1290 if (button_number >= 3)
1279 button_number += (64 - 3); 1291 button_number += 64 - 3;
1280 } 1292 }
1281 1293
1282 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1283 { 1295 {
1284 /* 1296 /*
… …
1316 fputc ('A', stderr); 1328 fputc ('A', stderr);
1317 if (key_state & 32) 1329 if (key_state & 32)
1318 fputc ('2', stderr); 1330 fputc ('2', stderr);
1319 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1320 button_number, 1332 button_number,
1321 x + 1, 1333 x,
1322 y + 1); 1334 y);
1323#endif 1335#endif
1324 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1325 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1326 (code + button_number + key_state), 1351 code + button_number + key_state,
1327 (32 + x + 1), 1352 32 + x,
1328 (32 + y + 1)); 1353 32 + y);
1329} 1354}
1330 1355
1331/*{{{ process an X event */ 1356/*{{{ process an X event */
1332void 1357void ecb_hot
1333rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1334{ 1359{
1335 make_current (); 1360 make_current ();
1336 1361
1337 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1435 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1461 focus_out ();
1437 break; 1462 break;
1438 1463
1439 case ConfigureNotify: 1464 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1443 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1444 { 1466 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1447 1502
1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1504 {
1450 seen_resize = 1; 1505 seen_resize = 1;
1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1507 }
1453 else 1508 else
1454 { 1509 {
1455#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped) 1511 if (moved)
1459 update_background (); 1512 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1463#endif 1513#endif
1464 } 1514 }
1465 1515
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1517 }
1468 break; 1518 break;
1469 1519
1470 case PropertyNotify: 1520 case PropertyNotify:
1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1476 break; 1522 break;
1477 1523
1478 case SelectionClear: 1524 case SelectionClear:
1479 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1480 break;
1481
1482 case SelectionNotify:
1483 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 break; 1526 break;
1486 1527
1487 case SelectionRequest: 1528 case SelectionRequest:
1488 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1489 break; 1530 break;
1490 1531
1491 case MapNotify: 1532 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1494 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1497 * reparenting. 1538 // events at startup when the window manager reparents the
1498 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1500 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1507#endif 1543#endif
1508 mapped = 1; 1544 mapped = 1;
1509#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1510 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1525 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1526 { 1562 {
1527 do 1563 do
1528 { 1564 {
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1531 } 1567 }
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1533 1569
1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1535 1571
1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 { 1573 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1540 } 1576 }
1541 1577
1542 want_refresh = 1; 1578 want_refresh = 1;
1543 } 1579 }
1544 else 1580 else
… …
1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1551 ; 1587 ;
1552 1588
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1590 {
1555 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1556 scrollbar_show (0); 1592 scrollBar.show (0);
1557 } 1593 }
1558 } 1594 }
1559 break; 1595 break;
1560 1596
1561 case MotionNotify: 1597 case MotionNotify:
… …
1626 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1627 } 1663 }
1628 else 1664 else
1629 { 1665 {
1630 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1632 } 1668 }
1633 1669
1634 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1672 + 1;
… …
1648#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1649 } 1685 }
1650#endif 1686#endif
1651 } 1687 }
1652 } 1688 }
1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1654 { 1690 {
1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1656 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1657 ; 1693 ;
1658 1694
1659 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1660 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1699 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1701 scrollBar.size ());
1666 want_refresh = 1; 1702 want_refresh = 1;
1667 scrollbar_show (1); 1703 scrollBar.show (1);
1668 } 1704 }
1669 break; 1705 break;
1670 } 1706 }
1671 1707
1672#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1673 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1674 {
1675 if (hidden_cursor)
1676 {
1677 hidden_cursor = 0;
1678 want_refresh = 1;
1679 }
1680
1681 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1682 }
1683#endif 1711#endif
1684 1712
1685#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1687 { 1715 {
… …
1697#endif 1725#endif
1698 1726
1699 refresh_check (); 1727 refresh_check ();
1700} 1728}
1701 1729
1702void 1730#if ENABLE_FRILLS
1731void ecb_cold
1732rxvt_term::set_urgency (bool enable)
1733{
1734 if (enable == urgency_hint)
1735 return;
1736
1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1738 {
1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1740 XSetWMHints (dpy, parent, h);
1741 urgency_hint = enable;
1742 XFree (h);
1743 }
1744}
1745#endif
1746
1747void ecb_cold
1703rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1704{ 1749{
1705 if (!focus) 1750 if (!focus)
1706 { 1751 {
1707 focus = 1; 1752 focus = 1;
1708 want_refresh = 1; 1753 want_refresh = 1;
1709 1754
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711
1712#if USE_XIM 1755#if USE_XIM
1713 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1714 { 1757 {
1715 IMSetPosition (); 1758 im_set_position ();
1716 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1717 } 1760 }
1718#endif 1761#endif
1719#if CURSOR_BLINK 1762#if CURSOR_BLINK
1720 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1727 scr_recolour (); 1770 scr_recolour ();
1728 } 1771 }
1729#endif 1772#endif
1730#if ENABLE_FRILLS 1773#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1774 if (option (Opt_urgentOnBell))
1732 { 1775 set_urgency (0);
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif 1776#endif
1740 }
1741}
1742 1777
1743void 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 }
1780}
1781
1782void ecb_cold
1744rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1745{ 1784{
1746 if (focus) 1785 if (focus)
1747 { 1786 {
1748 focus = 0; 1787 focus = 0;
1749 want_refresh = 1; 1788 want_refresh = 1;
1750 1789
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790#if ENABLE_FRILLS
1752 1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1753#if ENABLE_FRILLS || ISO_14755 1794#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1795 if (iso14755buf)
1755 { 1796 {
1756 iso14755buf = 0; 1797 iso14755buf = 0;
1757# if ISO_14755 1798# if ISO_14755
… …
1774 { 1815 {
1775 pix_colors = pix_colors_unfocused; 1816 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1817 scr_recolour ();
1777 } 1818 }
1778#endif 1819#endif
1779 }
1780}
1781 1820
1782void 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 }
1823}
1824
1825void ecb_cold
1783rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1784{ 1827{
1785#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1787 { 1830 {
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1834 }
1792#endif 1835#endif
1793} 1836}
1794 1837
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1796void 1839void ecb_hot
1797rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1841{
1799 make_current (); 1842 make_current ();
1800 1843
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1846 return;
1804 1847
1805# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1848 switch (ev.type)
1807 { 1849 {
1808 case PropertyNotify: 1850 case PropertyNotify:
1809 /* 1851 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1812 */ 1854 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1857 {
1816 bgPixmap.set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1817 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1818 } 1866 }
1819 1867
1820 break; 1868 break;
1821 } 1869 }
1822# endif
1823 1870
1824 refresh_check (); 1871 refresh_check ();
1825} 1872}
1826#endif 1873#endif
1827 1874
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1864 { 1911 {
1865 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1866 MEvent.clicks++; 1913 MEvent.clicks++;
1867 1914
1868 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1869 { 1916 {
1870 /* only report double clicks */ 1917 /* only report double clicks */
… …
1951 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */ 1999 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */ 2001 direction = DN; /* down */
1955 2002
1956 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1957 /* 2004 /*
1958 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 2006 * move up if mouse is above slider
1960 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1961 * 2008 *
… …
2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 2048#endif
2002 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2003 { 2050 {
2004 if (direction == UP) 2051 if (direction == UP)
2005 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2006 else 2053 else
2007 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2008 } 2055 }
2009 } 2056 }
2010 else 2057 else
2011 switch (ev.button) 2058 switch (ev.button)
2012 { 2059 {
2013 case Button2: 2060 case Button2:
2014 switch (scrollBar.align) 2061 switch (scrollBar.align)
2015 { 2062 {
2016 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2017 csrO = 0; 2064 csrO = 0;
2018 break; 2065 break;
2019 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2020 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2021 break; 2068 break;
2022 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2023 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2024 break; 2071 break;
2025 } 2072 }
2026 2073
2027 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2028 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2031 2078
2032 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2033 break; 2080 break;
2034 2081
2035 case Button1: 2082 case Button1:
2036 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2039 2086
2040 case Button3: 2087 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2042 { 2089 {
2043 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2044# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2045 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2046# else 2093# else
2047 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2048# endif 2095# endif
2049 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2051 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2052# else 2099# else
2053 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2054# endif 2101# endif
2055 else 2102 else
2056 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2057 } 2104 }
2058 else 2105 else
2059 { 2106 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2108 (nrow
2062 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2063 / scrollbar_size ())); 2110 / scrollBar.size ()));
2064 } 2111 }
2065 2112
2066 break; 2113 break;
2067 } 2114 }
2068 } 2115 }
… …
2078 2125
2079 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2127 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2129
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2084 { 2131 {
2085 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2086 scrollbar_show (0); 2133 scrollBar.show (0);
2087 } 2134 }
2088 2135
2089#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2091#endif 2138#endif
… …
2140 case Button3: 2187 case Button3:
2141 selection_make (ev.time); 2188 selection_make (ev.time);
2142 break; 2189 break;
2143 2190
2144 case Button2: 2191 case Button2:
2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2194 break;
2148 2195
2149#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2150 case Button4: 2197 case Button4:
2151 case Button5: 2198 case Button5:
2152 { 2199 {
2153 int i; 2200 int lines;
2154 page_dirn v; 2201 page_dirn dirn;
2155 2202
2156 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2157 2204
2158 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2159 i = 1; 2206 lines = 1;
2160 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2161 i = nrow - 1; 2208 lines = nrow - 1;
2162 else 2209 else
2163 i = 5; 2210 lines = 5;
2164 2211
2165# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2166 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2167 { 2214 {
2168 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2171 2218
2172 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2174 } 2221 }
2175 else 2222 else
2176# endif 2223# endif
2177 { 2224 {
2178 scr_page (v, i); 2225 scr_page (dirn, lines);
2179 scrollbar_show (1); 2226 scrollBar.show (1);
2180 } 2227 }
2181 } 2228 }
2182 break; 2229 break;
2183#endif 2230#endif
2184 } 2231 }
2185 } 2232 }
2186} 2233}
2187 2234
2188/*}}} */ 2235/*}}} */
2189 2236
2190bool 2237void ecb_hot
2191rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2192{ 2239{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2196 2242
2197 for (;;) 2243 for (;;)
2198 { 2244 {
2199 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2200 { 2246 {
2201 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2248 ch = next_char ();
2203 2249
2204 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2205 break; 2251 break;
2206 } 2252 }
2207 2253
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2255 {
2210 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2211 { 2257 {
2212 seen_input = 1; 2258 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2274 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2276
2231 for (;;) 2277 for (;;)
2232 { 2278 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2280 break;
2235 2281
2236 *str++ = ch; 2282 *str++ = ch;
2237 2283
2238 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2285 {
2240 if (ch == C0_LF) 2286 if (ch == C0_LF)
2241 nlines++; 2287 nlines++;
2242 2288
2243 refresh_count++; 2289 refresh_count++;
… …
2292 * What the heck we'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2294 */ 2340 */
2295 if (refreshnow) 2341 if (refreshnow)
2296 { 2342 {
2297 flag = true;
2298 scr_refresh (); 2343 scr_refresh ();
2299 want_refresh = 1; 2344 want_refresh = 1;
2300 } 2345 }
2301
2302 } 2346 }
2303 else 2347 else
2304 { 2348 {
2305 try 2349 try
2306 { 2350 {
… …
2314 } 2358 }
2315 2359
2316 ch = NOCHAR; 2360 ch = NOCHAR;
2317 } 2361 }
2318 } 2362 }
2319
2320 return flag;
2321} 2363}
2322 2364
2323// read the next character 2365// read the next character
2324wchar_t 2366wchar_t ecb_hot
2325rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2326{ 2368{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2370 {
2329 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2332 2374
2333 wchar_t wc; 2375 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2377
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2382 break;
2341 } 2383 }
2342 2384
2343 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2391 }
2345 2392
2346 // assume wchar == unicode 2393 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2395 return wc & UNICODE_MASK;
2349 } 2396 }
2350 2397
2351 return NOCHAR; 2398 return NOCHAR;
2352} 2399}
2353 2400
2354// read the next octet 2401// read the next octet
2355uint32_t 2402uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2357{ 2404{
2358 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2407 : NOCHAR;
2361} 2408}
2362 2409
2363static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2364 2411
2365/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2414{
2373 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2374 2416
2375 if (c == NOCHAR) 2417 if (c == NOCHAR)
2376 throw out_of_input; 2418 throw out_of_input;
2377 2419
2378 return c; 2420 return c;
2379} 2421}
2380 2422
2381uint32_t 2423uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2383{ 2425{
2384 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2385 2427
2386 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2390} 2432}
2391 2433
2392/*{{{ print pipe */ 2434/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2395FILE * 2437FILE * ecb_cold
2396rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2397{ 2439{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2441
2400 if (stream == NULL) 2442 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2444
2403 return stream; 2445 return stream;
2404} 2446}
2405 2447
2406int 2448int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2408{ 2450{
2409 fflush (stream); 2451 fflush (stream);
2410 return pclose (stream); 2452 return pclose (stream);
2411} 2453}
2412 2454
2413/* 2455/*
2414 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2415 */ 2457 */
2416void 2458void ecb_cold
2417rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2418{ 2460{
2419 int done; 2461 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2462
2422 if ((fd = popen_printer ()) == NULL) 2463 if (!fd)
2423 return; 2464 return;
2424 2465
2425 /* 2466 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2467 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2468 * is received.
2428 */ 2469 */
2429 for (done = 0; !done;) 2470 for (int done = 0; !done; )
2430 { 2471 {
2431 unsigned char buf[8]; 2472 unsigned char buf[8];
2432 unicode_t ch; 2473 unicode_t ch;
2433 unsigned int i, len; 2474 unsigned int i, len;
2434 2475
… …
2468 pclose_printer (fd); 2509 pclose_printer (fd);
2469} 2510}
2470#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2471/*}}} */ 2512/*}}} */
2472 2513
2473/* *INDENT-OFF* */
2474enum { 2514enum {
2475 C1_40 = 0x40, 2515 C1_40 = 0x40,
2476 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2477 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2478 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2479 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2480}; 2520};
2481/* *INDENT-ON* */
2482 2521
2483/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2484void 2523void ecb_hot
2485rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2486{ 2525{
2487 switch (ch) 2526 switch (ch)
2488 { 2527 {
2489 case C0_ESC: 2528 case C0_ESC:
… …
2535} 2574}
2536/*}}} */ 2575/*}}} */
2537 2576
2538 2577
2539/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2540void 2579void ecb_cold
2541rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2542{ 2581{
2543 int row, col; 2582 int row, col;
2544 2583
2545 switch (ch) 2584 switch (ch)
… …
2579 break; 2618 break;
2580 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2621 break;
2583 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2623 priv_modes &= ~PrivMode_vt52;
2585 break; 2624 break;
2586 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2588 /* unimplemented */ 2627 /* unimplemented */
2589 break; 2628 break;
… …
2595} 2634}
2596/*}}} */ 2635/*}}} */
2597 2636
2598 2637
2599/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2600void 2639void ecb_hot
2601rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2602{ 2641{
2603 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2604 2643
2605 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2608 return; 2647 return;
2609 } 2648 }
2610 2649
2611 switch (ch) 2650 switch (ch)
2612 { 2651 {
2613 /* case 1: do_tek_mode (); break; */
2614 case '#': 2652 case '#':
2615 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2616 scr_E (); 2654 scr_E ();
2617 break; 2655 break;
2618 case '(': 2656 case '(':
… …
2641#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2642 case '9': 2680 case '9':
2643 scr_forwardindex (); 2681 scr_forwardindex ();
2644 break; 2682 break;
2645#endif 2683#endif
2684 // DECPAM/DECPNM
2646 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2647 case '>': 2688 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2689 priv_modes &= ~PrivMode_aplKP;
2649 break; 2690 break;
2650 2691
2651 case C1_40: 2692 case C1_40:
2652 cmd_getc (); 2693 cmd_getc ();
2653 break; 2694 break;
… …
2657 2698
2658 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2660 { 2701 {
2661 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2663 } 2704 }
2664 break; 2705 break;
2665 2706
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
2668 process_graphics (); 2709 // used by original rxvt for rob nations own graphics mode
2710 if (cmd_getc () == 'Q')
2711 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2669 break; 2712 break;
2670 2713
2671 /* 8.3.63: CHARACTER TABULATION SET */ 2714 /* 8.3.63: CHARACTER TABULATION SET */
2672 case C1_HTS: /* ESC H */ 2715 case C1_HTS: /* ESC H */
2673 scr_set_tab (1); 2716 scr_set_tab (1);
… …
2677 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
2678 scr_index (DN); 2721 scr_index (DN);
2679 break; 2722 break;
2680 2723
2681 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
2682 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
2683 2726
2684 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
2685 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
2686 2729
2687 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
2688 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
2689 process_dcs_seq (); 2732 process_dcs_seq ();
2690 break; 2733 break;
… …
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2735 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2736 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2737 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2738 break; /* steal obsolete ESC [ c */
2696 2739
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2740 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2741 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2742 process_csi_seq ();
2700 break; 2743 break;
2701 2744
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2745 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2746 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2747 process_osc_seq ();
2705 break; 2748 break;
2706 2749
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2750 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2751 case 'c':
2709 mbstate.reset (); 2752 mbstate.reset ();
2710 scr_poweron (); 2753 scr_poweron ();
2711 scrollbar_show (1); 2754 scrollBar.show (1);
2712 break; 2755 break;
2713 2756
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2757 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2758 case 'n':
2716 scr_charset_choose (2); 2759 scr_charset_choose (2);
… …
2723 } 2766 }
2724} 2767}
2725/*}}} */ 2768/*}}} */
2726 2769
2727/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2770/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2728/* *INDENT-OFF* */
2729enum { 2771enum {
2730 CSI_ICH = 0x40, 2772 CSI_ICH = 0x40,
2731 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2773 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2732 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2774 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2733 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2775 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2736 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2778 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2737 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2779 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2738 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2780 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2739}; 2781};
2740 2782
2741#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2783#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2742 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2784 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2743 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2785 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2744#define get_byte_array_bit(array, bit) \ 2786#define get_byte_array_bit(array, bit) \
2745 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2787 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2746 2788
2747const unsigned char csi_defaults[] = 2789static const unsigned char csi_defaults[] =
2748 { 2790 {
2749 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2791 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2750 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2792 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2751 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2793 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2752 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2794 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2753 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2795 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2754 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2755 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2756 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2757 }; 2799 };
2758/* *INDENT-ON* */
2759 2800
2760void 2801void ecb_hot
2761rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2762{ 2803{
2763 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2764 unsigned int nargs, p; 2805 unsigned int nargs, p;
2765 int n, ndef; 2806 int n, ndef;
2766 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2767 2808
2768 nargs = 0; 2809 nargs = 0;
2769 2810
2770 priv = 0; 2811 priv = 0;
2771 ch = cmd_getc (); 2812 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2813 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2814 {
2774 /* '<' '=' '>' '?' */ 2815 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2816 priv = ch;
2776 ch = cmd_getc (); 2817 ch = cmd_getc ();
2777 } 2818 }
2778 2819
2820 prev_ch = 0;
2779 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2780 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2781 { 2823 {
2782 if (isdigit (ch)) 2824 if (isdigit (ch))
2783 { 2825 {
… …
2793 n = -1; 2835 n = -1;
2794 } 2836 }
2795 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2796 process_nonprinting (ch); 2838 process_nonprinting (ch);
2797 2839
2840 prev_ch = ch;
2798 ch = cmd_getc (); 2841 ch = cmd_getc ();
2799 } 2842 }
2800 2843
2801 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2802 return; 2845 return;
… …
2833 2876
2834 case '?': 2877 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2838 } 2893 }
2894 break;
2895 }
2896
2839 return; 2897 return;
2840 } 2898 }
2841 2899
2842 switch (ch) 2900 switch (ch)
2843 { 2901 {
… …
2857 } 2915 }
2858 break; 2916 break;
2859#endif 2917#endif
2860 2918
2861 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2862 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2863 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2864 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2865 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2866 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2867 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2868 break; 2926 break;
2869 2927
2870 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2871 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3021 scr_insert_mode (1); 3079 scr_insert_mode (1);
3022 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3023 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3024 break; 3082 break;
3025 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3026 /* 3089 /*
3027 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3028 */ 3091 */
3029 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3030 if (nargs == 1) 3093 if (nargs == 1)
… …
3058 } 3121 }
3059} 3122}
3060/*}}} */ 3123/*}}} */
3061 3124
3062#if !ENABLE_MINIMAL 3125#if !ENABLE_MINIMAL
3063/* ARGSUSED */
3064void 3126void
3065rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3127rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3066{ 3128{
3067 int x, y; 3129 int x, y;
3068 XWindowAttributes wattr; 3130 XWindowAttributes wattr;
… …
3077 { 3139 {
3078 /* 3140 /*
3079 * commands 3141 * commands
3080 */ 3142 */
3081 case 1: /* deiconify window */ 3143 case 1: /* deiconify window */
3082 XMapWindow (dpy, parent[0]); 3144 XMapWindow (dpy, parent);
3083 break; 3145 break;
3084 case 2: /* iconify window */ 3146 case 2: /* iconify window */
3085 XIconifyWindow (dpy, parent[0], display->screen); 3147 XIconifyWindow (dpy, parent, display->screen);
3086 break; 3148 break;
3087 case 3: /* set position (pixels) */ 3149 case 3: /* set position (pixels) */
3088 XMoveWindow (dpy, parent[0], args[1], args[2]); 3150 XMoveWindow (dpy, parent, args[1], args[2]);
3089 break; 3151 break;
3090 case 4: /* set size (pixels) */ 3152 case 4: /* set size (pixels) */
3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3153 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3092 break; 3154 break;
3093 case 5: /* raise window */ 3155 case 5: /* raise window */
3094 XRaiseWindow (dpy, parent[0]); 3156 XRaiseWindow (dpy, parent);
3095 break; 3157 break;
3096 case 6: /* lower window */ 3158 case 6: /* lower window */
3097 XLowerWindow (dpy, parent[0]); 3159 XLowerWindow (dpy, parent);
3098 break; 3160 break;
3099 case 7: /* refresh window */ 3161 case 7: /* refresh window */
3100 scr_touch (true); 3162 scr_touch (true);
3101 break; 3163 break;
3102 case 8: /* set size (chars) */ 3164 case 8: /* set size (chars) */
… …
3105 break; 3167 break;
3106 3168
3107 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3108 default: 3170 default:
3109 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3110 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3111 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3112 break; 3174 break;
3113 3175
3114 /* 3176 /*
3115 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
3116 */ 3178 */
3117 case 11: /* report window state */ 3179 case 11: /* report window state */
3118 XGetWindowAttributes (dpy, parent[0], &wattr); 3180 XGetWindowAttributes (dpy, parent, &wattr);
3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3181 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3120 break; 3182 break;
3121 case 13: /* report window position */ 3183 case 13: /* report window position */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3184 XGetWindowAttributes (dpy, parent, &wattr);
3123 XTranslateCoordinates (dpy, parent[0], wattr.root, 3185 XTranslateCoordinates (dpy, parent, wattr.root,
3124 -wattr.border_width, -wattr.border_width, 3186 -wattr.border_width, -wattr.border_width,
3125 &x, &y, &wdummy); 3187 &x, &y, &wdummy);
3126 tt_printf ("\033[3;%d;%dt", x, y); 3188 tt_printf ("\033[3;%d;%dt", x, y);
3127 break; 3189 break;
3128 case 14: /* report window size (pixels) */ 3190 case 14: /* report window size (pixels) */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3192 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3131 break; 3193 break;
3132 case 18: /* report text area size (chars) */ 3194 case 18: /* report text area size (chars) */
3133 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3134 break; 3196 break;
… …
3136 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3198 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3137 break; 3199 break;
3138 case 20: /* report icon label */ 3200 case 20: /* report icon label */
3139 { 3201 {
3140 char *s; 3202 char *s;
3141 XGetIconName (dpy, parent[0], &s); 3203 XGetIconName (dpy, parent, &s);
3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3143 XFree (s); 3205 XFree (s);
3144 } 3206 }
3145 break; 3207 break;
3146 case 21: /* report window title */ 3208 case 21: /* report window title */
3147 { 3209 {
3148 char *s; 3210 char *s;
3149 XFetchName (dpy, parent[0], &s); 3211 XFetchName (dpy, parent, &s);
3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3212 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3151 XFree (s); 3213 XFree (s);
3152 } 3214 }
3153 break; 3215 break;
3154 } 3216 }
… …
3210 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3272 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3211 */ 3273 */
3212void 3274void
3213rxvt_term::process_dcs_seq () 3275rxvt_term::process_dcs_seq ()
3214{ 3276{
3215 char *s;
3216 unicode_t eh;
3217
3218 /* 3277 /*
3219 * Not handled yet 3278 * Not handled yet
3220 */ 3279 */
3280
3281 unicode_t eh;
3221 s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3222 if (s) 3283 if (s)
3223 free (s); 3284 free (s);
3224 3285
3225 return; 3286 return;
3226} 3287}
… …
3230 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3291 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3231 */ 3292 */
3232void 3293void
3233rxvt_term::process_osc_seq () 3294rxvt_term::process_osc_seq ()
3234{ 3295{
3235 unicode_t ch, eh;
3236 int arg; 3296 int arg;
3237 3297
3238 ch = cmd_getc (); 3298 unicode_t ch = cmd_getc ();
3239 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3299 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3240 arg = arg * 10 + (ch - '0'); 3300 arg = arg * 10 + (ch - '0');
3241 3301
3242 if (ch == ';') 3302 if (ch == ';')
3243 { 3303 {
3304 unicode_t eh;
3244 char *s = get_to_st (eh); 3305 char *s = get_to_st (eh);
3245 3306
3246 if (s) 3307 if (s)
3247 { 3308 {
3248 process_xterm_seq (arg, s, eh); 3309 process_xterm_seq (arg, s, eh);
… …
3272 3333
3273/* 3334/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3335 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3336 */
3276void 3337void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3338rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3339{
3279 int color; 3340 int color;
3280 char *buf, *name; 3341 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3342 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3343 int saveop = op;
… …
3309 unsigned long bytes_after; 3370 unsigned long bytes_after;
3310 unsigned char *value = 0; 3371 unsigned char *value = 0;
3311 const char *str = ""; 3372 const char *str = "";
3312 3373
3313 if (prop 3374 if (prop
3314 && XGetWindowProperty (dpy, parent[0], 3375 && XGetWindowProperty (dpy, parent,
3315 prop, 0, 1<<16, 0, AnyPropertyType, 3376 prop, 0, 1<<16, 0, AnyPropertyType,
3316 &actual_type, &actual_format, 3377 &actual_type, &actual_format,
3317 &nitems, &bytes_after, &value) == Success 3378 &nitems, &bytes_after, &value) == Success
3318 && actual_type != None 3379 && actual_type != None
3319 && actual_format == 8) 3380 && actual_format == 8)
… …
3323 3384
3324 XFree (value); 3385 XFree (value);
3325 } 3386 }
3326 else 3387 else
3327 { 3388 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3389 char *eq = strchr (str, '=');
3329 3390
3330 if (eq) 3391 if (eq)
3331 { 3392 {
3332 *eq = 0; 3393 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3394 set_utf8_property (display->atom (str), eq + 1);
3334 } 3395 }
3335 else 3396 else
3336 XDeleteProperty (dpy, parent[0], 3397 XDeleteProperty (dpy, parent,
3337 display->atom (str)); 3398 display->atom (str));
3338 } 3399 }
3339 break; 3400 break;
3340 3401
3341 case XTerm_Color: 3402 case XTerm_Color:
… …
3373 process_color_seq (op, Color_pointer_fg, str, resp); 3434 process_color_seq (op, Color_pointer_fg, str, resp);
3374 break; 3435 break;
3375 case XTerm_Color_pointer_bg: 3436 case XTerm_Color_pointer_bg:
3376 process_color_seq (op, Color_pointer_bg, str, resp); 3437 process_color_seq (op, Color_pointer_bg, str, resp);
3377 break; 3438 break;
3439#ifdef OPTION_HC
3440 case XTerm_Color_HC:
3441 process_color_seq (op, Color_HC, str, resp);
3442 break;
3443 case XTerm_Color_HTC:
3444 process_color_seq (op, Color_HTC, str, resp);
3445 break;
3446#endif
3378#ifndef NO_BOLD_UNDERLINE_REVERSE 3447#ifndef NO_BOLD_UNDERLINE_REVERSE
3379 case XTerm_Color_RV:
3380 process_color_seq (op, Color_RV, str, resp);
3381 break;
3382 case Rxvt_Color_BD:
3383 case URxvt_Color_BD: 3448 case URxvt_Color_BD:
3384 process_color_seq (op, Color_BD, str, resp); 3449 process_color_seq (op, Color_BD, str, resp);
3385 break; 3450 break;
3386 case Rxvt_Color_UL:
3387 case URxvt_Color_UL: 3451 case URxvt_Color_UL:
3388 process_color_seq (op, Color_UL, str, resp); 3452 process_color_seq (op, Color_UL, str, resp);
3389 break; 3453 break;
3390 case URxvt_Color_IT: 3454 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3455 process_color_seq (op, Color_IT, str, resp);
3392 break; 3456 break;
3393#endif 3457#endif
3394#if ENABLE_TRANSPARENCY 3458 case URxvt_Color_border:
3459 process_color_seq (op, Color_border, str, resp);
3460 break;
3461
3462#if BG_IMAGE_FROM_ROOT
3395 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3397 { 3465 {
3398 bool changed = false; 3466 bool changed = false;
3399 3467
3400 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404 3470
3405 if (changed) 3471 if (changed)
3406 update_background (); 3472 update_background ();
3407 } 3473 }
3408 3474
… …
3412#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3413 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3414 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3415 { 3481 {
3416 char str[256]; 3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3417 3487
3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3488 sprintf (str, "[%dx%d+%d+%d]",
3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3489 h_scale, v_scale,
3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3490 h_align, v_align);
3421 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3422 } 3492 }
3423 else 3493 else
3424 { 3494 {
3425 int changed = 0; 3495 bool changed = false;
3426 3496
3427 if (*str != ';') 3497 if (*str != ';')
3428 { 3498 {
3429 /* reset to default scaling :*/ 3499 try
3430 bgPixmap.unset_geometry (); 3500 {
3431 if (bgPixmap.set_file (str)) /* change pixmap */ 3501 fimage.set_file_geometry (this, str);
3432 changed++; 3502 changed = true;
3433 str = strchr (str, ';'); 3503 }
3434 if (str == NULL) 3504 catch (const class rxvt_failure_exception &e)
3435 bgPixmap.set_defaultGeometry (); 3505 {
3506 }
3436 } 3507 }
3437 3508 else
3438 while (str)
3439 { 3509 {
3440 str++; 3510 str++;
3441 if (bgPixmap.set_geometry (str)) 3511 if (fimage.set_geometry (str, true))
3442 changed++; 3512 changed = true;
3443 str = strchr (str, ';');
3444 } 3513 }
3445 3514
3446 if (changed) 3515 if (changed)
3516 {
3517 if (bg_window_position_sensitive ())
3518 {
3519 int x, y;
3520 get_window_origin (x, y);
3521 parent_x = x;
3522 parent_y = y;
3523 }
3447 update_background (); 3524 update_background ();
3525 }
3448 } 3526 }
3449 break; 3527 break;
3450#endif 3528#endif
3451 3529
3452 case XTerm_logfile: 3530 case XTerm_logfile:
… …
3522 break; 3600 break;
3523#endif 3601#endif
3524 3602
3525#if ENABLE_PERL 3603#if ENABLE_PERL
3526 case URxvt_perl: 3604 case URxvt_perl:
3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3605 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3528 ; // no responses yet
3529 break; 3606 break;
3530#endif 3607#endif
3531 } 3608 }
3532} 3609}
3533/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
… …
3540 * 's' = save 3617 * 's' = save
3541 * 'r' = restore 3618 * 'r' = restore
3542 * 't' = toggle 3619 * 't' = toggle
3543 * so no need for fancy checking 3620 * so no need for fancy checking
3544 */ 3621 */
3545int 3622int ecb_cold
3546rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3547{ 3624{
3548 int state; 3625 int state;
3549 3626
3550 if (mode == 's') 3627 if (mode == 's')
3551 { 3628 {
3552 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3553 return -1; 3633 return -1;
3554 } 3634 }
3555 else 3635 else
3556 { 3636 {
3557 if (mode == 'r') 3637 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3639 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3641
3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3562 } 3646 }
3563 3647
3564 return state; 3648 return state;
3565} 3649}
3566 3650
3567/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3568void 3652void
3569rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3570{ 3654{
3571 unsigned int i, j; 3655 unsigned int i, j;
3572 int state; 3656 int state;
3573 3657
3574 static const struct 3658 static const struct
3575 { 3659 {
3576 const int argval; 3660 const int argval;
3577 const unsigned long bit; 3661 const unsigned long bit;
3578 } argtopriv[] = { 3662 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3663 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3581 { 3, PrivMode_132 }, 3665 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3667 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3668 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3669 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3670 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3672 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region
3589 { 25, PrivMode_VisibleCursor }, 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3677#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3679 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3682 // 45 margin bell NYI
3597 // 46 start logging 3683 // 46 start logging
3598 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3685 { 66, PrivMode_aplKP }, // DECNKM
3600#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3687 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3688#endif
3603 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3690 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3691 { 1003, PrivMode_MouseAnyEvent },
3692#if ENABLE_FRILLS
3693 { 1005, PrivMode_ExtModeMouse },
3694#endif
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3607 { 1011, PrivMode_Keypress }, // rxvt extension 3696 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3699#endif
3608 // 1035 enable modifiers for alt, numlock NYI 3700 // 1035 enable modifiers for alt, numlock NYI
3609 // 1036 send ESC for meta keys NYI 3701 // 1036 send ESC for meta keys NYI
3610 // 1037 send DEL for keypad delete NYI 3702 // 1037 send DEL for keypad delete NYI
3611 { 1047, PrivMode_Screen }, 3703 { 1047, PrivMode_Screen },
3612 // 1048 save and restore cursor 3704 // 1048 save and restore cursor, implemented in code
3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste }, 3707 { 2004, PrivMode_BracketPaste },
3616 }; 3708 };
3617 3709
… …
3627 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3628 { 3720 {
3629 state = -1; 3721 state = -1;
3630 3722
3631 /* basic handling */ 3723 /* basic handling */
3632 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3633 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3634 { 3726 {
3635 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3636 break; 3728 break;
3637 } 3729 }
… …
3645 3737
3646 scr_touch (true); 3738 scr_touch (true);
3647 break; 3739 break;
3648#endif 3740#endif
3649 case 1048: /* alternative cursor save */ 3741 case 1048: /* alternative cursor save */
3650 case 1049:
3651 if (option (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3743 if (mode == 0)
3653 scr_cursor (RESTORE); 3744 scr_cursor (RESTORE);
3654 else if (mode == 1) 3745 else if (mode == 1)
3655 scr_cursor (SAVE); 3746 scr_cursor (SAVE);
… …
3664 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3758 * within VT52 mode
3668 */ 3759 */
3669 PrivMode (1, PrivMode_vt52); 3760 priv_modes |= PrivMode_vt52;
3670 break; 3761 break;
3671 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3765 break;
3678 case 4: /* smooth scrolling */ 3766 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3767 set_option (Opt_jumpScroll, !state);
3680 break; 3768 break;
3681 case 5: /* reverse video */ 3769 case 5: /* reverse video */
… …
3692 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3782 break;
3695#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3696 case scrollBar_esc: 3784 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3785 scrollBar.map (state);
3698 {
3699 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3787 scr_touch (true);
3701 }
3702 break; 3788 break;
3703#endif 3789#endif
3704 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3705 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3706 break; 3792 break;
… …
3719 case 1003: 3805 case 1003:
3720 if (state) 3806 if (state)
3721 { 3807 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3808 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3809 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3810 mouse_row = mouse_col = 0;
3724 vt_emask_mouse = PointerMotionMask; 3811 vt_emask_mouse = PointerMotionMask;
3725 } 3812 }
3726 else 3813 else
3727 vt_emask_mouse = NoEventMask; 3814 vt_emask_mouse = NoEventMask;
3815
3728 vt_select_input (); 3816 vt_select_input ();
3729 break; 3817 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3818 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3819 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3820 break;
3733 case 1011: /* scroll to bottom on key press */ 3821 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3822 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3823 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3824 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3825 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3826 if (!state)
3739 scr_erase_screen (2); 3827 scr_erase_screen (2);
3828
3740 scr_change_screen (state); 3829 scr_change_screen (state);
3741 break; 3830 break;
3742 case 1049: /* secondary screen w/ clearing first */ 3831 case 1049: /* secondary screen w/ clearing first */
3832 if (option (Opt_secondaryScreen))
3833 if (state)
3834 scr_cursor (SAVE);
3835
3743 scr_change_screen (state); 3836 scr_change_screen (state);
3837
3744 if (option (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3839 if (state)
3746 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841 else
3842 scr_cursor (RESTORE);
3747 break; 3843 break;
3748 default: 3844 default:
3749 break; 3845 break;
3750 } 3846 }
3751 } 3847 }
3752} 3848}
3753/*}}} */ 3849/*}}} */
3754 3850
3755/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3756void 3852void ecb_hot
3757rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3758{ 3854{
3759 unsigned int i; 3855 unsigned int i;
3760 short rendset; 3856 short rendset;
3761 int rendstyle; 3857 int rendstyle;
… …
3902 break; 3998 break;
3903#endif 3999#endif
3904 } 4000 }
3905 } 4001 }
3906} 4002}
3907/*}}} */
3908 4003
3909/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3910void 4004void
3911rxvt_term::process_graphics () 4005rxvt_term::set_cursor_style (int style)
3912{ 4006{
3913 unicode_t ch, cmd = cmd_getc (); 4007 if (!IN_RANGE_INC (style, 0, 4))
3914
3915 if (cmd == 'Q')
3916 {
3917 /* query graphics */
3918 tt_printf ("\033G0\012"); /* no graphics */
3919 return; 4008 return;
3920 } 4009
3921 /* swallow other graphics sequences until terminating ':' */ 4010 set_option (Opt_cursorUnderline, style >= 3);
3922 do 4011
3923 ch = cmd_getc (); 4012#ifdef CURSOR_BLINK
3924 while (ch != ':'); 4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
3925} 4018}
3926/*}}} */ 4019/*}}} */
3927 4020
3928/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3929 4022
… …
3945 4038
3946/* ---------------------------------------------------------------------- */ 4039/* ---------------------------------------------------------------------- */
3947/* Write data to the pty as typed by the user, pasted with the mouse, 4040/* Write data to the pty as typed by the user, pasted with the mouse,
3948 * or generated by us in response to a query ESC sequence. 4041 * or generated by us in response to a query ESC sequence.
3949 */ 4042 */
3950const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3951 4044
3952void 4045void
3953rxvt_term::tt_write (const char *data, unsigned int len) 4046rxvt_term::tt_write (const char *data, unsigned int len)
3954{ 4047{
3955 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3960 4053
3961 if (v_buflen == 0) 4054 if (v_buflen == 0)
3962 { 4055 {
3963 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4056 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3964 4057
4058 max_it (written, 0);
4059
3965 if ((unsigned int)written == len) 4060 if (written == len)
3966 return; 4061 return;
3967 4062
3968 data += written; 4063 data += written;
3969 len -= written; 4064 len -= written;
3970 } 4065 }
3971 4066
3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4067 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3973 4068
3974 memcpy (v_buffer + v_buflen, data, len); 4069 memcpy (v_buffer + v_buflen, data, len);
3975 v_buflen += len; 4070 v_buflen += len;
3976 4071
3977 pty_ev.set (ev::READ | ev::WRITE); 4072 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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