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.376 by root, Fri Dec 14 02:08:18 2007 UTC vs.
Revision 1.525 by sf-exg, Wed Aug 15 19:41:49 2012 UTC

… …
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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 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",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 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);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 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
303rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
304{ 407{
305 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 409 KeySym keysym;
308 int valid_keysym; 410 int valid_keysym;
309 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
310 412
311#if ISO_14755 413#if ISO_14755
… …
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 (UP, lnsppg);
418 return; 516 return;
419 } 517 }
… …
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 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
551 { 657 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 658#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 659 case XK_BackSpace:
554#ifdef XK_KP_Home 660 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 661 {
556 XK_KP_7, // XK_KP_Home 662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 663 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 664 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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;
571 691
572 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:
573 { 772 {
574 unsigned int index = keysym - XK_KP_Home; 773 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
576 } 778 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 779 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 780 }
794 781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
795 /* 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 /*
796 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
797 */ 801 */
798#ifdef META8_OPTION 802#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
801#endif 805#endif
806 }
802 807
803 } 808 }
804 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
805 { 810 {
806 len = 1; 811 len = 1;
… …
840 { 845 {
841 view_start = 0; 846 view_start = 0;
842 want_refresh = 1; 847 want_refresh = 1;
843 } 848 }
844 849
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */ 850 /* escape prefix */
860 if (meta 851 if (meta
861#ifdef META8_OPTION 852#ifdef META8_OPTION
862 && meta_char == C0_ESC 853 && meta_char == C0_ESC
863#endif 854#endif
… …
868 } 859 }
869 860
870 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
871} 862}
872 863
873void 864void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
875{ 866{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 868 KeySym keysym;
878 869
… …
898 commit_iso14755 (); 889 commit_iso14755 ();
899 890
900 return; 891 return;
901 } 892 }
902 893
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 895 if (i[0] == keysym)
905 { 896 {
906 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 898 commit_iso14755 ();
908 899
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
947#endif 938#endif
948} 939}
949 940
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 941void
984rxvt_term::flush () 942rxvt_term::flush ()
985{ 943{
986 flush_ev.stop (); 944 flush_ev.stop ();
987 945
988#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
990 { 948 {
991// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 950 scr_touch (false);
993 } 951 }
994#endif 952#endif
995 953
996 if (want_refresh) 954 if (want_refresh)
… …
1032 } 990 }
1033 while (row < end_row); 991 while (row < end_row);
1034 } 992 }
1035 993
1036 scr_refresh (); 994 scr_refresh ();
1037 scrollbar_show (1); 995 scrollBar.show (1);
1038#ifdef USE_XIM 996#if USE_XIM
1039 IMSendSpot (); 997 im_send_spot ();
1040#endif 998#endif
1041 } 999 }
1042 1000
1043 display->flush (); 1001 display->flush ();
1044} 1002}
1045 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1046void 1005void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1006rxvt_term::refresh_check ()
1048{ 1007{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1010
1011 display->flush ();
1055} 1012}
1056 1013
1057void 1014void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1016{
… …
1063 flush (); 1020 flush ();
1064} 1021}
1065 1022
1066#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1067void 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
1039void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1041{
1070 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1043 want_refresh = 1;
1044 refresh_check ();
1072} 1045}
1073#endif 1046#endif
1074 1047
1075#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
1076void 1049void
… …
1078{ 1051{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1053 {
1081 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
1082 want_refresh = 1; 1055 want_refresh = 1;
1056 refresh_check ();
1083 } 1057 }
1084 else 1058 else
1085 w.stop (); 1059 w.stop ();
1086} 1060}
1087#endif 1061#endif
1088 1062
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1064void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1066{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1069 {
1095 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1072 }
1096 else 1073 else
1097 w.stop (); 1074 w.stop ();
1098} 1075}
1099#endif 1076#endif
1100 1077
… …
1104{ 1081{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1083 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1085 want_refresh = 1;
1086 refresh_check ();
1109 } 1087 }
1110 else 1088 else
1111 w.stop (); 1089 w.stop ();
1112} 1090}
1113#endif 1091#endif
1114 1092
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1094void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1096{
1119 if (mouse_slip_wheel_speed == 0 1097 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1098 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1099 want_refresh = 1;
1100 refresh_check ();
1101 }
1102
1103 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1104 {
1128 else 1105 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1106 w.stop ();
1107 }
1130} 1108}
1131#endif 1109#endif
1132 1110
1133#if LINUX_YIELD_HACK 1111#if LINUX_YIELD_HACK
1134static struct event_handler 1112static struct event_handler
… …
1139 { 1117 {
1140 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1142 // 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
1143 // 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.
1144 1125
1145 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1147 1128
1148 w.stop (); 1129 w.stop ();
1149 } 1130 }
1150 1131
… …
1153 { 1134 {
1154 } 1135 }
1155} event_handler; 1136} event_handler;
1156#endif 1137#endif
1157 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
1158bool 1172bool
1159rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1160{ 1174{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1162 1176
1163 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1178
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1166 n = 0;
1167 } 1180 {
1168 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1172 1186
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1188
1175 if (r > 0) 1189 if (r > 0)
1176 { 1190 {
1177 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1178 return true; 1192 return true;
… …
1200{ 1214{
1201 make_current (); 1215 make_current ();
1202 1216
1203 if (revents & ev::READ) 1217 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1220 cmd_parse ();
1207 break;
1208 1221
1209 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1210 pty_write (); 1223 pty_write ();
1211}
1212 1224
1213void 1225 refresh_check ();
1226}
1227
1228void ecb_cold
1214rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1215{ 1230{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1232 recolour_cursor ();
1218 1233
… …
1223 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1224#endif 1239#endif
1225} 1240}
1226 1241
1227#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1228void 1243void ecb_cold
1229rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1230{ 1245{
1231 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1232 return; 1247 return;
1233 1248
… …
1235 XFlush (dpy); 1250 XFlush (dpy);
1236 1251
1237 hidden_pointer = 1; 1252 hidden_pointer = 1;
1238} 1253}
1239 1254
1240void 1255void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1257{
1243 make_current (); 1258 make_current ();
1244 1259
1245 pointer_blank (); 1260 pointer_blank ();
… …
1251{ 1266{
1252 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1253 int x, y; 1268 int x, y;
1254 int code = 32; 1269 int code = 32;
1255 1270
1256 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1258 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1259 { 1275 {
1260 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1261 return; 1277 return;
1278
1262 mouse_row = x; 1279 mouse_row = x;
1263 mouse_col = y; 1280 mouse_col = y;
1264 code += 32; 1281 code += 32;
1265 } 1282 }
1266 1283
… …
1269 else 1286 else
1270 { 1287 {
1271 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1290 if (button_number >= 3)
1274 button_number += (64 - 3); 1291 button_number += 64 - 3;
1275 } 1292 }
1276 1293
1277 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1278 { 1295 {
1279 /* 1296 /*
… …
1311 fputc ('A', stderr); 1328 fputc ('A', stderr);
1312 if (key_state & 32) 1329 if (key_state & 32)
1313 fputc ('2', stderr); 1330 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1332 button_number,
1316 x + 1, 1333 x,
1317 y + 1); 1334 y);
1318#endif 1335#endif
1319 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
1320 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1351 code + button_number + key_state,
1322 (32 + x + 1), 1352 32 + x,
1323 (32 + y + 1)); 1353 32 + y);
1324} 1354}
1325 1355
1326/*{{{ process an X event */ 1356/*{{{ process an X event */
1327void 1357void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1329{ 1359{
1330 make_current (); 1360 make_current ();
1331 1361
1332 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1461 focus_out ();
1432 break; 1462 break;
1433 1463
1434 case ConfigureNotify: 1464 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1439 { 1466 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 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_flags & BG_IS_VALID))
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 }
1442 1502
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1504 {
1445 seen_resize = 1; 1505 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1507 }
1448 else 1508 else
1449 { 1509 {
1450#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1511 if (moved)
1452 update_background (); 1512 update_background ();
1453#endif 1513#endif
1454 } 1514 }
1515
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1517 }
1457 break; 1518 break;
1458 1519
1459 case PropertyNotify: 1520 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1522 break;
1466 1523
1467 case SelectionClear: 1524 case SelectionClear:
1468 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1526 break;
1475 1527
1476 case SelectionRequest: 1528 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1478 break; 1530 break;
1479 1531
1480 case MapNotify: 1532 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 /* This is needed specifically to fix the case of no window manager or a
1535 * non-reparenting window manager. In those cases we never get first
1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1537 * care of multiplicity of ConfigureNotify events arriving while WM does
1538 * reparenting.
1539 * We should not render background immediately, as there could be several
1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1541 * by scheduling background redraw as soon as we can, but giving a short
1542 * bit of time for ConfigureNotifies to arrive.
1543 * We should render background PRIOR to drawing any text, but AFTER all
1544 * of ConfigureNotifys for the best results.
1545 */
1546 if (!(bg_flags & BG_IS_VALID))
1547 update_background_ev.start (0.025);
1548#endif
1481 mapped = 1; 1549 mapped = 1;
1482#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1551 text_blink_ev.start ();
1484#endif 1552#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1553 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1566 if (ev.xany.window == vt)
1499 { 1567 {
1500 do 1568 do
1501 { 1569 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1572 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1574
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1576
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1578 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1579 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1580 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1581 }
1582
1514 want_refresh = 1; 1583 want_refresh = 1;
1515 } 1584 }
1516 else 1585 else
1517 { 1586 {
1518 XEvent unused_event; 1587 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1589 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1590 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1592 ;
1524 1593
1525 if (isScrollbarWindow (ev.xany.window)) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1595 {
1527 scrollBar.setIdle (); 1596 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1597 scrollBar.show (0);
1529 } 1598 }
1530 } 1599 }
1531 break; 1600 break;
1532 1601
1533 case MotionNotify: 1602 case MotionNotify:
… …
1598 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1599 } 1668 }
1600 else 1669 else
1601 { 1670 {
1602 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1673 }
1605 1674
1606 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1677 + 1;
… …
1620#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1621 } 1690 }
1622#endif 1691#endif
1623 } 1692 }
1624 } 1693 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1626 { 1695 {
1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1629 ; 1698 ;
1630 1699
1631 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1632 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1704 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1706 scrollBar.size ());
1638 want_refresh = 1; 1707 want_refresh = 1;
1639 scrollbar_show (1); 1708 scrollBar.show (1);
1640 } 1709 }
1641 break; 1710 break;
1642 } 1711 }
1643 1712
1644#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1645 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1646 {
1647 if (hidden_cursor)
1648 {
1649 hidden_cursor = 0;
1650 want_refresh = 1;
1651 }
1652
1653 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1654 }
1655#endif 1716#endif
1656 1717
1657#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1659 { 1720 {
… …
1665 1726
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1727 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1728 pointer_blank ();
1668 } 1729 }
1669#endif 1730#endif
1670}
1671 1731
1672void 1732 refresh_check ();
1733}
1734
1735#if ENABLE_FRILLS
1736void ecb_cold
1737rxvt_term::set_urgency (bool enable)
1738{
1739 if (enable == urgency_hint)
1740 return;
1741
1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1743 {
1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1745 XSetWMHints (dpy, parent, h);
1746 urgency_hint = enable;
1747 XFree (h);
1748 }
1749}
1750#endif
1751
1752void ecb_cold
1673rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1674{ 1754{
1675 if (!focus) 1755 if (!focus)
1676 { 1756 {
1677 focus = 1; 1757 focus = 1;
1678 want_refresh = 1; 1758 want_refresh = 1;
1679 1759
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681
1682#if USE_XIM 1760#if USE_XIM
1683 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1684 { 1762 {
1685 IMSetPosition (); 1763 im_set_position ();
1686 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1687 } 1765 }
1688#endif 1766#endif
1689#if CURSOR_BLINK 1767#if CURSOR_BLINK
1690 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1697 scr_recolour (); 1775 scr_recolour ();
1698 } 1776 }
1699#endif 1777#endif
1700#if ENABLE_FRILLS 1778#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell)) 1779 if (option (Opt_urgentOnBell))
1702 { 1780 set_urgency (0);
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif 1781#endif
1710 }
1711}
1712 1782
1713void 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1784 }
1785}
1786
1787void ecb_cold
1714rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1715{ 1789{
1716 if (focus) 1790 if (focus)
1717 { 1791 {
1718 focus = 0; 1792 focus = 0;
1719 want_refresh = 1; 1793 want_refresh = 1;
1720 1794
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795#if ENABLE_FRILLS
1722 1796 if (option (Opt_urgentOnBell))
1797 set_urgency (0);
1798#endif
1723#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf) 1800 if (iso14755buf)
1725 { 1801 {
1726 iso14755buf = 0; 1802 iso14755buf = 0;
1727# if ISO_14755 1803# if ISO_14755
… …
1744 { 1820 {
1745 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1746 scr_recolour (); 1822 scr_recolour ();
1747 } 1823 }
1748#endif 1824#endif
1749 }
1750}
1751 1825
1752void 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1753rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1754{ 1832{
1755#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1757 { 1835 {
… …
1761 } 1839 }
1762#endif 1840#endif
1763} 1841}
1764 1842
1765#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1766void 1844void ecb_hot
1767rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1768{ 1846{
1769 make_current (); 1847 make_current ();
1770 1848
1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1773 return; 1851 return;
1774 1852
1775# if ENABLE_TRANSPARENCY
1776 switch (ev.type) 1853 switch (ev.type)
1777 { 1854 {
1778 case PropertyNotify: 1855 case PropertyNotify:
1779 /* 1856 /*
1780 * if user used some Esetroot compatible prog to set the root bg, 1857 * if user used some Esetroot compatible prog to set the root bg,
1781 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1782 */ 1859 */
1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1785 { 1862 {
1863# if ENABLE_TRANSPARENCY
1786 bgPixmap.set_root_pixmap (); 1864 bg_set_root_pixmap ();
1787 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1788 } 1870 }
1871
1789 break; 1872 break;
1790 } 1873 }
1791# endif 1874
1875 refresh_check ();
1792} 1876}
1793#endif 1877#endif
1794 1878
1795void 1879void
1796rxvt_term::button_press (XButtonEvent &ev) 1880rxvt_term::button_press (XButtonEvent &ev)
… …
1827 /* save the xbutton state (for ButtonRelease) */ 1911 /* save the xbutton state (for ButtonRelease) */
1828 MEvent.state = ev.state; 1912 MEvent.state = ev.state;
1829#ifdef MOUSE_REPORT_DOUBLECLICK 1913#ifdef MOUSE_REPORT_DOUBLECLICK
1830 if (ev.button == MEvent.button && clickintime) 1914 if (ev.button == MEvent.button && clickintime)
1831 { 1915 {
1832 /* same button, within alloted time */ 1916 /* same button, within allowed time */
1833 MEvent.clicks++; 1917 MEvent.clicks++;
1834 1918
1835 if (MEvent.clicks > 1) 1919 if (MEvent.clicks > 1)
1836 { 1920 {
1837 /* only report double clicks */ 1921 /* only report double clicks */
… …
1909 } 1993 }
1910 1994
1911 /* 1995 /*
1912 * Scrollbar window processing of button press 1996 * Scrollbar window processing of button press
1913 */ 1997 */
1914 if (isScrollbarWindow (ev.window)) 1998 if (scrollBar.state && ev.window == scrollBar.win)
1915 { 1999 {
1916 scrollBar.setIdle (); 2000 page_dirn direction = NO_DIR;
2001
2002 if (scrollBar.upButton (ev.y))
2003 direction = UP; /* up */
2004 else if (scrollBar.dnButton (ev.y))
2005 direction = DN; /* down */
2006
2007 scrollBar.state = SB_STATE_IDLE;
1917 /* 2008 /*
1918 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1919 * move up if mouse is above slider 2010 * move up if mouse is above slider
1920 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1921 * 2012 *
… …
1930 /* 2021 /*
1931 * Mouse report disabled scrollbar: 2022 * Mouse report disabled scrollbar:
1932 * arrow buttons - send up/down 2023 * arrow buttons - send up/down
1933 * click on scrollbar - send pageup/down 2024 * click on scrollbar - send pageup/down
1934 */ 2025 */
1935 if ((scrollBar.style == R_SB_NEXT 2026 if (direction == UP)
1936 && scrollbarnext_upButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_upButton (ev.y)))
1939 tt_printf ("\033[A"); 2027 tt_printf ("\033[A");
1940 else if ((scrollBar.style == R_SB_NEXT 2028 else if (direction == DN)
1941 && scrollbarnext_dnButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_dnButton (ev.y)))
1944 tt_printf ("\033[B"); 2029 tt_printf ("\033[B");
1945 else 2030 else
1946 switch (ev.button) 2031 switch (ev.button)
1947 { 2032 {
1948 case Button2: 2033 case Button2:
… …
1956 break; 2041 break;
1957 } 2042 }
1958 } 2043 }
1959 else 2044 else
1960#endif /* NO_SCROLLBAR_REPORT */ 2045#endif /* NO_SCROLLBAR_REPORT */
1961
1962 {
1963 char upordown = 0;
1964
1965 if (scrollBar.style == R_SB_NEXT)
1966 { 2046 {
1967 if (scrollbarnext_upButton (ev.y)) 2047 if (direction != NO_DIR)
1968 upordown = -1; /* up */
1969 else if (scrollbarnext_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 else if (scrollBar.style == R_SB_RXVT)
1973 {
1974 if (scrollbarrxvt_upButton (ev.y))
1975 upordown = -1; /* up */
1976 else if (scrollbarrxvt_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979
1980 if (upordown)
1981 { 2048 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2049#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ()) 2050 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2052#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2053 if (scr_page (direction, 1))
1987 { 2054 {
1988 if (upordown < 0) 2055 if (direction == UP)
1989 scrollBar.setUp (); 2056 scrollBar.state = SB_STATE_UP;
1990 else 2057 else
1991 scrollBar.setDn (); 2058 scrollBar.state = SB_STATE_DOWN;
1992 } 2059 }
1993 } 2060 }
1994 else 2061 else
1995 switch (ev.button) 2062 switch (ev.button)
1996 { 2063 {
1997 case Button2: 2064 case Button2:
1998 switch (scrollbar_align) 2065 switch (scrollBar.align)
1999 { 2066 {
2000 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2001 csrO = 0; 2068 csrO = 0;
2002 break; 2069 break;
2003 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2004 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2005 break; 2072 break;
2006 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2007 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2008 break; 2075 break;
2009 } 2076 }
2010 2077
2011 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2012 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2015 2082
2016 scrollBar.setMotion (); 2083 scrollBar.state = SB_STATE_MOTION;
2017 break; 2084 break;
2018 2085
2019 case Button1: 2086 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2023 2090
2024 case Button3: 2091 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2026 { 2093 {
2027 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2028# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2029 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2030# else 2097# else
2031 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2032# endif 2099# endif
2033 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2034# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2035 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2036# else 2103# else
2037 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2038# endif 2105# endif
2039 else 2106 else
2040 scrollBar.setMotion (); 2107 scrollBar.state = SB_STATE_MOTION;
2041 } 2108 }
2042 else 2109 else
2043 { 2110 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2112 (nrow
2046 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2047 / scrollbar_size ())); 2114 / scrollBar.size ()));
2048 } 2115 }
2049 2116
2050 break; 2117 break;
2051 } 2118 }
2052 } 2119 }
… …
2062 2129
2063 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2131 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2133
2067 if (scrollbar_isUpDn ()) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2068 { 2135 {
2069 scrollBar.setIdle (); 2136 scrollBar.state = SB_STATE_IDLE;
2070 scrollbar_show (0); 2137 scrollBar.show (0);
2071 } 2138 }
2072 2139
2073#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2074 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
2075#endif 2142#endif
… …
2124 case Button3: 2191 case Button3:
2125 selection_make (ev.time); 2192 selection_make (ev.time);
2126 break; 2193 break;
2127 2194
2128 case Button2: 2195 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2196 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2198 break;
2132 2199
2133#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2134 case Button4: 2201 case Button4:
2135 case Button5: 2202 case Button5:
… …
2155 2222
2156 if (!slip_wheel_ev.is_active ()) 2223 if (!slip_wheel_ev.is_active ())
2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2224 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2158 } 2225 }
2159 else 2226 else
2227# endif
2160 { 2228 {
2161# endif
2162 scr_page (v, i); 2229 scr_page (v, i);
2163 scrollbar_show (1); 2230 scrollBar.show (1);
2164# ifdef MOUSE_SLIP_WHEELING
2165 } 2231 }
2166# endif
2167 } 2232 }
2168 break; 2233 break;
2169#endif 2234#endif
2170 } 2235 }
2171 } 2236 }
2172} 2237}
2173 2238
2174/*}}} */ 2239/*}}} */
2175 2240
2176bool 2241void ecb_hot
2177rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2178{ 2243{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2182 2246
2183 for (;;) 2247 for (;;)
2184 { 2248 {
2185 if (ch == NOCHAR) 2249 if (ecb_unlikely (ch == NOCHAR))
2186 { 2250 {
2187 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2252 ch = next_char ();
2189 2253
2190 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2191 break; 2255 break;
2192 } 2256 }
2193 2257
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2258 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2259 {
2196 if (!seen_input) 2260 if (ecb_unlikely (!seen_input))
2197 { 2261 {
2198 seen_input = 1; 2262 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2278 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2280
2217 for (;;) 2281 for (;;)
2218 { 2282 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2283 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2284 break;
2221 2285
2222 *str++ = ch; 2286 *str++ = ch;
2223 2287
2224 if (ch == C0_LF || str >= eol) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2289 {
2226 if (ch == C0_LF) 2290 if (ch == C0_LF)
2227 nlines++; 2291 nlines++;
2228 2292
2229 refresh_count++; 2293 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2342 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2343 * if skipScroll is enabled.
2280 */ 2344 */
2281 if (refreshnow) 2345 if (refreshnow)
2282 { 2346 {
2283 flag = true;
2284 scr_refresh (); 2347 scr_refresh ();
2285 want_refresh = 1; 2348 want_refresh = 1;
2286 } 2349 }
2287
2288 } 2350 }
2289 else 2351 else
2290 { 2352 {
2291 try 2353 try
2292 { 2354 {
… …
2300 } 2362 }
2301 2363
2302 ch = NOCHAR; 2364 ch = NOCHAR;
2303 } 2365 }
2304 } 2366 }
2305
2306 return flag;
2307} 2367}
2308 2368
2309// read the next character 2369// read the next character
2310wchar_t 2370wchar_t ecb_hot
2311rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2312{ 2372{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2374 {
2315 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2318 2378
2319 wchar_t wc; 2379 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2381
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2385 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2386 break;
2327 } 2387 }
2328 2388
2329 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 {
2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2393 // in which case we "erroneously" return the next byte which might be valid.
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2395 }
2331 2396
2332 // assume wchar == unicode 2397 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2399 return wc & UNICODE_MASK;
2335 } 2400 }
2336 2401
2337 return NOCHAR; 2402 return NOCHAR;
2338} 2403}
2339 2404
2340// read the next octet 2405// read the next octet
2341uint32_t 2406uint32_t ecb_hot
2342rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2343{ 2408{
2344 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR; 2411 : NOCHAR;
2347} 2412}
2348 2413
2349static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2350 2415
2351/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2418{
2359 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2360 2420
2361 if (c == NOCHAR) 2421 if (c == NOCHAR)
2362 throw out_of_input; 2422 throw out_of_input;
2363 2423
2364 return c; 2424 return c;
2365} 2425}
2366 2426
2367uint32_t 2427uint32_t ecb_hot
2368rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2369{ 2429{
2370 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2371 2431
2372 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2376} 2436}
2377 2437
2378/*{{{ print pipe */ 2438/*{{{ print pipe */
2379/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2381FILE * 2441FILE * ecb_cold
2382rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2383{ 2443{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2444 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2445
2386 if (stream == NULL) 2446 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2448
2389 return stream; 2449 return stream;
2390} 2450}
2391 2451
2392int 2452int ecb_cold
2393rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2394{ 2454{
2395 fflush (stream); 2455 fflush (stream);
2396 return pclose (stream); 2456 return pclose (stream);
2397} 2457}
2398 2458
2399/* 2459/*
2400 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2401 */ 2461 */
2402void 2462void ecb_cold
2403rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2404{ 2464{
2405 int done; 2465 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2466
2408 if ((fd = popen_printer ()) == NULL) 2467 if (!fd)
2409 return; 2468 return;
2410 2469
2411 /* 2470 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2471 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2472 * is received.
2414 */ 2473 */
2415 for (done = 0; !done;) 2474 for (int done = 0; !done; )
2416 { 2475 {
2417 unsigned char buf[8]; 2476 unsigned char buf[8];
2418 unicode_t ch; 2477 unicode_t ch;
2419 unsigned int i, len; 2478 unsigned int i, len;
2420 2479
… …
2454 pclose_printer (fd); 2513 pclose_printer (fd);
2455} 2514}
2456#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2457/*}}} */ 2516/*}}} */
2458 2517
2459/* *INDENT-OFF* */
2460enum { 2518enum {
2461 C1_40 = 0x40, 2519 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2522 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2524};
2467/* *INDENT-ON* */
2468 2525
2469/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2470void 2527void ecb_hot
2471rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2529{
2473 switch (ch) 2530 switch (ch)
2474 { 2531 {
2475 case C0_ESC: 2532 case C0_ESC:
… …
2521} 2578}
2522/*}}} */ 2579/*}}} */
2523 2580
2524 2581
2525/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2526void 2583void ecb_cold
2527rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2528{ 2585{
2529 int row, col; 2586 int row, col;
2530 2587
2531 switch (ch) 2588 switch (ch)
… …
2565 break; 2622 break;
2566 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2625 break;
2569 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2627 priv_modes &= ~PrivMode_vt52;
2571 break; 2628 break;
2572 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2574 /* unimplemented */ 2631 /* unimplemented */
2575 break; 2632 break;
… …
2581} 2638}
2582/*}}} */ 2639/*}}} */
2583 2640
2584 2641
2585/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2586void 2643void ecb_hot
2587rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2588{ 2645{
2589 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2590 2647
2591 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2594 return; 2651 return;
2595 } 2652 }
2596 2653
2597 switch (ch) 2654 switch (ch)
2598 { 2655 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2656 case '#':
2601 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2602 scr_E (); 2658 scr_E ();
2603 break; 2659 break;
2604 case '(': 2660 case '(':
… …
2627#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2628 case '9': 2684 case '9':
2629 scr_forwardindex (); 2685 scr_forwardindex ();
2630 break; 2686 break;
2631#endif 2687#endif
2688 // DECPAM/DECPNM
2632 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2633 case '>': 2692 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2693 priv_modes &= ~PrivMode_aplKP;
2635 break; 2694 break;
2636 2695
2637 case C1_40: 2696 case C1_40:
2638 cmd_getc (); 2697 cmd_getc ();
2639 break; 2698 break;
… …
2643 2702
2644 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2646 { 2705 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2708 }
2650 break; 2709 break;
2651 2710
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
2654 process_graphics (); 2713 // used by original rxvt for rob nations own graphics mode
2714 if (cmd_getc () == 'Q')
2715 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2716 break;
2656 2717
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2720 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2664 scr_index (DN); 2725 scr_index (DN);
2665 break; 2726 break;
2666 2727
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2669 2730
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2672 2733
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2736 process_dcs_seq ();
2676 break; 2737 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2682 2743
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2746 process_csi_seq ();
2686 break; 2747 break;
2687 2748
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2751 process_osc_seq ();
2691 break; 2752 break;
2692 2753
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2755 case 'c':
2695 mbstate.reset (); 2756 mbstate.reset ();
2696 scr_poweron (); 2757 scr_poweron ();
2697 scrollbar_show (1); 2758 scrollBar.show (1);
2698 break; 2759 break;
2699 2760
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2762 case 'n':
2702 scr_charset_choose (2); 2763 scr_charset_choose (2);
… …
2709 } 2770 }
2710} 2771}
2711/*}}} */ 2772/*}}} */
2712 2773
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2775enum {
2716 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2785};
2726 2786
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2792
2733const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
2734 { 2794 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2803 };
2744/* *INDENT-ON* */
2745 2804
2746void 2805void ecb_hot
2747rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2748{ 2807{
2749 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2750 unsigned int nargs, p; 2809 unsigned int nargs, p;
2751 int n, ndef; 2810 int n, ndef;
… …
2753 2812
2754 nargs = 0; 2813 nargs = 0;
2755 2814
2756 priv = 0; 2815 priv = 0;
2757 ch = cmd_getc (); 2816 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2818 {
2760 /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2820 priv = ch;
2762 ch = cmd_getc (); 2821 ch = cmd_getc ();
2763 } 2822 }
2764 2823
2765 /* read any numerical arguments */ 2824 /* read any numerical arguments */
… …
2814 // versions. 2873 // versions.
2815 // 2874 //
2816 tt_printf ("\033[>%d;95;0c", 'U'); 2875 tt_printf ("\033[>%d;95;0c", 'U');
2817 } 2876 }
2818 break; 2877 break;
2878
2819 case '?': 2879 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2882 break;
2883
2884 case '!':
2885 if (ch == CSI_70)
2886 {
2887 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2888 scr_soft_reset ();
2889
2890 static const int pm_h[] = { 7, 25 };
2891 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2892
2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2895 }
2896 break;
2897 }
2898
2824 return; 2899 return;
2825 } 2900 }
2826 2901
2827 switch (ch) 2902 switch (ch)
2828 { 2903 {
… …
2842 } 2917 }
2843 break; 2918 break;
2844#endif 2919#endif
2845 2920
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2928 break;
2854 2929
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3043 } 3118 }
3044} 3119}
3045/*}}} */ 3120/*}}} */
3046 3121
3047#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3123void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3125{
3052 int x, y; 3126 int x, y;
3053 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3062 { 3136 {
3063 /* 3137 /*
3064 * commands 3138 * commands
3065 */ 3139 */
3066 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3068 break; 3142 break;
3069 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3145 break;
3072 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3148 break;
3075 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3151 break;
3078 case 5: /* raise window */ 3152 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3080 break; 3154 break;
3081 case 6: /* lower window */ 3155 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3083 break; 3157 break;
3084 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3085 scr_touch (true); 3159 scr_touch (true);
3086 break; 3160 break;
3087 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3090 break; 3164 break;
3091 3165
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3167 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3097 break; 3171 break;
3098 3172
3099 /* 3173 /*
3100 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3101 */ 3175 */
3102 case 11: /* report window state */ 3176 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3179 break;
3106 case 13: /* report window position */ 3180 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3186 break;
3113 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3190 break;
3117 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3193 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3196 break;
3123 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3124 { 3198 {
3125 char *s; 3199 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3201 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3202 XFree (s);
3129 } 3203 }
3130 break; 3204 break;
3131 case 21: /* report window title */ 3205 case 21: /* report window title */
3132 { 3206 {
3133 char *s; 3207 char *s;
3134 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3209 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3210 XFree (s);
3137 } 3211 }
3138 break; 3212 break;
3139 } 3213 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3269 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3270 */
3197void 3271void
3198rxvt_term::process_dcs_seq () 3272rxvt_term::process_dcs_seq ()
3199{ 3273{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3274 /*
3204 * Not handled yet 3275 * Not handled yet
3205 */ 3276 */
3277
3278 unicode_t eh;
3206 s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3207 if (s) 3280 if (s)
3208 free (s); 3281 free (s);
3209 3282
3210 return; 3283 return;
3211} 3284}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3288 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3289 */
3217void 3290void
3218rxvt_term::process_osc_seq () 3291rxvt_term::process_osc_seq ()
3219{ 3292{
3220 unicode_t ch, eh;
3221 int arg; 3293 int arg;
3222 3294
3223 ch = cmd_getc (); 3295 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3296 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3297 arg = arg * 10 + (ch - '0');
3226 3298
3227 if (ch == ';') 3299 if (ch == ';')
3228 { 3300 {
3301 unicode_t eh;
3229 char *s = get_to_st (eh); 3302 char *s = get_to_st (eh);
3230 3303
3231 if (s) 3304 if (s)
3232 { 3305 {
3233 process_xterm_seq (arg, s, eh); 3306 process_xterm_seq (arg, s, eh);
… …
3257 3330
3258/* 3331/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3332 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3333 */
3261void 3334void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3335rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3336{
3264 int color; 3337 int color;
3265 char *buf, *name; 3338 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3339 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3340 int saveop = op;
… …
3294 unsigned long bytes_after; 3367 unsigned long bytes_after;
3295 unsigned char *value = 0; 3368 unsigned char *value = 0;
3296 const char *str = ""; 3369 const char *str = "";
3297 3370
3298 if (prop 3371 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3376 && actual_type != None
3304 && actual_format == 8) 3377 && actual_format == 8)
… …
3308 3381
3309 XFree (value); 3382 XFree (value);
3310 } 3383 }
3311 else 3384 else
3312 { 3385 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3386 char *eq = strchr (str, '=');
3314 3387
3315 if (eq) 3388 if (eq)
3316 { 3389 {
3317 *eq = 0; 3390 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3319 } 3392 }
3320 else 3393 else
3321 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3395 display->atom (str));
3323 } 3396 }
3324 break; 3397 break;
3325 3398
3326 case XTerm_Color: 3399 case XTerm_Color:
… …
3339 *buf++ = '\0'; 3412 *buf++ = '\0';
3340 3413
3341 process_color_seq (op, color, name, resp); 3414 process_color_seq (op, color, name, resp);
3342 } 3415 }
3343 break; 3416 break;
3417 case Rxvt_restoreFG:
3344 case XTerm_Color00: 3418 case XTerm_Color00:
3345 process_color_seq (op, Color_fg, str, resp); 3419 process_color_seq (op, Color_fg, str, resp);
3346 break; 3420 break;
3421 case Rxvt_restoreBG:
3347 case XTerm_Color01: 3422 case XTerm_Color01:
3348 process_color_seq (op, Color_bg, str, resp); 3423 process_color_seq (op, Color_bg, str, resp);
3349 break; 3424 break;
3350#ifndef NO_CURSORCOLOR 3425#ifndef NO_CURSORCOLOR
3351 case XTerm_Color_cursor: 3426 case XTerm_Color_cursor:
… …
3356 process_color_seq (op, Color_pointer_fg, str, resp); 3431 process_color_seq (op, Color_pointer_fg, str, resp);
3357 break; 3432 break;
3358 case XTerm_Color_pointer_bg: 3433 case XTerm_Color_pointer_bg:
3359 process_color_seq (op, Color_pointer_bg, str, resp); 3434 process_color_seq (op, Color_pointer_bg, str, resp);
3360 break; 3435 break;
3436#ifdef OPTION_HC
3437 case XTerm_Color_HC:
3438 process_color_seq (op, Color_HC, str, resp);
3439 break;
3440 case XTerm_Color_HTC:
3441 process_color_seq (op, Color_HTC, str, resp);
3442 break;
3443#endif
3361#ifndef NO_BOLD_UNDERLINE_REVERSE 3444#ifndef NO_BOLD_UNDERLINE_REVERSE
3362 case XTerm_Color_RV:
3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD: 3445 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp); 3446 process_color_seq (op, Color_BD, str, resp);
3368 break; 3447 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL: 3448 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp); 3449 process_color_seq (op, Color_UL, str, resp);
3372 break; 3450 break;
3373 case URxvt_Color_IT: 3451 case URxvt_Color_IT:
3374 process_color_seq (op, Color_IT, str, resp); 3452 process_color_seq (op, Color_IT, str, resp);
3375 break; 3453 break;
3376#endif 3454#endif
3455 case URxvt_Color_border:
3456 process_color_seq (op, Color_border, str, resp);
3457 break;
3377#if ENABLE_TRANSPARENCY 3458#if ENABLE_TRANSPARENCY
3378 case URxvt_Color_tint: 3459 case URxvt_Color_tint:
3379 process_color_seq (op, Color_tint, str, resp); 3460 process_color_seq (op, Color_tint, str, resp);
3380 { 3461 {
3381 bool changed = false; 3462 bool changed = false;
3463
3382 if (ISSET_PIXCOLOR (Color_tint)) 3464 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3465 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3384 else 3466
3385 changed = bgPixmap.unset_tint ();
3386 if (changed) 3467 if (changed)
3387 update_background (); 3468 update_background ();
3388 } 3469 }
3389 3470
3390 break; 3471 break;
… …
3393#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3394 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3395 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3396 { 3477 {
3397 char str[256]; 3478 char str[256];
3479 int h_scale = fimage.h_scale;
3480 int v_scale = fimage.v_scale;
3481 int h_align = fimage.h_align;
3482 int v_align = fimage.v_align;
3398 3483
3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3484 sprintf (str, "[%dx%d+%d+%d]",
3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3485 h_scale, v_scale,
3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3486 h_align, v_align);
3402 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
3403 } 3488 }
3404 else 3489 else
3405 { 3490 {
3406 int changed = 0; 3491 bool changed = false;
3407 3492
3408 if (*str != ';') 3493 if (*str != ';')
3409 { 3494 {
3410 /* reset to default scaling :*/ 3495 try
3411 bgPixmap.unset_geometry (); 3496 {
3412 if (bgPixmap.set_file (str)) /* change pixmap */ 3497 fimage.set_file_geometry (this, str);
3413 changed++; 3498 changed = true;
3414 str = strchr (str, ';'); 3499 }
3415 if (str == NULL) 3500 catch (const class rxvt_failure_exception &e)
3416 bgPixmap.set_defaultGeometry (); 3501 {
3502 }
3417 } 3503 }
3418 while (str) 3504 else
3419 { 3505 {
3420 str++; 3506 str++;
3421 if (bgPixmap.set_geometry (str)) 3507 if (fimage.set_geometry (str, true))
3422 changed++; 3508 changed = true;
3423 str = strchr (str, ';');
3424 } 3509 }
3510
3425 if (changed) 3511 if (changed)
3512 {
3513 if (bg_window_position_sensitive ())
3514 {
3515 int x, y;
3516 get_window_origin (x, y);
3517 parent_x = x;
3518 parent_y = y;
3519 }
3426 update_background (); 3520 update_background ();
3521 }
3427 } 3522 }
3428 break; 3523 break;
3429#endif 3524#endif
3430
3431 case Rxvt_restoreFG:
3432 set_window_color (Color_fg, str);
3433 break;
3434 case Rxvt_restoreBG:
3435 set_window_color (Color_bg, str);
3436 break;
3437 3525
3438 case XTerm_logfile: 3526 case XTerm_logfile:
3439 // TODO, when secure mode? 3527 // TODO, when secure mode?
3440 break; 3528 break;
3441 3529
… …
3508 break; 3596 break;
3509#endif 3597#endif
3510 3598
3511#if ENABLE_PERL 3599#if ENABLE_PERL
3512 case URxvt_perl: 3600 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3601 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3602 break;
3516#endif 3603#endif
3517 } 3604 }
3518} 3605}
3519/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3526 * 's' = save 3613 * 's' = save
3527 * 'r' = restore 3614 * 'r' = restore
3528 * 't' = toggle 3615 * 't' = toggle
3529 * so no need for fancy checking 3616 * so no need for fancy checking
3530 */ 3617 */
3531int 3618int ecb_cold
3532rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3533{ 3620{
3534 int state; 3621 int state;
3535 3622
3536 if (mode == 's') 3623 if (mode == 's')
3537 { 3624 {
3538 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3539 return -1; 3629 return -1;
3540 } 3630 }
3541 else 3631 else
3542 { 3632 {
3543 if (mode == 'r') 3633 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3635 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3548 } 3642 }
3549 3643
3550 return state; 3644 return state;
3551} 3645}
3552 3646
3553/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3554void 3648void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3650{
3557 unsigned int i, j; 3651 unsigned int i, j;
3558 int state; 3652 int state;
3559 3653
3560 static const struct 3654 static const struct
3561 { 3655 {
3562 const int argval; 3656 const int argval;
3563 const unsigned long bit; 3657 const unsigned long bit;
3564 } argtopriv[] = { 3658 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3673#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3678 // 45 margin bell NYI
3583 // 46 start logging 3679 // 46 start logging
3584 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3684#endif
3589 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3687 { 1003, PrivMode_MouseAnyEvent },
3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
3601 }; 3704 };
3602 3705
3603 if (nargs == 0) 3706 if (nargs == 0)
3604 return; 3707 return;
3605 3708
… …
3612 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3613 { 3716 {
3614 state = -1; 3717 state = -1;
3615 3718
3616 /* basic handling */ 3719 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3619 { 3722 {
3620 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3621 break; 3724 break;
3622 } 3725 }
… …
3630 3733
3631 scr_touch (true); 3734 scr_touch (true);
3632 break; 3735 break;
3633#endif 3736#endif
3634 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3739 if (mode == 0)
3638 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
3639 else if (mode == 1) 3741 else if (mode == 1)
3640 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3754 * within VT52 mode
3653 */ 3755 */
3654 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
3655 break; 3757 break;
3656 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3658 set_widthheight (((state ? 132 : 80) * fwidth), height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3659 break; 3761 break;
3660 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
3661 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
3662 break; 3764 break;
3663 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
3674 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3676 break; 3778 break;
3677#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3678 case scrollBar_esc: 3780 case scrollBar_esc:
3679 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
3680 {
3681 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3682 scr_touch (true); 3783 scr_touch (true);
3683 }
3684 break; 3784 break;
3685#endif 3785#endif
3686 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3687 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3688 break; 3788 break;
… …
3701 case 1003: 3801 case 1003:
3702 if (state) 3802 if (state)
3703 { 3803 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3706 vt_emask_mouse = PointerMotionMask; 3807 vt_emask_mouse = PointerMotionMask;
3707 } 3808 }
3708 else 3809 else
3709 vt_emask_mouse = NoEventMask; 3810 vt_emask_mouse = NoEventMask;
3811
3710 vt_select_input (); 3812 vt_select_input ();
3711 break; 3813 break;
3712 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
3713 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
3714 break; 3816 break;
3715 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
3716 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
3717 break; 3819 break;
3718 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
3719 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3822 if (!state)
3721 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
3722 scr_change_screen (state); 3825 scr_change_screen (state);
3723 break; 3826 break;
3724 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
3725 scr_change_screen (state); 3832 scr_change_screen (state);
3833
3726 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3727 if (current_screen != PRIMARY) 3835 if (state)
3728 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
3729 break; 3839 break;
3730 default: 3840 default:
3731 break; 3841 break;
3732 } 3842 }
3733 } 3843 }
3734} 3844}
3735/*}}} */ 3845/*}}} */
3736 3846
3737/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3738void 3848void ecb_hot
3739rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3740{ 3850{
3741 unsigned int i; 3851 unsigned int i;
3742 short rendset; 3852 short rendset;
3743 int rendstyle; 3853 int rendstyle;
… …
3886 } 3996 }
3887 } 3997 }
3888} 3998}
3889/*}}} */ 3999/*}}} */
3890 4000
3891/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3892void
3893rxvt_term::process_graphics ()
3894{
3895 unicode_t ch, cmd = cmd_getc ();
3896
3897 if (cmd == 'Q')
3898 {
3899 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */
3901 return;
3902 }
3903 /* swallow other graphics sequences until terminating ':' */
3904 do
3905 ch = cmd_getc ();
3906 while (ch != ':');
3907}
3908/*}}} */
3909
3910/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3911 4002
3912/* 4003/*
3913 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3914 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3927 4018
3928/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3929/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
3930 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3931 */ 4022 */
3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3933 4024
3934void 4025void
3935rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3936{ 4027{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3942 4033
3943 if (v_buflen == 0) 4034 if (v_buflen == 0)
3944 { 4035 {
3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3946 4037
4038 max_it (written, 0);
4039
3947 if ((unsigned int)written == len) 4040 if (written == len)
3948 return; 4041 return;
3949 4042
3950 data += written; 4043 data += written;
3951 len -= written; 4044 len -= written;
3952 } 4045 }
3953 4046
3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3955 4048
3956 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
3957 v_buflen += len; 4050 v_buflen += len;
3958 4051
3959 pty_ev.set (ev::READ | ev::WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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