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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.208 by root, Sun Dec 18 00:59:42 2005 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
… …
113 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 119 XK_Print, 0x2399,
116 120
117 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
119 0, 131 0,
120}; 132};
121 133
122void 134void
123rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
124{ 136{
125 x = Pixel2Col (x); 137 x = Pixel2Col (x);
126 y = Pixel2Row (y); 138 y = Pixel2Row (y);
127 139
128 if (x < 0 || x >= TermWin.ncol 140 if (x < 0 || x >= ncol
129 || y < 0 || y >= TermWin.nrow) 141 || y < 0 || y >= nrow)
130 return; 142 return;
131 143
132 for (;;) 144 for (;;)
133 { 145 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = save[y + saveLines - view_start];
147
148 text_t t = l.t[x];
135 149
136 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
137 { 151 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 152 iso14755_51 (l.t[x], l.r[x]);
139 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
140 break; 154 break;
141 } 155 }
142 156
143 x--; 157 x--;
… …
146} 160}
147#endif 161#endif
148 162
149#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
150void 164void
151rxvt_term::iso14755_51 (wchar_t ch) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
152{ 166{
167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 169 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
155 173
156#if ENABLE_COMBINING 174#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
158 { 176 {
159 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
… …
161 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
162 } 180 }
163 else 181 else
164#endif 182#endif
165 { 183 {
184 ch2 = ch;
185
166 alloc = 0; 186 alloc = 0;
167 chr = &ch; 187 chr = &ch2;
168 len = 1; 188 len = 1;
169 } 189 }
170 190
171 scr_overlay_new (0, -1, 8 + 5, len); 191 int width = wcswidth (fname, wcslen (fname));
192
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
194
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 196
173 for (int y = 0; y < len; y++) 197 for (int y = 0; y < len; y++)
174 { 198 {
175 char buf[9]; 199 char buf[9];
176 200
… …
181 scr_overlay_set (9, y, '='); 205 scr_overlay_set (9, y, '=');
182#if !UNICODE3 206#if !UNICODE3
183 if (ch >= 0x10000) 207 if (ch >= 0x10000)
184 ch = 0xfffd; 208 ch = 0xfffd;
185#endif 209#endif
186 scr_overlay_set (11, y, ch); 210 scr_overlay_set (11, y, ch, r);
187 scr_overlay_set (12, y, NOCHAR); 211 scr_overlay_set (12, y, NOCHAR, r);
188 } 212 }
213
214 scr_overlay_set (0, len, fname);
215
216 free (fname);
189 217
190#if ENABLE_COMBINING 218#if ENABLE_COMBINING
191 if (alloc) 219 if (alloc)
192 delete [] alloc; 220 delete [] alloc;
193#endif 221#endif
… …
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 290 * escape sequence to toggle the Keypad.
263 * 291 *
264 * Always permit `shift' to override the current setting 292 * Always permit `shift' to override the current setting
265 */ 293 */
266 shft = (ev.state & ShiftMask); 294 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 295 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 296 meta = ev.state & ModMetaMask;
269 297
270 if (numlock_state || (ev.state & ModNumLockMask)) 298 if (numlock_state || (ev.state & ModNumLockMask))
271 { 299 {
272 numlock_state = (ev.state & ModNumLockMask); 300 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 301 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 321
294 // the XOpenIM manpage lies about hardcoding the locale 322 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 323 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 324 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 325 SET_LOCALE (rs[Rs_imLocale]);
326
298 // assume wchar_t == unicode or better 327 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 328 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 329 KBUFSZ, &keysym, &status_return);
330
301 if (rs[Rs_imLocale]) 331 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 332 SET_LOCALE (locale);
303 333
304 if (status_return == XLookupChars 334 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 335 || status_return == XLookupBoth)
… …
332 valid_keysym = keysym != NoSymbol; 362 valid_keysym = keysym != NoSymbol;
333 } 363 }
334 364
335 if (valid_keysym) 365 if (valid_keysym)
336 { 366 {
367#ifdef KEYSYM_RESOURCE
368 if (keyboard->dispatch (this, keysym, ev.state))
369 return;
370#endif
371
337 if (TermWin.saveLines) 372 if (saveLines)
338 { 373 {
339#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 375 if (!ctrl && !meta)
341#else 376#else
342 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
343#endif 378#endif
344 { 379 {
345 int lnsppg; 380 int lnsppg;
346 381
347#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 384#else
350 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
351#endif 386#endif
352 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
353 { 388 {
354 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
355 return; 390 return;
… …
406 { 441 {
407 /* normal XTerm key bindings */ 442 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 443 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 444 selection_request (ev.time, 0, 0);
410 return; 445 return;
411#if TODO // TODO 446#if TODO
412 /* rxvt extras */ 447 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 448 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 449 change_font (FONT_UP);
415 return; 450 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 451 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 510 }
476#endif 511#endif
477 512
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 513 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 514 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 515 {
506 newlen = 1; 516 newlen = 1;
507 switch (keysym) 517 switch (keysym)
508 { 518 {
509#ifndef NO_BACKSPACE_KEY 519#ifndef NO_BACKSPACE_KEY
… …
517 else 527 else
518 strcpy (kbuf, key_backspace); 528 strcpy (kbuf, key_backspace);
519 break; 529 break;
520#endif 530#endif
521#ifndef NO_DELETE_KEY 531#ifndef NO_DELETE_KEY
532# ifdef XK_KP_Prior
533 case XK_KP_Delete:
534 /* allow shift to override */
535 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
536 {
537 strcpy (kbuf, "\033On");
538 break;
539 }
540 /* FALLTHROUGH */
541# endif
522 case XK_Delete: 542 case XK_Delete:
523 strcpy (kbuf, key_delete); 543 strcpy (kbuf, key_delete);
524 break; 544 break;
525#endif 545#endif
526 case XK_Tab: 546 case XK_Tab:
… …
629#ifdef XK_KP_Begin 649#ifdef XK_KP_Begin
630 case XK_KP_Begin: 650 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 651 strcpy (kbuf, "\033Ou");
632 break; 652 break;
633 653
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 654#endif
642 case XK_KP_F1: /* "\033OP" */ 655 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 656 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 657 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 658 case XK_KP_F4: /* "\033OS" */
… …
677 break; 690 break;
678 691
679 case XK_Find: 692 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 693 strcpy (kbuf, "\033[1~");
681 break; 694 break;
695
696#ifdef XK_KP_End
697 case XK_KP_Insert:
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Op");
702 break;
703 }
704 /* FALLTHROUGH */
705#endif
682 case XK_Insert: 706 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 707 strcpy (kbuf, "\033[2~");
684 break; 708 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 709#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 710 case DXK_Remove:
… …
776#undef FKEY 800#undef FKEY
777 default: 801 default:
778 newlen = 0; 802 newlen = 0;
779 break; 803 break;
780 } 804 }
805
781 if (newlen) 806 if (newlen)
782 len = strlen (kbuf); 807 len = strlen (kbuf);
783 } 808 }
784 809
785 /* 810 /*
… …
794 else if (ctrl && keysym == XK_minus) 819 else if (ctrl && keysym == XK_minus)
795 { 820 {
796 len = 1; 821 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 822 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 823 }
824 else if (keysym == XK_ISO_Left_Tab)
825 {
826 strcpy (kbuf, "\033[Z");
827 len = 3;
828 }
799 else 829 else
800 { 830 {
801#ifdef META8_OPTION 831#ifdef META8_OPTION
802 /* set 8-bit on */ 832 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 833 if (meta && (meta_char == 0x80))
… …
816 846
817 if (len <= 0) 847 if (len <= 0)
818 return; /* not mapped */ 848 return; /* not mapped */
819 849
820 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
821 if (TermWin.view_start) 851 if (view_start)
822 { 852 {
823 TermWin.view_start = 0; 853 view_start = 0;
824 want_refresh = 1; 854 want_refresh = 1;
825 } 855 }
826 856
827 /* 857 /*
828 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
861#endif /* DEBUG_CMD */ 891#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 892 tt_write (kbuf, (unsigned int)len);
863} 893}
864/*}}} */ 894/*}}} */
865 895
866#if (MENUBAR_MAX) 896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */ 898/* attempt to `write' count to the input buffer */
869unsigned int 899unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 900rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
871{ 901{
… …
894 924
895 cmd_parse (); 925 cmd_parse ();
896 926
897 return 0; 927 return 0;
898} 928}
899#endif /* MENUBAR_MAX */ 929#endif
900 930
901void 931void
902rxvt_term::flush () 932rxvt_term::flush ()
903{ 933{
934 flush_ev.stop ();
935
904#ifdef TRANSPARENT 936#ifdef TRANSPARENT
905 if (want_full_refresh) 937 if (want_full_refresh)
906 { 938 {
907 want_full_refresh = 0; 939 want_full_refresh = 0;
908 scr_clear (); 940 scr_clear ();
… …
918 IMSendSpot (); 950 IMSendSpot ();
919#endif 951#endif
920 } 952 }
921 953
922 display->flush (); 954 display->flush ();
923
924 flush_ev.stop ();
925} 955}
926 956
927void 957void
928rxvt_term::check_cb (check_watcher &w) 958rxvt_term::check_cb (check_watcher &w)
929{ 959{
… …
1005{ 1035{
1006 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1039 {
1040 if (view_start == nscrolled ||
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0;
1043
1010 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1045 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1047 }
1014} 1048}
… …
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1080rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1081{
1048 SET_R (this); 1082 SET_R (this);
1049 SET_LOCALE (locale); 1083 SET_LOCALE (locale);
1050 1084
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1085 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1086 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1087 while (pty_fill ())
1056 if (cmd_parse ()) 1088 if (cmd_parse ())
1057 break; 1089 break;
1090
1091 if (revents & EVENT_WRITE)
1092 pty_write ();
1058} 1093}
1059 1094
1060void 1095void
1061rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1062{ 1097{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1064 recolour_cursor (); 1099 recolour_cursor ();
1065 1100
1066#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1102 hidden_pointer = 0;
1068 1103
… …
1076rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1077{ 1112{
1078 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1079 return; 1114 return;
1080 1115
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1082 XFlush (display->display); 1117 XFlush (display->display);
1083 1118
1084 hidden_pointer = 1; 1119 hidden_pointer = 1;
1085} 1120}
1086 1121
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1172 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1173 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1174#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1175 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1176#endif
1142
1143 } 1177 }
1144 1178
1145#ifdef DEBUG_MOUSEREPORT 1179#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1180 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1181 if (key_state & 16)
1148 fputc ('C', stderr); 1182 fputc ('C', stderr);
1149 if (key_state & 4) 1183 if (key_state & 4)
1150 fputc ('S', stderr); 1184 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1188 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1189 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1190 button_number,
1157 x + 1, 1191 x + 1,
1158 y + 1); 1192 y + 1);
1159#else 1193#endif
1194
1160 tt_printf ("\033[M%c%c%c", 1195 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1196 (32 + button_number + key_state),
1162 (32 + x + 1), 1197 (32 + x + 1),
1163 (32 + y + 1)); 1198 (32 + y + 1));
1164#endif
1165} 1199}
1166 1200
1167#ifdef USING_W11LIB 1201#ifdef USING_W11LIB
1168void 1202void
1169rxvt_W11_process_x_event (XEvent *ev) 1203rxvt_W11_process_x_event (XEvent *ev)
… …
1176 1210
1177/*{{{ process an X event */ 1211/*{{{ process an X event */
1178void 1212void
1179rxvt_term::x_cb (XEvent &ev) 1213rxvt_term::x_cb (XEvent &ev)
1180{ 1214{
1215 dDisp;
1216
1181 SET_R (this); 1217 SET_R (this);
1182 SET_LOCALE (locale); 1218 SET_LOCALE (locale);
1183 1219
1184#if defined(CURSOR_BLINK) 1220#if defined(CURSOR_BLINK)
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1206 if (ev.type == KeyPress && hidden_pointer == 0) 1242 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank (); 1243 pointer_blank ();
1208 } 1244 }
1209#endif 1245#endif
1210 1246
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return;
1214#endif
1215
1216 Window unused_root, unused_child; 1247 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1248 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1249 unsigned int unused_mask;
1219 1250
1220 switch (ev.type) 1251 switch (ev.type)
1221 { 1252 {
1222 case KeyPress: 1253 case KeyPress:
1223#if ISO_14755 1254#if ISO_14755
… …
1227 1258
1228 break; 1259 break;
1229 1260
1230 case KeyRelease: 1261 case KeyRelease:
1231 { 1262 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233 KeySym ks; 1264 KeySym ks;
1234 1265
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1267#endif
1237 1268
… …
1306 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1307 break; 1338 break;
1308 1339
1309 case ClientMessage: 1340 case ClientMessage:
1310 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312 destroy (); 1345 destroy ();
1346#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev);
1351#endif
1352 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1313#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1319 { 1368 {
1320 /* Get Dnd data */ 1369 /* Get Dnd data */
1321 Atom ActualType; 1370 Atom ActualType;
1322 int ActualFormat; 1371 int ActualFormat;
1323 unsigned char *data; 1372 unsigned char *data;
1324 unsigned long Size, RemainingBytes; 1373 unsigned long Size, RemainingBytes;
1325 1374
1326 XGetWindowProperty (display->display, display->root, 1375 XGetWindowProperty (disp, display->root,
1327 xa[XA_DNDSELECTION], 1376 xa[XA_DNDSELECTION],
1328 0L, 1000000L, 1377 0L, 1000000L,
1329 False, AnyPropertyType, 1378 False, AnyPropertyType,
1330 &ActualType, &ActualFormat, 1379 &ActualType, &ActualFormat,
1331 &Size, &RemainingBytes, 1380 &Size, &RemainingBytes,
1332 &data); 1381 &data);
1333 XChangeProperty (display->display, display->root, 1382 set_string_property (XA_CUT_BUFFER0, data);
1334 XA_CUT_BUFFER0, XA_STRING,
1335 8, PropModeReplace,
1336 data, strlen (data));
1337 XFree (data); 1383 XFree (data);
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340 } 1386 }
1341#endif /* OFFIX_DND */ 1387#endif /* OFFIX_DND */
1342 break; 1388 break;
1343 1389
1344 case MappingNotify: 1390 case MappingNotify:
… …
1369 break; 1415 break;
1370 } 1416 }
1371 break; 1417 break;
1372 1418
1373 case FocusIn: 1419 case FocusIn:
1374 if (!TermWin.focus) 1420 focus_in ();
1421 break;
1422
1423 case FocusOut:
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0])
1375 { 1429 {
1376 TermWin.focus = 1; 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1431 ;
1378#ifdef USE_XIM 1432
1379 if (Input_Context != NULL) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1434 {
1381 IMSetStatusPosition (); 1435 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1437 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398
1399 }
1400 break;
1401
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444 1438
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1447 {
1448 check_our_parents (); 1441 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif 1442#endif
1453 } 1443 }
1454 break; 1444 break;
1455 1445
1456 case PropertyNotify: 1446 case PropertyNotify:
… …
1464 selection_clear (); 1454 selection_clear ();
1465 break; 1455 break;
1466 1456
1467 case SelectionNotify: 1457 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1458 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1460 break;
1472 1461
1473 case SelectionRequest: 1462 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1475 break; 1464 break;
1476 1465
1477 case UnmapNotify: 1466 case UnmapNotify:
1478 TermWin.mapped = 0; 1467 mapped = 0;
1479#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1481#endif 1470#endif
1482 break; 1471 break;
1483 1472
1484 case MapNotify: 1473 case MapNotify:
1485 TermWin.mapped = 1; 1474 mapped = 1;
1486#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1477#endif
1489 break; 1478 break;
1490 1479
… …
1494 break; 1483 break;
1495#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1496 1485
1497 case GraphicsExpose: 1486 case GraphicsExpose:
1498 case Expose: 1487 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1500 { 1489 {
1501 do 1490 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1494
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1496
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1511 1500
1512 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1513 } 1502 }
1514 else 1503 else
1515 { 1504 {
1516 XEvent unused_event; 1505 XEvent unused_event;
1517 1506
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519 ; 1508 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1510 ;
1522 1511
1523 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1524 { 1513 {
1525 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1519 menubar_expose ();
1531#endif 1520#endif
1532 1521
1533#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1536#endif 1525#endif
1537 } 1526 }
1538 break; 1527 break;
1539 1528
1540 case MotionNotify: 1529 case MotionNotify:
… …
1547 { 1536 {
1548 menubar_control (ev.xbutton); 1537 menubar_control (ev.xbutton);
1549 break; 1538 break;
1550 } 1539 }
1551#endif 1540#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1542 break;
1554 1543
1555 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1556 { 1545 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1547 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1549 ;
1561 1550
1562 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1555 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1559 {
1571#endif 1560#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1566 break;
1578 } 1567 }
1579#endif 1568#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1582#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1575 {
1586 int dist; 1576 int dist;
1587 1577
1588 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1590
1601 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1603 { 1593 {
1604 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1606 } 1596 }
1607 else 1597 else
1608 { 1598 {
1609 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1601 }
1612 1602
1613 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1605 + 1;
… …
1630#endif 1620#endif
1631 } 1621 }
1632 } 1622 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1624 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1637 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1638 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1633 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1635 scrollbar_size ());
1644 scr_refresh (refresh_type); 1636 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1637 refresh_limit = 0;
… …
1647 } 1639 }
1648 break; 1640 break;
1649 } 1641 }
1650} 1642}
1651 1643
1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!focus)
1648 {
1649 focus = 1;
1650 want_refresh = 1;
1651#if USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (focus)
1676 {
1677 focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1652#if TRANSPARENT 1705#if TRANSPARENT
1653void 1706void
1654rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1708{
1656 SET_R (this); 1709 SET_R (this);
… …
1661 case PropertyNotify: 1714 case PropertyNotify:
1662 /* 1715 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1716 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1717 * use the property to determine the pixmap. We use it later on.
1665 */ 1718 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1721 return;
1671 1722
1672 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1673 case ReparentNotify: 1724 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1740
1690 /* 1741 /*
1691 * VT window processing of button press 1742 * VT window processing of button press
1692 */ 1743 */
1693 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1694 { 1745 {
1695#if ISO_14755 1746#if ISO_14755
1696 // 5.4 1747 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1749 {
… …
1700 return; 1751 return;
1701 } 1752 }
1702#endif 1753#endif
1703 1754
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1755 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1756
1705 if (reportmode) 1757 if (reportmode)
1706 { 1758 {
1707 /* mouse report from vt window */ 1759 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1760 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1761 MEvent.state = ev.state;
… …
1738 } 1790 }
1739 else 1791 else
1740 { 1792 {
1741 if (ev.button != MEvent.button) 1793 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1794 MEvent.clicks = 0;
1795
1743 switch (ev.button) 1796 switch (ev.button)
1744 { 1797 {
1745 case Button1: 1798 case Button1:
1799 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */
1801#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask);
1803#else
1804 selection.rect = false;
1805#endif
1806
1746 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748 { 1809 {
1749 if (MEvent.button == Button1 && clickintime) 1810 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1811 selection_rotate (ev.x, ev.y);
… …
1893 case Button3: 1954 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1895 { 1956 {
1896 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1899# else 1960# else
1900 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1901# endif 1962# endif
1902 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1905# else 1966# else
1906 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1907# endif 1968# endif
1908 else 1969 else
1909 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1910 } 1971 }
1911 else 1972 else
1912 { 1973 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 1975 (nrow
1915 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 1977 / scrollbar_size ()));
1917 } 1978 }
1918 1979
1919 break; 1980 break;
… …
1951#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1954#endif 2015#endif
1955 2016
1956 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1957 { 2018 {
1958#if ISO_14755 2019#if ISO_14755
1959 // 5.4 2020 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2022 return;
… …
2012 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2013 2074
2014 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2015 i = 1; 2076 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2017 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2018 else 2079 else
2019 i = 5; 2080 i = 5;
2020 2081
2021# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2023 { 2084 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2088
2028 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2091
2031 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2136 int i;
2076 2137
2077 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
2078 2139
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2141
2081 /* for convenience */ 2142 /* for convenience */
2082 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2303 Atom atype; 2364 Atom atype;
2304 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2366 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2308 2370
2309 pchanged = 0; 2371 pchanged = 0;
2310 2372
2311 if (!(options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2313 2375
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2316 2378
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2318 2380
2319 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2320 { 2382 {
2321 if (am_transparent) 2383 if (am_transparent)
2322 { 2384 {
2323 pchanged = 1; 2385 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2326 } 2388 }
2327 2389
2328 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2329 } 2391 }
2330 2392
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2394 XSync (disp, False);
2333 2395
2334 /* 2396 /*
2335 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
2338 */ 2400 */
2339 i = (xa[XA_XROOTPMAPID] 2401 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2343 2405
2344 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2349 2411
2350 if (!i || prop == NULL 2412 if (!i || prop == NULL
2351#if TINTING 2413#if TINTING
… …
2370 Window cr; 2432 Window cr;
2371 XImage *image; 2433 XImage *image;
2372 GC gc; 2434 GC gc;
2373 XGCValues gcvalue; 2435 XGCValues gcvalue;
2374 2436
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2441 nx = ny = 0;
2380 2442
… …
2392 sy = 0; 2454 sy = 0;
2393 } 2455 }
2394 2456
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2397 allowedxerror = -1; 2461 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2463
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2466 allowedxerror = 0;
2403 2467
2404 if (image == NULL) 2468 if (image == NULL)
2405 { 2469 {
2406 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2407 { 2471 {
2408 pchanged = 1; 2472 pchanged = 1;
2409 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2410 { 2474 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2412 TermWin.pixmap = None; 2476 pixmap = None;
2413 } 2477 }
2414 } 2478 }
2415 2479
2416 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2417 } 2481 }
2418 else 2482 else
2419 { 2483 {
2420 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2422 2486
2423#if TINTING 2487#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2489 {
2426 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2430 2494
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2432 } 2496 }
2433#endif 2497#endif
2434 2498
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2436 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2441 XDestroyImage (image); 2505 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2444 2508
2445 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2510 pchanged = 1;
2447 2511
2448 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2449 } 2513 }
2450 } 2514 }
2451 2515
2452 if (!am_pixmap_trans) 2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else
2453 { 2519 {
2454 unsigned int n; 2520 unsigned int n;
2455 /* 2521 /*
2456 * InheritPixmap transparency 2522 * InheritPixmap transparency
2457 */ 2523 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2525 {
2460 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2463 XFree (list); 2529 XFree (list);
2464 2530
2465 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2466 { 2532 {
2467 if (oldp != None) 2533 if (oldp != None)
2468 pchanged = 1; 2534 pchanged = 1;
2469 2535
2470 break; 2536 break;
2471 } 2537 }
2472 2538
2473 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2474 pchanged = 1; 2540 pchanged = 1;
2475 } 2541 }
2476 2542
2477 n = 0; 2543 n = 0;
2478 2544
2479 if (pchanged) 2545 if (pchanged)
2480 { 2546 {
2481 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2482 { 2548 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2551 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2553 break;
2488 } 2554 }
2489 } 2555 }
2490 } 2556 }
2491 2557
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2493 { 2559 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2562 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2498 } 2564 }
2499 else 2565 else
2500 { 2566 {
… …
2503 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1); 2570 sleep (1);
2505#endif 2571#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2507 { 2573 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2510 } 2576 }
2511 2577
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2513 am_transparent = 1; 2579 am_transparent = 1;
2514 } 2580 }
2515 2581
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2583 parent[i] = None;
2518 } 2584 }
2519 2585
2520 // this is experimental
2521 if (scrollBar.win) 2586 if (scrollBar.win)
2522 { 2587 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2526 scrollbar_show (0); 2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2527 } 2598 }
2528 2599
2529 return pchanged; 2600 return pchanged;
2530} 2601}
2531#endif 2602#endif
… …
2557 seen_input = 1; 2628 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2629 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2630 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2631 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2632 // then sometimes get the size wrong.
2633 // unfortunately other programs are even more buggy and dislike
2634 // being sent SIGWINCH, so only do it when we were in fact being
2635 // resized.
2636 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2637 kill (-cmd_pid, SIGWINCH);
2563 } 2638 }
2564 2639
2565 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2642 bool refreshnow = false;
2568 int nlines = 0; 2643 int nlines = 0;
2569 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2570 2646
2571 for (;;) 2647 for (;;)
2572 { 2648 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2650 break;
2575 2651
2576 *str++ = ch; 2652 *str++ = ch;
2577 2653
2578 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2579 { 2655 {
2656 if (ch == C0_LF)
2580 nlines++; 2657 nlines++;
2658
2581 refresh_count++; 2659 refresh_count++;
2582 2660
2583 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2663 {
2586 refreshnow = true; 2664 refreshnow = true;
2587 ch = NOCHAR; 2665 ch = NOCHAR;
2588 break; 2666 break;
2589 } 2667 }
2590 2668
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2593 { 2671 {
2594 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2595 nlines = 0; 2673 nlines = 0;
2596 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2597 } 2676 }
2598 }
2599 2677
2600 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2601 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2602 ch = NOCHAR; 2682 ch = NOCHAR;
2603 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2604 } 2689 }
2605 2690
2606 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2692 ch = next_char ();
2608 } 2693 }
… …
2679 if (len == (size_t)-1) 2764 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2766
2682 // assume wchar == unicode 2767 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2768 cmdbuf_ptr += len;
2684 return wc; 2769 return wc & UNICODE_MASK;
2685 } 2770 }
2686 2771
2687 return NOCHAR; 2772 return NOCHAR;
2688} 2773}
2689 2774
… …
3152 { 3237 {
3153 switch (priv) 3238 switch (priv)
3154 { 3239 {
3155 case '>': 3240 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3241 if (ch == CSI_DA) /* secondary device attributes */
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158 break; 3243 break;
3159 case '?': 3244 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3246 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3247 break;
… …
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3476rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3477{
3393 int x, y; 3478 int x, y;
3394 XWindowAttributes wattr; 3479 XWindowAttributes wattr;
3395 Window wdummy; 3480 Window wdummy;
3481 dDisp;
3396 3482
3397 if (nargs == 0) 3483 if (nargs == 0)
3398 return; 3484 return;
3399 3485
3400 switch (args[0]) 3486 switch (args[0])
3401 { 3487 {
3402 /* 3488 /*
3403 * commands 3489 * commands
3404 */ 3490 */
3405 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3407 break; 3493 break;
3408 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3495 XIconifyWindow (disp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3496 break;
3412 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3414 break; 3499 break;
3415 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3502 break;
3418 case 5: /* raise window */ 3503 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3420 break; 3505 break;
3421 case 6: /* lower window */ 3506 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3423 break; 3508 break;
3424 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3425 scr_touch (true); 3510 scr_touch (true);
3426 break; 3511 break;
3427 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3430 break; 3515 break;
3431 3516
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3518 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3437 break; 3522 break;
3438 3523
3439 3524
3440 /* 3525 /*
3441 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3442 */ 3527 */
3443 case 11: /* report window state */ 3528 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3531 break;
3447 case 13: /* report window position */ 3532 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3538 break;
3454 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3542 break;
3458 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3545 break;
3461 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3548 break;
3464 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3465 { 3550 {
3466 char *s; 3551 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3554 XFree (s);
3470 } 3555 }
3471 break; 3556 break;
3472 case 21: /* report window title */ 3557 case 21: /* report window title */
3473 { 3558 {
3474 char *s; 3559 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3562 XFree (s);
3478 } 3563 }
3479 break; 3564 break;
3480 } 3565 }
… …
3487 * ends_how is terminator used. returned input must be free()'d 3572 * ends_how is terminator used. returned input must be free()'d
3488 */ 3573 */
3489unsigned char * 3574unsigned char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3575rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3576{
3492 unicode_t prev = 0, ch; 3577 unicode_t ch;
3578 bool seen_esc = false;
3493 unsigned int n = 0; 3579 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3580 wchar_t string[STRING_MAX];
3496 3581
3497 while ((ch = cmd_getc ()) != NOCHAR) 3582 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3583 {
3499 if (prev == C0_ESC) 3584 if (seen_esc)
3500 { 3585 {
3501 if (ch == 0x5c) /* 7bit ST */ 3586 if (ch == 0x5c) /* 7bit ST */
3502 break; 3587 break;
3503 else 3588 else
3504 return NULL; 3589 return NULL;
3505 } 3590 }
3591 else if (ch == C0_ESC)
3592 {
3593 seen_esc = true;
3594 continue;
3595 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3596 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3597 break;
3508 else if (ch < 0x20) 3598 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3510 3600
3511 if (n >= sizeof (string) - 1) 3601 seen_esc = false;
3602
3603 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3604 // stop at some sane length
3513 return NULL; 3605 return NULL;
3514 3606
3515 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3609 else
3521 string[n++] = prev = ch; 3610 string[n++] = ch;
3522 } 3611 }
3523 3612
3524 string[n++] = '\0'; 3613 string[n++] = '\0';
3525 3614
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3615 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3616
3531 return s; 3617 return (unsigned char *)rxvt_wcstombs (string);
3532} 3618}
3533 3619
3534/*----------------------------------------------------------------------*/ 3620/*----------------------------------------------------------------------*/
3535/* 3621/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3590 set_window_color (color, str); 3676 set_window_color (color, str);
3591} 3677}
3592 3678
3593/* 3679/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3681 */
3618void 3682void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3620{ 3684{
3621 int changed = 0; 3685 int changed = 0;
3622 int color; 3686 int color;
3623 char *buf, *name; 3687 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3688 bool query = str[0] == '?' && !str[1];
3689 int saveop = op;
3690 dDisp;
3625 3691
3626 assert (str != NULL); 3692 assert (str != NULL);
3627 switch (op) 3693 switch (op)
3628 { 3694 {
3629 case XTerm_name: 3695 case XTerm_name:
… …
3636 set_title (str); 3702 set_title (str);
3637 break; 3703 break;
3638 case XTerm_property: 3704 case XTerm_property:
3639 if (str[0] == '?') 3705 if (str[0] == '?')
3640 { 3706 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3707 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3708 Atom actual_type;
3643 int actual_format; 3709 int actual_format;
3644 unsigned long nitems; 3710 unsigned long nitems;
3645 unsigned long bytes_after; 3711 unsigned long bytes_after;
3646 unsigned char *value = 0; 3712 unsigned char *value = 0;
3647 const char *str = ""; 3713 const char *str = "";
3648 3714
3649 if (prop 3715 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3720 && actual_type != None
3655 && actual_format == 8) 3721 && actual_format == 8)
… …
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3730 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3731
3666 if (eq) 3732 if (eq)
3667 { 3733 {
3668 *eq = 0; 3734 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3735 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3736 }
3674 else 3737 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3676 display->atom (str)); 3739 display->atom (str));
3677 } 3740 }
3678 break; 3741 break;
3679 3742
3680 case XTerm_Color: 3743 case XTerm_Color:
… …
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break; 3791 break;
3729 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3798#endif
3799#if TRANSPARENT && TINTING
3800 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3802 check_our_parents ();
3803 if (am_transparent)
3804 want_full_refresh = want_refresh = 1;
3805 break;
3732#endif 3806#endif
3733 3807
3734 case XTerm_Pixmap: 3808 case XTerm_Pixmap:
3735 if (*str != ';') 3809 if (*str != ';')
3736 { 3810 {
… …
3744 { 3818 {
3745 str++; 3819 str++;
3746#if XPM_BACKGROUND 3820#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3821 changed += scale_pixmap (str);
3748#endif 3822#endif
3749
3750 } 3823 }
3824
3751 if (changed) 3825 if (changed)
3752 { 3826 {
3753#ifdef XPM_BACKGROUND 3827#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3828 resize_pixmap ();
3755#endif 3829#endif
… …
3766 3840
3767 case XTerm_logfile: 3841 case XTerm_logfile:
3768 // TODO, when secure mode? 3842 // TODO, when secure mode?
3769 break; 3843 break;
3770 3844
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR 3845#ifdef MENUBAR
3806 case XTerm_Menu: 3846 case URxvt_Menu:
3807 if (options & Opt_insecure) 3847 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break; 3849 break;
3810#endif 3850#endif
3811#if 0 3851#if 0
… …
3816 { 3856 {
3817 scr_dump (fd); 3857 scr_dump (fd);
3818 close (fd); 3858 close (fd);
3819 } 3859 }
3820 } 3860 }
3861 break;
3862#endif
3863 case XTerm_font:
3864 op = URxvt_font;
3865 case URxvt_font:
3866#if ENABLE_STYLES
3867 case URxvt_boldFont:
3868 case URxvt_italicFont:
3869 case URxvt_boldItalicFont:
3870#endif
3871 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp);
3876 else
3877 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3879
3880 res = strdup (str);
3881 allocated.push_back ((void *)res);
3882 set_fonts ();
3883 }
3884 break;
3885
3886#if ENABLE_FRILLS
3887 case URxvt_locale:
3888 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3890 else
3891 {
3892 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8);
3894 init_xlocale ();
3895 }
3896 break;
3897
3898 case URxvt_view_up:
3899 case URxvt_view_down:
3900 int lines = atoi (str);
3901
3902 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else
3905 {
3906 scr_erase_savelines ();
3907 }
3908
3821 break; 3909 break;
3822#endif 3910#endif
3823 } 3911 }
3824} 3912}
3825/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
3935 4023
3936 /* extra handling for values with state unkept */ 4024 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4025 switch (arg[i])
3938 { 4026 {
3939 case 1048: /* alternative cursor save */ 4027 case 1048: /* alternative cursor save */
4028 case 1049:
3940 if (options & Opt_secondaryScreen) 4029 if (options & Opt_secondaryScreen)
3941 if (mode == 0) 4030 if (mode == 0)
3942 scr_cursor (RESTORE); 4031 scr_cursor (RESTORE);
3943 else if (mode == 1) 4032 else if (mode == 1)
3944 scr_cursor (SAVE); 4033 scr_cursor (SAVE);
… …
3957 */ 4046 */
3958 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
3959 break; 4048 break;
3960 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4052 break;
3964 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
3965 if (state) 4054 if (state)
3966 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
3967 else 4056 else
… …
4069 rendset = 0, rendstyle = ~RS_None; 4158 rendset = 0, rendstyle = ~RS_None;
4070 break; 4159 break;
4071 case 1: 4160 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4161 rendset = 1, rendstyle = RS_Bold;
4073 break; 4162 break;
4074 //case 2: // faint or second colour 4163 //case 2: // low intensity
4075 //case 3: // italic 4164 case 3:
4165 rendset = 1, rendstyle = RS_Italic;
4166 break;
4076 case 4: 4167 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4168 rendset = 1, rendstyle = RS_Uline;
4078 break; 4169 break;
4079 case 5: // slowly blinking 4170 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4171 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4183 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4184 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4185 //...
4095 //case 19: // ninth alt font 4186 //case 19: // ninth alt font
4096 //case 20: // gothic 4187 //case 20: // gothic
4097 case 21: // disable bold, faint 4188 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4189 rendset = 0, rendstyle = RS_Bold;
4099 break; 4190 break;
4100 case 22: 4191 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4192 rendset = 0, rendstyle = RS_Bold;
4102 break; 4193 break;
4103 //case 23: disable italic 4194 case 23: // disable italic
4195 rendset = 0, rendstyle = RS_Italic;
4196 break;
4104 case 24: 4197 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4198 rendset = 0, rendstyle = RS_Uline;
4106 break; 4199 break;
4107 case 25: 4200 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4201 rendset = 0, rendstyle = RS_Blink;
4109 break; 4202 break;
4110 case 26: 4203 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4204 rendset = 0, rendstyle = RS_Blink;
4112 break; 4205 break;
4113 case 27: 4206 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4207 rendset = 0, rendstyle = RS_RVid;
4115 break; 4208 break;
… …
4133 case 35: 4226 case 35:
4134 case 36: 4227 case 36:
4135 case 37: 4228 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4229 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4230 break;
4138#ifdef TTY_256COLOR 4231 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4232 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4233 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4234 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4235 i += 2;
4144 } 4236 }
4145 break; 4237 break;
4146#endif
4147 case 39: /* default fg */ 4238 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4239 scr_color (Color_fg, Color_fg);
4149 break; 4240 break;
4150 4241
4151 case 40: 4242 case 40:
… …
4156 case 45: 4247 case 45:
4157 case 46: 4248 case 46:
4158 case 47: 4249 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4250 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4251 break;
4161#ifdef TTY_256COLOR 4252 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4253 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4254 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4255 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4256 i += 2;
4167 } 4257 }
4168 break; 4258 break;
4169#endif
4170 case 49: /* default bg */ 4259 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4260 scr_color (Color_bg, Color_bg);
4172 break; 4261 break;
4262
4263 //case 50: // not variable spacing
4173 4264
4174#ifndef NO_BRIGHTCOLOR 4265#ifndef NO_BRIGHTCOLOR
4175 case 90: 4266 case 90:
4176 case 91: /* set bright fg color */ 4267 case 91: /* set bright fg color */
4177 case 92: 4268 case 92:
4178 case 93: 4269 case 93:
4179 case 94: 4270 case 94:
4180 case 95: 4271 case 95:
4181 case 96: 4272 case 96:
4182 case 97: 4273 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4275 break;
4186 case 100: 4276 case 100:
4187 case 101: /* set bright bg color */ 4277 case 101: /* set bright bg color */
4188 case 102: 4278 case 102:
4189 case 103: 4279 case 103:
4190 case 104: 4280 case 104:
4191 case 105: 4281 case 105:
4192 case 106: 4282 case 106:
4193 case 107: 4283 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4285 break;
4197#endif 4286#endif
4198 4287
4199 } 4288 }
4200 } 4289 }
… …
4239 4328
4240/* ---------------------------------------------------------------------- */ 4329/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4330/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4331 * or generated by us in response to a query ESC sequence.
4243 */ 4332 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334
4244void 4335void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4336rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4246{ 4337{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4338 if (v_buflen == 0)
4339 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4248 4341
4249 if (len) 4342 if ((unsigned int)written == len)
4343 return;
4344
4345 data += written;
4346 len -= written;
4250 { 4347 }
4348
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4350
4351 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len;
4353
4354 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355}
4356
4357void rxvt_term::pty_write ()
4358{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360
4361 if (written > 0)
4362 {
4363 v_buflen -= written;
4364
4251 if (v_buflen == 0) 4365 if (v_buflen == 0)
4252 { 4366 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4367 free (v_buffer);
4280 v_buffer = 0; 4368 v_buffer = 0;
4281 v_buflen = 0; 4369 v_buflen = 0;
4282 4370
4283 pty_ev.set (EVENT_READ); 4371 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4372 return;
4296 } 4373 }
4374
4375 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4376 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this...
4379 destroy ();
4298} 4380}
4299 4381
4300/*----------------------- end-of-file (C source) -----------------------*/ 4382/*----------------------- end-of-file (C source) -----------------------*/
4301 4383

Diff Legend

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