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