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.213 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.286 by root, Wed Jan 25 21:09:21 2006 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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 const line_t &l = ROW(-view_start); 149 const line_t &l = ROW(y + view_start);
147 150
148 text_t t = l.t[x]; 151 text_t t = l.t[x];
149 152
150 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
151 { 154 {
152 iso14755_51 (l.t[x], l.r[x]); 155 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
154 break; 157 break;
155 } 158 }
156 159
157 x--; 160 x--;
158 } 161 }
159} 162}
160#endif
161 163
162#if ENABLE_OVERLAY
163void 164void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 166{
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
170 171
171 fname = rxvt_utf8towcs (f->name); 172 fname = rxvt_utf8towcs (f->name);
172 173
173#if ENABLE_COMBINING 174# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
175 { 176 {
176 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
179 } 180 }
180 else 181 else
181#endif 182# endif
182 { 183 {
183 ch2 = ch; 184 ch2 = ch;
184 185
185 alloc = 0; 186 alloc = 0;
186 chr = &ch2; 187 chr = &ch2;
187 len = 1; 188 len = 1;
188 } 189 }
189 190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
190 int width = wcswidth (fname, wcslen (fname)); 203 int width = wcswidth (fname, wcslen (fname));
191 204
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
193 215
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 217
196 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
197 { 219 {
… …
200 ch = *chr++; 222 ch = *chr++;
201 223
202 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
205#if !UNICODE3 227# if !UNICODE3
206 if (ch >= 0x10000) 228 if (ch >= 0x10000)
207 ch = 0xfffd; 229 ch = 0xfffd;
208#endif 230# endif
209 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
211 } 233 }
212 234
235 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 236 scr_overlay_set (0, len + 1, fname);
214 237
215 free (fname); 238 free (fname);
216 239
217#if ENABLE_COMBINING 240# if ENABLE_COMBINING
218 if (alloc) 241 if (alloc)
219 delete [] alloc; 242 delete [] alloc;
220#endif 243# endif
221} 244}
222#endif 245#endif
223 246
224void 247void
225rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 265 mb[0] = ch[0];
243 len = 1; 266 len = 1;
244 } 267 }
245 268
246 if (len > 0) 269 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
248 else 271 else
249 scr_bell (); 272 scr_bell ();
250 } 273 }
251 274
252 iso14755buf = 0; 275 iso14755buf = 0;
… …
276rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
277{ 300{
278 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
279 unsigned int newlen; 302 unsigned int newlen;
280 KeySym keysym; 303 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 304 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
286 306
287 /* 307 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 309 * escape sequence to toggle the Keypad.
290 * 310 *
… …
308 Status status_return; 328 Status status_return;
309 329
310#if 0 330#if 0
311#ifdef X_HAVE_UTF8_STRING 331#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 333 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 334 KBUFSZ, &keysym, &status_return);
315 else 335 else
316#endif 336#endif
317#endif 337#endif
318 { 338 {
… …
355 || status_return == XLookupBoth; 375 || status_return == XLookupBoth;
356 } 376 }
357 else 377 else
358#endif 378#endif
359 { 379 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 380 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 381 valid_keysym = keysym != NoSymbol;
362 } 382 }
363 383
364 if (valid_keysym) 384 if (valid_keysym)
365 { 385 {
… …
417 scr_move_to (0, 1); 437 scr_move_to (0, 1);
418 return; 438 return;
419 } 439 }
420 else if (keysym == XK_End) 440 else if (keysym == XK_End)
421 { 441 {
422 scr_move_to (1, 0); 442 scr_move_to (1, 1);
423 return; 443 return;
424 } 444 }
425 } 445 }
426#endif 446#endif
427 } 447 }
… …
438 { 458 {
439 switch (keysym) 459 switch (keysym)
440 { 460 {
441 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
444 return; 464 return;
445#if TODO 465#if TODO
446 /* rxvt extras */ 466 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 468 change_font (FONT_UP);
… …
829 { 849 {
830#ifdef META8_OPTION 850#ifdef META8_OPTION
831 /* set 8-bit on */ 851 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 852 if (meta && (meta_char == 0x80))
833 { 853 {
834 unsigned char *ch; 854 char *ch;
835 855
836 for (ch = kbuf; ch < kbuf + len; ch++) 856 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 857 *ch |= 0x80;
838 858
839 meta = 0; 859 meta = 0;
… …
841#endif 861#endif
842 /* nil */ ; 862 /* nil */ ;
843 } 863 }
844 } 864 }
845 865
866 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
867 return;
868
846 if (len <= 0) 869 if (len <= 0)
847 return; /* not mapped */ 870 return; /* not mapped */
848 871
849 if (options & Opt_scrollTtyKeypress) 872 if (OPTION (Opt_scrollTtyKeypress))
850 if (view_start) 873 if (view_start)
851 { 874 {
852 view_start = 0; 875 view_start = 0;
853 want_refresh = 1; 876 want_refresh = 1;
854 } 877 }
… …
872#ifdef META8_OPTION 895#ifdef META8_OPTION
873 && meta_char == C0_ESC 896 && meta_char == C0_ESC
874#endif 897#endif
875 ) 898 )
876 { 899 {
877 const unsigned char ch = C0_ESC; 900 const char ch = C0_ESC;
878 tt_write (&ch, 1); 901 tt_write (&ch, 1);
879 } 902 }
880 903
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 904 tt_write (kbuf, (unsigned int)len);
892} 905}
893/*}}} */ 906/*}}} */
894 907
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 909unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 911{
901 unsigned int n, s; 912 unsigned int n, s;
902 913
903 n = cmdbuf_ptr - cmdbuf_base; 914 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 915 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
941 } 952 }
942#endif 953#endif
943 954
944 if (want_refresh) 955 if (want_refresh)
945 { 956 {
957 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
958 {
959 int row = view_start;
960 int end_row = row + nrow;
961
962 while (row > top_row && ROW (row - 1).is_longer ())
963 --row;
964
965 do
966 {
967 int start_row = row;
968 line_t *l;
969
970 do
971 {
972 l = &ROW (row++);
973
974 if (!(l->f & LINE_FILTERED))
975 {
976 // line not filtered, mark it as filtered
977 l->f |= LINE_FILTERED;
978 while (l->is_longer ())
979 {
980 l = &ROW (row++);
981 l->f |= LINE_FILTERED;
982 }
983
984 // and filter it
985 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
986
987 break;
988 }
989 }
990 while (l->is_longer () && row < end_row);
991 }
992 while (row < end_row);
993 }
994
946 scr_refresh (refresh_type); 995 scr_refresh ();
947 scrollbar_show (1); 996 scrollbar_show (1);
948#ifdef USE_XIM 997#ifdef USE_XIM
949 IMSendSpot (); 998 IMSendSpot ();
950#endif 999#endif
951 } 1000 }
… …
954} 1003}
955 1004
956void 1005void
957rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
958{ 1007{
959 SET_R (this); 1008 make_current ();
960 SET_LOCALE (locale);
961 1009
962 display->flush (); 1010 display->flush ();
963 1011
964 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1014}
967 1015
968void 1016void
969rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
970{ 1018{
971 SET_R (this); 1019 make_current ();
972 SET_LOCALE (locale);
973 1020
974 refresh_limit = 1; 1021 refresh_limit = 1;
975 refresh_count = 0; 1022 refresh_count = 0;
976 flush (); 1023 flush ();
977} 1024}
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1029{
983 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1031 want_refresh = 1;
985 1032
986 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1034}
988#endif 1035#endif
989 1036
990#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
991void 1038void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1053{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1056 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1057 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1059 }
1014} 1060}
1015#endif 1061#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1066{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1068 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1070 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1072 }
1028} 1073}
1029#endif 1074#endif
… …
1034{ 1079{
1035 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1083 {
1039 if (view_start == nsaved || 1084 if (view_start == top_row || view_start == 0)
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1042 1086
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1087 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1089 }
1047} 1090}
1048#endif 1091#endif
1049 1092
1093#if HAVE_SCHED_YIELD
1094static struct event_handler
1095{
1096 check_watcher cw_yield;
1097
1098 void yield (check_watcher &w)
1099 {
1100 sched_yield ();
1101 w.stop ();
1102 }
1103
1104 event_handler ()
1105 : cw_yield (this, &event_handler::yield)
1106 {
1107 }
1108} event_handler;
1109#endif
1110
1050bool 1111bool
1051rxvt_term::pty_fill () 1112rxvt_term::pty_fill ()
1052{ 1113{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1114 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1115
1055 if (CBUFSIZ == n) 1116 if (CBUFSIZ == n)
1056 { 1117 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1118 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1119 n = 0;
1059 } 1120 }
1060 1121
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1064 1125
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1127
1067 if (n > 0) 1128 if (r > 0)
1068 { 1129 {
1069 cmdbuf_endp += n; 1130 cmdbuf_endp += r;
1070 return true; 1131 return true;
1071 } 1132 }
1072 else if (n < 0 && errno != EAGAIN && errno != EINTR) 1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 {
1135#if HAVE_SCHED_YIELD
1136 if (display->is_local)
1137 event_handler.cw_yield.start ();
1138#endif
1139 }
1140 else
1141 {
1073 pty_ev.stop (); 1142 pty_ev.stop ();
1143
1144 if (!OPTION (Opt_hold))
1145 destroy ();
1146 }
1074 1147
1075 return false; 1148 return false;
1076} 1149}
1077 1150
1078void 1151void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1153{
1081 SET_R (this); 1154 make_current ();
1082 SET_LOCALE (locale);
1083 1155
1084 if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1158 while (pty_fill ())
1087 if (cmd_parse ()) 1159 if (cmd_parse ())
… …
1092} 1164}
1093 1165
1094void 1166void
1095rxvt_term::pointer_unblank () 1167rxvt_term::pointer_unblank ()
1096{ 1168{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1169 XDefineCursor (xdisp, vt, TermWin_cursor);
1098 recolour_cursor (); 1170 recolour_cursor ();
1099 1171
1100#ifdef POINTER_BLANK 1172#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1173 hidden_pointer = 0;
1102 1174
1103 if (options & Opt_pointerBlank) 1175 if (OPTION (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1176 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1177#endif
1106} 1178}
1107 1179
1108#ifdef POINTER_BLANK 1180#ifdef POINTER_BLANK
1109void 1181void
1110rxvt_term::pointer_blank () 1182rxvt_term::pointer_blank ()
1111{ 1183{
1112 if (! (options & Opt_pointerBlank)) 1184 if (!OPTION (Opt_pointerBlank))
1113 return; 1185 return;
1114 1186
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1187 XDefineCursor (xdisp, vt, display->blank_cursor);
1116 XFlush (display->display); 1188 XFlush (xdisp);
1117 1189
1118 hidden_pointer = 1; 1190 hidden_pointer = 1;
1119} 1191}
1120 1192
1121void 1193void
1122rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
1123{ 1195{
1124 SET_R (this); 1196 make_current ();
1125 SET_LOCALE (locale);
1126 1197
1127 pointer_blank (); 1198 pointer_blank ();
1128} 1199}
1129#endif 1200#endif
1130 1201
… …
1195 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
1196 (32 + x + 1), 1267 (32 + x + 1),
1197 (32 + y + 1)); 1268 (32 + y + 1));
1198} 1269}
1199 1270
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209
1210/*{{{ process an X event */ 1271/*{{{ process an X event */
1211void 1272void
1212rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
1213{ 1274{
1214 dDisp; 1275 make_current ();
1215 1276
1216 SET_R (this); 1277 dLocal (Display *, xdisp);
1217 SET_LOCALE (locale);
1218 1278
1219#if defined(CURSOR_BLINK) 1279 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1280 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1282 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1283
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1285 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1286 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1287 unsigned int unused_mask;
1249 1288
1250 switch (ev.type) 1289 switch (ev.type)
… …
1257 1296
1258 break; 1297 break;
1259 1298
1260 case KeyRelease: 1299 case KeyRelease:
1261 { 1300 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1263 KeySym ks; 1302 KeySym keysym;
1264 1303
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif 1305#endif
1267 1306
1268#if ENABLE_FRILLS || ISO_14755 1307#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support 1308 // ISO 14755 support
1270 if (iso14755buf) 1309 if (iso14755buf)
… …
1275# endif 1314# endif
1276# if ISO_14755 1315# if ISO_14755
1277 // iso14755 part 5.2 handling: release time 1316 // iso14755 part 5.2 handling: release time
1278 // first: controls 1317 // first: controls
1279 if ((ev.xkey.state & ControlMask) 1318 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f) 1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f))) 1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1282 { 1321 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1284 commit_iso14755 (); 1323 commit_iso14755 ();
1285 return; // case-break; 1324 goto skip_switch;
1286 } 1325 }
1287 1326
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks) 1328 if (i[0] == keysym)
1290 { 1329 {
1291 iso14755buf = ISO_14755_51 | i[1]; 1330 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 (); 1331 commit_iso14755 ();
1293 return; // case-break; 1332 goto skip_switch;
1294 } 1333 }
1295 1334
1296 scr_bell (); 1335 scr_bell ();
1297# endif 1336# endif
1298 iso14755buf = 0; 1337 iso14755buf = 0;
… …
1317 else 1356 else
1318 iso14755buf = 0; 1357 iso14755buf = 0;
1319 } 1358 }
1320#endif 1359#endif
1321 1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask)) 1366 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop (); 1367 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R) 1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1326 mouse_slip_wheel_speed = 0; 1369 mouse_slip_wheel_speed = 0;
1327#endif 1370#endif
1328 break; 1371 break;
1329 } 1372 }
1330 1373
… …
1336 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1337 break; 1380 break;
1338 1381
1339 case ClientMessage: 1382 case ClientMessage:
1340 if (ev.xclient.format == 32 1383 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1384 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1385 {
1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1387 {
1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1389 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1391 {
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1393 destroy ();
1394 }
1345#if ENABLE_EWMH 1395#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1397 XSendEvent (xdisp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1399 &ev);
1400#endif
1401 }
1402 }
1403#if ENABLE_XEMBED
1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1405 {
1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1407 focus_in ();
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out ();
1410 }
1350#endif 1411#endif
1351 } 1412 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break; 1413 break;
1388 1414
1389 case MappingNotify: 1415 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1416 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1417 break;
… …
1424 break; 1450 break;
1425 1451
1426 case ConfigureNotify: 1452 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0]) 1453 if (ev.xconfigure.window == parent[0])
1428 { 1454 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1456 ;
1431 1457
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1459 {
1434 seen_resize = 1; 1460 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1462 }
1437 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1439 if (options & Opt_transparent) 1467 if (OPTION (Opt_transparent))
1440 check_our_parents (); 1468 check_our_parents ();
1441#endif 1469#endif
1442 } 1470 }
1443 break; 1471 break;
1444 1472
1445 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1478
1450 break; 1479 break;
1451 1480
1452 case SelectionClear: 1481 case SelectionClear:
1453 selection_clear (); 1482 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1488 break;
1460 1489
1461 case SelectionRequest: 1490 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1492 break;
1493
1494 case MapNotify:
1495 mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1500 break;
1464 1501
1465 case UnmapNotify: 1502 case UnmapNotify:
1466 mapped = 0; 1503 mapped = 0;
1467#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1469#endif 1506#endif
1470 break; 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break; 1508 break;
1478 1509
1479#ifdef TRANSPARENT 1510#ifdef TRANSPARENT
1480 case ReparentNotify: 1511 case ReparentNotify:
1481 rootwin_cb (ev); 1512 rootwin_cb (ev);
… …
1487 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1488 { 1519 {
1489 do 1520 do
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1493 1524
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1526
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1499 1530
1500 scr_refresh (refresh_type); 1531 want_refresh = 1;
1501 } 1532 }
1502 else 1533 else
1503 { 1534 {
1504 XEvent unused_event; 1535 XEvent unused_event;
1505 1536
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1507 ; 1538 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1540 ;
1510 1541
1511 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1512 { 1543 {
1513 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1514 scrollbar_show (0); 1545 scrollbar_show (0);
1515 } 1546 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520 1547
1521#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (xdisp, ev.xany.window);
1524#endif 1551#endif
1525 } 1552 }
1526 break; 1553 break;
1527 1554
1528 case MotionNotify: 1555 case MotionNotify:
1529#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1557 if (hidden_pointer)
1531 pointer_unblank (); 1558 pointer_unblank ();
1532#endif 1559#endif
1533#if MENUBAR
1534 if (isMenuBarWindow (ev.xany.window))
1535 {
1536 menubar_control (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1561 break;
1542 1562
1543 if (ev.xany.window == vt) 1563 if (ev.xany.window == vt)
1544 { 1564 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1569 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1548 ; 1571 ;
1549 1572
1550 XQueryPointer (disp, vt, 1573 XQueryPointer (xdisp, vt,
1551 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1576 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1577 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
… …
1619#endif 1642#endif
1620 } 1643 }
1621 } 1644 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1623 { 1646 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1625 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1626 ; 1649 ;
1627 1650
1628 XQueryPointer (disp, scrollBar.win, 1651 XQueryPointer (xdisp, scrollBar.win,
1629 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1655 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1657 scrollbar_size ());
1635 scr_refresh (refresh_type); 1658 want_refresh = 1;
1636 refresh_limit = 0; 1659 refresh_limit = 0;
1637 scrollbar_show (1); 1660 scrollbar_show (1);
1638 } 1661 }
1639 break; 1662 break;
1640 } 1663 }
1664
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 }
1678#endif
1679
1680#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 {
1683 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease)
1686 if (hidden_pointer)
1687 pointer_unblank ();
1688
1689 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank ();
1691 }
1692#endif
1641} 1693}
1642 1694
1643void 1695void
1644rxvt_term::focus_in () 1696rxvt_term::focus_in ()
1645{ 1697{
1646 if (!focus) 1698 if (!focus)
1647 { 1699 {
1648 focus = 1; 1700 focus = 1;
1649 want_refresh = 1; 1701 want_refresh = 1;
1702
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1704
1650#if USE_XIM 1705#if USE_XIM
1651 if (Input_Context != NULL) 1706 if (Input_Context != NULL)
1652 { 1707 {
1653 IMSetStatusPosition (); 1708 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context); 1709 XSetICFocus (Input_Context);
1655 } 1710 }
1656#endif 1711#endif
1657#if CURSOR_BLINK 1712#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1713 if (OPTION (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1660#endif 1715#endif
1661#if OFF_FOCUS_FADING 1716#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1717 if (rs[Rs_fade])
1663 { 1718 {
1664 pix_colors = pix_colors_focused; 1719 pix_colors = pix_colors_focused;
… …
1674 if (focus) 1729 if (focus)
1675 { 1730 {
1676 focus = 0; 1731 focus = 0;
1677 want_refresh = 1; 1732 want_refresh = 1;
1678 1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1735
1679#if ENABLE_FRILLS || ISO_14755 1736#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf)
1738 {
1680 iso14755buf = 0; 1739 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY 1740# if ENABLE_OVERLAY
1683 scr_overlay_off (); 1741 scr_overlay_off ();
1742# endif
1743 }
1684#endif 1744#endif
1685#if USE_XIM 1745#if USE_XIM
1686 if (Input_Context != NULL) 1746 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1747 XUnsetICFocus (Input_Context);
1688#endif 1748#endif
1689#if CURSOR_BLINK 1749#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1750 if (OPTION (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1751 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1752 hidden_cursor = 0;
1693#endif 1753#endif
1694#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
… …
1703 1763
1704#if TRANSPARENT 1764#if TRANSPARENT
1705void 1765void
1706rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1767{
1708 SET_R (this); 1768 make_current ();
1709 SET_LOCALE (locale);
1710 1769
1711 switch (ev.type) 1770 switch (ev.type)
1712 { 1771 {
1713 case PropertyNotify: 1772 case PropertyNotify:
1714 /* 1773 /*
… …
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1720 return; 1779 return;
1721 1780
1722 /* FALLTHROUGH */ 1781 /* FALLTHROUGH */
1723 case ReparentNotify: 1782 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1; 1784 want_refresh = want_full_refresh = 1;
1726 break; 1785 break;
1727 } 1786 }
1728} 1787}
1729#endif 1788#endif
… …
1732rxvt_term::button_press (XButtonEvent &ev) 1791rxvt_term::button_press (XButtonEvent &ev)
1733{ 1792{
1734 int reportmode = 0, clickintime; 1793 int reportmode = 0, clickintime;
1735 1794
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1795 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1796
1737 if (!bypass_keystate) 1797 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1798 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1799
1740 /* 1800 /*
1741 * VT window processing of button press 1801 * VT window processing of button press
1742 */ 1802 */
1743 if (ev.window == vt) 1803 if (ev.window == vt)
1744 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1745#if ISO_14755 1808#if ISO_14755
1746 // 5.4 1809 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1811 {
1749 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1824#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1825 if (ev.button == MEvent.button && clickintime)
1763 { 1826 {
1764 /* same button, within alloted time */ 1827 /* same button, within alloted time */
1765 MEvent.clicks++; 1828 MEvent.clicks++;
1829
1766 if (MEvent.clicks > 1) 1830 if (MEvent.clicks > 1)
1767 { 1831 {
1768 /* only report double clicks */ 1832 /* only report double clicks */
1769 MEvent.clicks = 2; 1833 MEvent.clicks = 2;
1770 mouse_report (ev); 1834 mouse_report (ev);
… …
1802#else 1866#else
1803 selection.rect = false; 1867 selection.rect = false;
1804#endif 1868#endif
1805 1869
1806 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1872 {
1809 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1811 else 1875 else
1812 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
… …
1977 } 2041 }
1978 2042
1979 break; 2043 break;
1980 } 2044 }
1981 } 2045 }
2046
1982 return; 2047 return;
1983 } 2048 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2049}
1992 2050
1993void 2051void
1994rxvt_term::button_release (XButtonEvent &ev) 2052rxvt_term::button_release (XButtonEvent &ev)
1995{ 2053{
… …
2001 2059
2002 if (scrollbar_isUpDn ()) 2060 if (scrollbar_isUpDn ())
2003 { 2061 {
2004 scrollBar.setIdle (); 2062 scrollBar.setIdle ();
2005 scrollbar_show (0); 2063 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2064 }
2010 2065
2011#ifdef SELECTION_SCROLLING 2066#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active) 2067 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2014#endif 2069#endif
2015 2070
2016 if (ev.window == vt) 2071 if (ev.window == vt)
2017 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2018#if ISO_14755 2076#if ISO_14755
2019 // 5.4 2077 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2079 return;
2022#endif 2080#endif
2081
2023 if (reportmode) 2082 if (reportmode)
2024 { 2083 {
2025 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
2057 { 2116 {
2058 case Button1: 2117 case Button1:
2059 case Button3: 2118 case Button3:
2060 selection_make (ev.time); 2119 selection_make (ev.time);
2061 break; 2120 break;
2121
2062 case Button2: 2122 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2064 break; 2125 break;
2126
2065#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2066 case Button4: 2128 case Button4:
2067 case Button5: 2129 case Button5:
2068 { 2130 {
2069 int i; 2131 int i;
… …
2071 2133
2072 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2073 2135
2074 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2075 i = 1; 2137 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2139 i = nrow - 1;
2078 else 2140 else
2079 i = 5; 2141 i = 5;
2080 2142
2081# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
2092 } 2154 }
2093 else 2155 else
2094 { 2156 {
2095# endif 2157# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2158 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2159 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING 2160# ifdef MOUSE_SLIP_WHEELING
2109 } 2161 }
2110#endif 2162# endif
2111 } 2163 }
2112 break; 2164 break;
2113#endif 2165#endif
2114 } 2166 }
2115 } 2167 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2168}
2121 2169
2122#ifdef TRANSPARENT 2170#ifdef TRANSPARENT
2123#if TINTING 2171#if TINTING
2124/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
2125 2173
2126typedef uint32_t RUINT32T; 2174typedef uint32_t RUINT32T;
2127 2175
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{ 2177{
2130 int sh_r, sh_g, sh_b; 2178 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b; 2179 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i; 2183 int i;
2136 2184
2137 Visual *visual = display->visual; 2185 Visual *visual = term->visual;
2138 2186
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140 2188
2141 /* for convenience */ 2189 /* for convenience */
2142 mask_r = visual->red_mask; 2190 mask_r = visual->red_mask;
… …
2363 Atom atype; 2411 Atom atype;
2364 unsigned char *prop = NULL; 2412 unsigned char *prop = NULL;
2365 Window root, oldp, *list; 2413 Window root, oldp, *list;
2366 Pixmap rootpixmap = None; 2414 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr; 2415 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369 2416
2370 pchanged = 0; 2417 pchanged = 0;
2371 2418
2372 if (!(options & Opt_transparent)) 2419 if (!OPTION (Opt_transparent))
2373 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2374 2421
2375 XGetWindowAttributes (disp, display->root, &wrootattr); 2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth; 2423 rootdepth = wrootattr.depth;
2377 2424
2378 XGetWindowAttributes (disp, parent[0], &wattr); 2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2379 2426
2380 if (rootdepth != wattr.depth) 2427 if (rootdepth != wattr.depth)
2381 { 2428 {
2382 if (am_transparent) 2429 if (am_transparent)
2383 { 2430 {
2384 pchanged = 1; 2431 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0; 2433 am_transparent = am_pixmap_trans = 0;
2387 } 2434 }
2388 2435
2389 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2390 } 2437 }
2391 2438
2392 /* Get all X ops out of the queue so that our information is up-to-date. */ 2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False); 2440 XSync (xdisp, False);
2394 2441
2395 /* 2442 /*
2396 * Make the frame window set by the window manager have 2443 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame 2444 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that. 2445 * windows for each client, so we have to take care about that.
2399 */ 2446 */
2400 i = (xa[XA_XROOTPMAP_ID] 2447 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success); 2450 &nitems, &bytes_after, &prop) == Success);
2404 2451
2405 if (!i || prop == NULL) 2452 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID] 2453 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success); 2456 &nitems, &bytes_after, &prop) == Success);
2410 2457
2411 if (!i || prop == NULL 2458 if (!i || prop == NULL
2412#if TINTING 2459#if TINTING
… …
2431 Window cr; 2478 Window cr;
2432 XImage *image; 2479 XImage *image;
2433 GC gc; 2480 GC gc;
2434 XGCValues gcvalue; 2481 XGCValues gcvalue;
2435 2482
2436 XTranslateCoordinates (disp, parent[0], display->root, 2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr); 2484 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width; 2485 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height; 2486 nh = (unsigned int)szHint.height;
2440 nx = ny = 0; 2487 nx = ny = 0;
2441 2488
… …
2454 } 2501 }
2455 2502
2456 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458 2505
2459 XSync (disp, False); 2506 XSync (xdisp, False);
2460 allowedxerror = -1; 2507 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462 2509
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */ 2511 /* XXX: may need a delay here? */
2465 allowedxerror = 0; 2512 allowedxerror = 0;
2466 2513
… …
2469 if (am_transparent && am_pixmap_trans) 2516 if (am_transparent && am_pixmap_trans)
2470 { 2517 {
2471 pchanged = 1; 2518 pchanged = 1;
2472 if (pixmap != None) 2519 if (pixmap != None)
2473 { 2520 {
2474 XFreePixmap (disp, pixmap); 2521 XFreePixmap (xdisp, pixmap);
2475 pixmap = None; 2522 pixmap = None;
2476 } 2523 }
2477 } 2524 }
2478 2525
2479 am_pixmap_trans = 0; 2526 am_pixmap_trans = 0;
2480 } 2527 }
2481 else 2528 else
2482 { 2529 {
2483 if (pixmap != None) 2530 if (pixmap != None)
2484 XFreePixmap (disp, pixmap); 2531 XFreePixmap (xdisp, pixmap);
2485 2532
2486#if TINTING 2533#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint)) 2534 if (ISSET_PIXCOLOR (Color_tint))
2488 { 2535 {
2489 unsigned short rm, gm, bm; 2536 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491 2538
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2493 2540
2494 ShadeXImage (display, image, shade, rm, gm, bm); 2541 ShadeXImage (this, image, shade, rm, gm, bm);
2495 } 2542 }
2496#endif 2543#endif
2497 2544
2498 pixmap = XCreatePixmap (disp, vt, 2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0, 2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height); 2548 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc); 2549 XFreeGC (xdisp, gc);
2504 XDestroyImage (image); 2550 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]); 2552 XClearWindow (xdisp, parent[0]);
2507 2553
2508 if (!am_transparent || !am_pixmap_trans) 2554 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1; 2555 pchanged = 1;
2510 2556
2511 am_transparent = am_pixmap_trans = 1; 2557 am_transparent = am_pixmap_trans = 1;
2512 } 2558 }
2513 } 2559 }
2514 2560
2515 if (am_pixmap_trans) 2561 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2517 else 2563 else
2518 { 2564 {
2519 unsigned int n; 2565 unsigned int n;
2520 /* 2566 /*
2521 * InheritPixmap transparency 2567 * InheritPixmap transparency
2522 */ 2568 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 { 2570 {
2525 oldp = parent[i]; 2571 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root, 2572 XQueryTree (xdisp, parent[i - 1], &root,
2527 &parent[i], &list, &n); 2573 &parent[i], &list, &n);
2528 XFree (list); 2574 XFree (list);
2529 2575
2530 if (parent[i] == display->root) 2576 if (parent[i] == display->root)
2531 { 2577 {
… …
2543 2589
2544 if (pchanged) 2590 if (pchanged)
2545 { 2591 {
2546 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2547 { 2593 {
2548 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 { 2596 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break; 2598 break;
2553 } 2599 }
2554 } 2600 }
2555 } 2601 }
2556 2602
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2558 { 2604 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0; 2607 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2563 } 2609 }
2564 else 2610 else
2565 { 2611 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2572 { 2613 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2575 } 2616 }
2576 2617
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2578 am_transparent = 1; 2619 am_transparent = 1;
2579 } 2620 }
2580 2621
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None; 2623 parent[i] = None;
2583 } 2624 }
2584 2625
2585 if (scrollBar.win) 2626 if (scrollBar.win)
2586 { 2627 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2589 scrollbar_show (0); 2630 scrollbar_show (0);
2590 } 2631 }
2591 2632
2592 if (am_transparent) 2633 if (am_transparent)
… …
2604 2645
2605bool 2646bool
2606rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2607{ 2648{
2608 bool flag = false; 2649 bool flag = false;
2609 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2611 2652
2612 for (;;) 2653 for (;;)
2613 { 2654 {
2614 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2615 { 2656 {
2616 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2658 ch = next_char ();
2618 }
2619 2659
2620 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2621 break; 2661 break;
2662 }
2622 2663
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2665 {
2625 if (!seen_input) 2666 if (!seen_input)
2626 { 2667 {
… …
2635 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2637 } 2678 }
2638 2679
2639 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2682 bool refreshnow = false;
2642 int nlines = 0; 2683 int nlines = 0;
2643 unicode_t *str = buf; 2684 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2686
2646 for (;;) 2687 for (;;)
2647 { 2688 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2690 break;
… …
2655 if (ch == C0_LF) 2696 if (ch == C0_LF)
2656 nlines++; 2697 nlines++;
2657 2698
2658 refresh_count++; 2699 refresh_count++;
2659 2700
2660 if (!(options & Opt_jumpScroll) 2701 if (!OPTION (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1))) 2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2703 {
2663 refreshnow = true; 2704 refreshnow = true;
2705 refresh_count = 0;
2664 ch = NOCHAR; 2706 ch = NOCHAR;
2665 break; 2707 break;
2666 } 2708 }
2667 2709
2668 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2670 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2672 nlines = 0; 2717 nlines = 0;
2673 str = buf; 2718 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2675 } 2720 }
2676 2721
… …
2689 2734
2690 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2736 ch = next_char ();
2692 } 2737 }
2693 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2695 2742
2696 /* 2743 /*
2697 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling. 2747 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2748 */
2702 if (refreshnow) 2749 if (refreshnow)
2703 { 2750 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++; 2752 refresh_limit++;
2706 else 2753 else
2707 { 2754 {
2708 flag = true; 2755 flag = true;
2709 scr_refresh (refresh_type); 2756 scr_refresh ();
2757 want_refresh = 1;
2710 } 2758 }
2711 } 2759 }
2712 2760
2713 } 2761 }
2714 else 2762 else
… …
2729 } 2777 }
2730 2778
2731 return flag; 2779 return flag;
2732} 2780}
2733 2781
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2782// read the next character
2744unicode_t 2783wchar_t
2745rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2746{ 2785{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2787 {
2749 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2752 2791
2753 wchar_t wc; 2792 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2794
2756 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2757 { 2796 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2799 break;
2761 } 2800 }
2762 2801
2763 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2804
2766 // assume wchar == unicode 2805 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2769 } 2808 }
2770 2809
2771 return NOCHAR; 2810 return NOCHAR;
2772} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2773 2823
2774/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2775/* 2825/*
2776 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2777 * to the command. 2827 * to the command.
2778 */ 2828 */
2779unicode_t 2829wchar_t
2780rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2831{
2782 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2783 2833
2784 if (c == NOCHAR) 2834 if (c == NOCHAR)
2785 throw out_of_input; 2835 throw out_of_input;
2786 2836
2787 return c; 2837 return c;
2788} 2838}
2789 2839
2790unicode_t 2840uint32_t
2791rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2842{
2793 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2794 2844
2795 if (c == NOCHAR) 2845 if (c == NOCHAR)
2796 throw out_of_input; 2846 throw out_of_input;
2797 2847
2798 return c; 2848 return c;
… …
2898 case C0_ESC: 2948 case C0_ESC:
2899 process_escape_seq (); 2949 process_escape_seq ();
2900 break; 2950 break;
2901 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2954 else
2906 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2956 break;
2909 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2910 scr_bell (); 2958 scr_bell ();
2911 break; 2959 break;
2912 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3067 break; 3115 break;
3068 3116
3069 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3071 { 3119 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 3122 }
3075 break; 3123 break;
3076 3124
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 3148 process_dcs_seq ();
3101 break; 3149 break;
3102 3150
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3108 3155
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 3158 process_csi_seq ();
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 3269 if (arg[p] == -1)
3223 arg[p] = ndef; 3270 arg[p] = ndef;
3224 3271
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 3272 /*
3233 * private mode handling 3273 * private mode handling
3234 */ 3274 */
3235 if (priv) 3275 if (priv)
3236 { 3276 {
3237 switch (priv) 3277 switch (priv)
3238 { 3278 {
3239 case '>': 3279 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3290 }
3242 break; 3291 break;
3243 case '?': 3292 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 3295 break;
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 3406 break;
3358 3407
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 3410 break;
3363 3411
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3366 break; 3414 break;
… …
3373 break; 3421 break;
3374 case 6: /* CPR requested */ 3422 case 6: /* CPR requested */
3375 scr_report_position (); 3423 scr_report_position ();
3376 break; 3424 break;
3377 case 7: /* unofficial extension */ 3425 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3426 if (OPTION (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3427 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3428 break;
3381 case 8: /* unofficial extension */ 3429 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3431 break;
… …
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3524{
3477 int x, y; 3525 int x, y;
3478 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3479 Window wdummy; 3527 Window wdummy;
3480 dDisp; 3528
3529 dLocal (Display *, xdisp);
3481 3530
3482 if (nargs == 0) 3531 if (nargs == 0)
3483 return; 3532 return;
3484 3533
3485 switch (args[0]) 3534 switch (args[0])
3486 { 3535 {
3487 /* 3536 /*
3488 * commands 3537 * commands
3489 */ 3538 */
3490 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3492 break; 3541 break;
3493 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3495 break; 3544 break;
3496 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3498 break; 3547 break;
3499 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3550 break;
3502 case 5: /* raise window */ 3551 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3504 break; 3553 break;
3505 case 6: /* lower window */ 3554 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3507 break; 3556 break;
3508 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3509 scr_touch (true); 3558 scr_touch (true);
3510 break; 3559 break;
3511 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3523 3572
3524 /* 3573 /*
3525 * reports - some output format copied from XTerm 3574 * reports - some output format copied from XTerm
3526 */ 3575 */
3527 case 11: /* report window state */ 3576 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3577 XGetWindowAttributes (xdisp, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3579 break;
3531 case 13: /* report window position */ 3580 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3582 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3583 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3584 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3585 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3586 break;
3538 case 14: /* report window size (pixels) */ 3587 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3590 break;
3542 case 18: /* report text area size (chars) */ 3591 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3592 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3593 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3595 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3596 break;
3548 case 20: /* report icon label */ 3597 case 20: /* report icon label */
3549 { 3598 {
3550 char *s; 3599 char *s;
3551 XGetIconName (disp, parent[0], &s); 3600 XGetIconName (xdisp, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3602 XFree (s);
3554 } 3603 }
3555 break; 3604 break;
3556 case 21: /* report window title */ 3605 case 21: /* report window title */
3557 { 3606 {
3558 char *s; 3607 char *s;
3559 XFetchName (disp, parent[0], &s); 3608 XFetchName (xdisp, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3610 XFree (s);
3562 } 3611 }
3563 break; 3612 break;
3564 } 3613 }
3565} 3614}
… …
3568/*----------------------------------------------------------------------*/ 3617/*----------------------------------------------------------------------*/
3569/* 3618/*
3570 * get input up until STRING TERMINATOR (or BEL) 3619 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3620 * ends_how is terminator used. returned input must be free()'d
3572 */ 3621 */
3573unsigned char * 3622char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3623rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3624{
3576 unicode_t ch; 3625 unicode_t ch;
3577 bool seen_esc = false; 3626 bool seen_esc = false;
3578 unsigned int n = 0; 3627 unsigned int n = 0;
… …
3611 3660
3612 string[n++] = '\0'; 3661 string[n++] = '\0';
3613 3662
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3663 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3664
3616 return (unsigned char *)rxvt_wcstombs (string); 3665 return rxvt_wcstombs (string);
3617} 3666}
3618 3667
3619/*----------------------------------------------------------------------*/ 3668/*----------------------------------------------------------------------*/
3620/* 3669/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3670 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3671 */
3623void 3672void
3624rxvt_term::process_dcs_seq () 3673rxvt_term::process_dcs_seq ()
3625{ 3674{
3626 unsigned char *s; 3675 char *s;
3627 unicode_t eh; 3676 unicode_t eh;
3628 3677
3629 /* 3678 /*
3630 * Not handled yet 3679 * Not handled yet
3631 */ 3680 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3699 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3700 arg = arg * 10 + (ch - '0');
3652 3701
3653 if (ch == ';') 3702 if (ch == ';')
3654 { 3703 {
3655 unsigned char *s = get_to_st (eh); 3704 char *s = get_to_st (eh);
3656 3705
3657 if (s) 3706 if (s)
3658 { 3707 {
3659 process_xterm_seq (arg, (char *)s, eh); 3708 process_xterm_seq (arg, s, eh);
3660 free (s); 3709 free (s);
3661 } 3710 }
3662 } 3711 }
3663} 3712}
3664 3713
3665void 3714void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3716{
3668 if (str[0] == '?' && !str[1]) 3717 if (str[0] == '?' && !str[1])
3669 { 3718 {
3670 unsigned short r, g, b; 3719 unsigned short r, g, b;
3671 pix_colors_focused[color].get (display, r, g, b); 3720 pix_colors_focused[color].get (this, r, g, b);
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3673 } 3722 }
3674 else 3723 else
3675 set_window_color (color, str); 3724 set_window_color (color, str);
3676} 3725}
3677 3726
3678/* 3727/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3728 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3729 */
3681void 3730void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3731rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3732{
3684 int changed = 0;
3685 int color; 3733 int color;
3686 char *buf, *name; 3734 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3735 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3736 int saveop = op;
3689 dDisp; 3737
3738 dLocal (Display *, xdisp);
3690 3739
3691 assert (str != NULL); 3740 assert (str != NULL);
3692 switch (op) 3741 switch (op)
3693 { 3742 {
3694 case XTerm_name: 3743 case XTerm_name:
… …
3710 unsigned long bytes_after; 3759 unsigned long bytes_after;
3711 unsigned char *value = 0; 3760 unsigned char *value = 0;
3712 const char *str = ""; 3761 const char *str = "";
3713 3762
3714 if (prop 3763 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3764 && XGetWindowProperty (xdisp, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3765 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3766 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3767 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3768 && actual_type != None
3720 && actual_format == 8) 3769 && actual_format == 8)
… …
3732 { 3781 {
3733 *eq = 0; 3782 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3783 set_utf8_property (display->atom (str), eq + 1);
3735 } 3784 }
3736 else 3785 else
3737 XDeleteProperty (disp, parent[0], 3786 XDeleteProperty (xdisp, parent[0],
3738 display->atom (str)); 3787 display->atom (str));
3739 } 3788 }
3740 break; 3789 break;
3741 3790
3742 case XTerm_Color: 3791 case XTerm_Color:
… …
3744 { 3793 {
3745 if ((name = strchr (buf, ';')) == NULL) 3794 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3795 break;
3747 3796
3748 *name++ = '\0'; 3797 *name++ = '\0';
3749 color = atoi (buf); 3798 color = atoi (buf) + minCOLOR;
3750 3799
3751 if (color < 0 || color >= TOTAL_COLORS) 3800 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3801 break;
3753 3802
3754 if ((buf = strchr (name, ';')) != NULL) 3803 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3804 *buf++ = '\0';
3756 3805
3757 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3758 { 3807 {
3759 unsigned short r, g, b; 3808 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3809 pix_colors_focused[color].get (this, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 } 3811 }
3763 else 3812 else
3764 set_window_color (color + minCOLOR, name); 3813 set_window_color (color, name);
3765 } 3814 }
3766 break; 3815 break;
3767 case XTerm_Color00: 3816 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3817 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3769 break; 3818 break;
3770 case XTerm_Color01: 3819 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3820 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3772 break; 3821 break;
3773#ifndef NO_CURSORCOLOR 3822#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3823 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3776 break; 3825 break;
… …
3780 break; 3829 break;
3781 case XTerm_Color_pointer_bg: 3830 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3783 break; 3832 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3833#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3834 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3836 break;
3837 case Rxvt_Color_BD:
3838 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp);
3840 break;
3841 case Rxvt_Color_UL:
3842 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp);
3793 break; 3844 break;
3794 case URxvt_Color_IT: 3845 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3796 break; 3847 break;
3797#endif 3848#endif
… …
3802 if (am_transparent) 3853 if (am_transparent)
3803 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3804 break; 3855 break;
3805#endif 3856#endif
3806 3857
3807 case XTerm_Pixmap: 3858 case Rxvt_Pixmap:
3859 {
3808 if (*str != ';') 3860 if (*str != ';')
3809 { 3861 {
3810#if XPM_BACKGROUND 3862#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */ 3863 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */ 3864 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true); 3865 scr_touch (true);
3866#endif
3815 } 3867 }
3868
3869 int changed = 0;
3870
3816 while ((str = strchr (str, ';')) != NULL) 3871 while ((str = strchr (str, ';')) != NULL)
3817 { 3872 {
3818 str++; 3873 str++;
3819#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3820 changed += scale_pixmap (str); 3875 changed += scale_pixmap (str);
3821#endif 3876#endif
3822 } 3877 }
3823 3878
3824 if (changed) 3879 if (changed)
3825 { 3880 {
3826#ifdef XPM_BACKGROUND 3881#ifdef XPM_BACKGROUND
3827 resize_pixmap (); 3882 resize_pixmap ();
3828#endif
3829 scr_touch (true); 3883 scr_touch (true);
3884#endif
3830 } 3885 }
3886 }
3831 break; 3887 break;
3832 3888
3833 case XTerm_restoreFG: 3889 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3890 set_window_color (Color_fg, str);
3835 break; 3891 break;
3836 case XTerm_restoreBG: 3892 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3893 set_window_color (Color_bg, str);
3838 break; 3894 break;
3839 3895
3840 case XTerm_logfile: 3896 case XTerm_logfile:
3841 // TODO, when secure mode? 3897 // TODO, when secure mode?
3842 break; 3898 break;
3843 3899
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3900#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3901 case Rxvt_dumpscreen: /* no error notices */
3852 { 3902 {
3853 int fd; 3903 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3904 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3905 {
3856 scr_dump (fd); 3906 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3917 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3918 case URxvt_boldItalicFont:
3869#endif 3919#endif
3870 if (query) 3920 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3921 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3923 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3924 resp);
3875 else 3925 else
3876 { 3926 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3927 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3883 break; 3933 break;
3884 3934
3885#if ENABLE_FRILLS 3935#if ENABLE_FRILLS
3886 case URxvt_locale: 3936 case URxvt_locale:
3887 if (query) 3937 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3889 else 3939 else
3890 { 3940 {
3891 set_locale (str); 3941 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3942 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3943 init_xlocale ();
3894 } 3944 }
3895 break; 3945 break;
3896 3946
3897 case URxvt_view_up: 3947 case URxvt_view_up:
3898 case URxvt_view_down: 3948 case URxvt_view_down:
3949 {
3899 int lines = atoi (str); 3950 int lines = atoi (str);
3900 3951
3901 if (lines) 3952 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3953 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3954 else
3904 {
3905 scr_erase_savelines (); 3955 scr_erase_savelines ();
3906 } 3956 }
3907 3957
3958 break;
3959#endif
3960
3961#if ENABLE_PERL
3962 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3964 ; // no responses yet
3908 break; 3965 break;
3909#endif 3966#endif
3910 } 3967 }
3911} 3968}
3912/*----------------------------------------------------------------------*/ 3969/*----------------------------------------------------------------------*/
… …
3943 return state; 4000 return state;
3944} 4001}
3945 4002
3946/* we're not using priv _yet_ */ 4003/* we're not using priv _yet_ */
3947void 4004void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4005rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 4006{
3950 unsigned int i, j; 4007 unsigned int i, j;
3951 int state; 4008 int state;
3952 4009
3953 static const struct 4010 static const struct
… …
3964 { 5, PrivMode_rVideo }, 4021 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 4022 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 4023 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 4024 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 4025 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 4026 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 4027 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 4029 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 4030#endif
… …
4021 } 4075 }
4022 4076
4023 /* extra handling for values with state unkept */ 4077 /* extra handling for values with state unkept */
4024 switch (arg[i]) 4078 switch (arg[i])
4025 { 4079 {
4080#if ENABLE_STYLES
4081 case 1021:
4082 set_option (Opt_intensityStyles, mode);
4083
4084 scr_touch (true);
4085 break;
4086#endif
4026 case 1048: /* alternative cursor save */ 4087 case 1048: /* alternative cursor save */
4027 case 1049: 4088 case 1049:
4028 if (options & Opt_secondaryScreen) 4089 if (OPTION (Opt_secondaryScreen))
4029 if (mode == 0) 4090 if (mode == 0)
4030 scr_cursor (RESTORE); 4091 scr_cursor (RESTORE);
4031 else if (mode == 1) 4092 else if (mode == 1)
4032 scr_cursor (SAVE); 4093 scr_cursor (SAVE);
4033 break; 4094 break;
… …
4048 case 3: /* 80/132 */ 4109 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 4110 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 4111 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 4112 break;
4052 case 4: /* smooth scrolling */ 4113 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 4114 set_option (Opt_jumpScroll, !state);
4057 break; 4115 break;
4058 case 5: /* reverse video */ 4116 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 4117 scr_rvideo_mode (state);
4060 break; 4118 break;
4061 case 6: /* relative/absolute origins */ 4119 case 6: /* relative/absolute origins */
… …
4067 /* case 8: - auto repeat, can't do on a per window basis */ 4125 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 4126 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 4127 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 4128 priv_modes &= ~PrivMode_MouseX11;
4071 break; 4129 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 4130#ifdef scrollBar_esc
4080 case scrollBar_esc: 4131 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 4132 if (scrollbar_mapping (state))
4082 { 4133 {
4083 resize_all_windows (0, 0, 0); 4134 resize_all_windows (0, 0, 0);
… …
4102#if 0 4153#if 0
4103 case 1001: 4154 case 1001:
4104 break; /* X11 mouse highlighting */ 4155 break; /* X11 mouse highlighting */
4105#endif 4156#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 4157 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 4158 set_option (Opt_scrollTtyOutput, !state);
4111 break; 4159 break;
4112 case 1011: /* scroll to bottom on key press */ 4160 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 4161 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 4162 break;
4118 case 1047: /* secondary screen w/ clearing last */ 4163 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4165 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4166 scr_erase_screen (2);
4122 scr_change_screen (state); 4167 scr_change_screen (state);
4123 break; 4168 break;
4124 case 1049: /* secondary screen w/ clearing first */ 4169 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 4170 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 4171 if (OPTION (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 4172 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 4173 scr_erase_screen (2);
4129 break; 4174 break;
4130 default: 4175 default:
4131 break; 4176 break;
… …
4259 scr_color (Color_bg, Color_bg); 4304 scr_color (Color_bg, Color_bg);
4260 break; 4305 break;
4261 4306
4262 //case 50: // not variable spacing 4307 //case 50: // not variable spacing
4263 4308
4264#ifndef NO_BRIGHTCOLOR 4309#if ENABLE_FRILLS
4265 case 90: 4310 case 90:
4266 case 91: /* set bright fg color */ 4311 case 91: /* set bright fg color */
4267 case 92: 4312 case 92:
4268 case 93: 4313 case 93:
4269 case 94: 4314 case 94:
… …
4281 case 106: 4326 case 106:
4282 case 107: 4327 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4328 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4329 break;
4285#endif 4330#endif
4286
4287 } 4331 }
4288 } 4332 }
4289} 4333}
4290/*}}} */ 4334/*}}} */
4291 4335
… …
4315 */ 4359 */
4316void 4360void
4317rxvt_term::tt_printf (const char *fmt,...) 4361rxvt_term::tt_printf (const char *fmt,...)
4318{ 4362{
4319 va_list arg_ptr; 4363 va_list arg_ptr;
4320 unsigned char buf[256]; 4364 char buf[256];
4321 4365
4322 va_start (arg_ptr, fmt); 4366 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4367 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4368 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4369 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 4374 * or generated by us in response to a query ESC sequence.
4331 */ 4375 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 4377
4334void 4378void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4379rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 4380{
4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4382 return;
4383
4384 if (pty->pty < 0)
4385 return;
4386
4337 if (v_buflen == 0) 4387 if (v_buflen == 0)
4338 { 4388 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4389 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 4390
4341 if ((unsigned int)written == len) 4391 if ((unsigned int)written == len)
4342 return; 4392 return;
4343 4393
4344 data += written; 4394 data += written;
4345 len -= written; 4395 len -= written;
4346 } 4396 }
4347 4397
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 4399
4350 memcpy (v_buffer + v_buflen, data, len); 4400 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4401 v_buflen += len;
4352 4402
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4403 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354} 4404}
4355 4405
4356void rxvt_term::pty_write () 4406void rxvt_term::pty_write ()
4357{ 4407{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 4409
4360 if (written > 0) 4410 if (written > 0)
4361 { 4411 {
4362 v_buflen -= written; 4412 v_buflen -= written;
4363 4413

Diff Legend

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