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.35 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * 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
32 * 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
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
51 52
52#include <wchar.h> 53#include <wchar.h>
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
56/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
57void 63void
58rxvt_term::lookup_key (XKeyEvent *ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
59{ 65{
60 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
61 unsigned int newlen; 67 unsigned int newlen;
62 KeySym keysym; 68 KeySym keysym;
63#ifdef DEBUG_CMD 69#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 70 static int debug_key = 1; /* accessible by a debugger only */
65#endif 71#endif
66 int valid_keysym; 72 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 73 unsigned char kbuf[KBUFSZ];
68 74
69/* 75 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 77 * escape sequence to toggle the Keypad.
72 * 78 *
73 * Always permit `shift' to override the current setting 79 * Always permit `shift' to override the current setting
74 */ 80 */
75 shft = (ev->state & ShiftMask); 81 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 82 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 83 meta = (ev.state & ModMetaMask);
78 84
79 if (numlock_state || (ev->state & ModNumLockMask)) 85 if (numlock_state || (ev.state & ModNumLockMask))
80 { 86 {
81 numlock_state = (ev->state & ModNumLockMask); 87 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 88 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 89 }
84 90
85 kbuf[0] = 0; 91 kbuf[0] = 0;
86 92
87#ifdef USE_XIM 93#ifdef USE_XIM
88 if (Input_Context) 94 if (Input_Context)
89 { 95 {
90 Status status_return; 96 Status status_return;
91 97
98#if 0
92#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
96 else 103 else
97#endif 104#endif
105#endif
98 { 106 {
99 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
100 108
101 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
102 // at the point of XOpenIM, so temporarily switch locales 110 // at the point of XOpenIM, so temporarily switch locales
103 if (rs[Rs_imLocale]) 111 if (rs[Rs_imLocale])
104 SET_LOCALE (rs[Rs_imLocale]); 112 SET_LOCALE (rs[Rs_imLocale]);
105 // assume wchar_t == unicode or better 113 // assume wchar_t == unicode or better
106 len = XwcLookupString (Input_Context, ev, wkbuf, 114 len = XwcLookupString (Input_Context, &ev, wkbuf,
107 KBUFSZ, &keysym, &status_return); 115 KBUFSZ, &keysym, &status_return);
108 if (rs[Rs_imLocale]) 116 if (rs[Rs_imLocale])
109 SET_LOCALE (locale); 117 SET_LOCALE (locale);
110 118
111 if (status_return == XLookupChars 119 if (status_return == XLookupChars
112 || status_return == XLookupBoth) 120 || status_return == XLookupBoth)
121 {
122 /* make sure the user can type ctrl-@, i.e. NUL */
123 if (len == 1 && *wkbuf == 0)
113 { 124 {
125 kbuf[0] = 0;
126 len = 1;
127 }
128 else
129 {
114 wkbuf[len] = 0; 130 wkbuf[len] = 0;
115 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 131 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
116 if (len < 0) 132 if (len < 0)
117 len = 0; 133 len = 0;
118 } 134 }
135 }
119 else 136 else
120 len = 0; 137 len = 0;
121 } 138 }
122 139
123 valid_keysym = status_return == XLookupKeySym 140 valid_keysym = status_return == XLookupKeySym
124 || status_return == XLookupBoth; 141 || status_return == XLookupBoth;
125 } 142 }
126 else 143 else
127#endif 144#endif
128 { 145 {
129 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
130 valid_keysym = !len; 147 valid_keysym = keysym != NoSymbol;
131 } 148 }
132 149
133 if (valid_keysym) 150 if (valid_keysym)
151 {
152 if (TermWin.saveLines)
134 { 153 {
135/* for some backwards compatibility */ 154#ifdef UNSHIFTED_SCROLLKEYS
136#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 155 if (!ctrl && !meta)
137# ifdef HOTKEY_CTRL 156 {
138 if (ctrl)
139# else 157#else
140 if (meta) 158 if (IS_SCROLL_MOD)
159 {
160#endif
161 int lnsppg;
162
163#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else
166 lnsppg = TermWin.nrow * 4 / 5;
167#endif
168 if (keysym == XK_Prior)
169 {
170 scr_page (UP, lnsppg);
171 return;
172 }
173 else if (keysym == XK_Next)
174 {
175 scr_page (DN, lnsppg);
176 return;
177 }
178 }
179#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD)
181 {
182 if (keysym == XK_Up)
183 {
184 scr_page (UP, 1);
185 return;
186 }
187 else if (keysym == XK_Down)
188 {
189 scr_page (DN, 1);
190 return;
191 }
192 }
193#endif
194#ifdef SCROLL_ON_HOMEEND_KEYS
195 if (IS_SCROLL_MOD)
196 {
197 if (keysym == XK_Home)
198 {
199 scr_move_to (0, 1);
200 return;
201 }
202 else if (keysym == XK_End)
203 {
204 scr_move_to (1, 0);
205 return;
206 }
207 }
208#endif
209 }
210
211 if (shft)
212 {
213 /* Shift + F1 - F10 generates F11 - F20 */
214 if (keysym >= XK_F1 && keysym <= XK_F10)
215 {
216 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */
218 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
220 {
221 switch (keysym)
222 {
223 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0);
226 return;
227 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP);
230 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN);
233 return;
234 }
235 }
236 }
237#ifdef PRINTPIPE
238 if (keysym == XK_Print)
239 {
240 scr_printscreen (ctrl | shft);
241 return;
242 }
243#endif
244
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
246 {
247#ifdef KEYSYM_RESOURCE
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 {
250 unsigned int l;
251 const unsigned char *kbuf0;
252
253 kbuf0 = (Keysym_map[keysym & 0xFF]);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
141# endif 260# endif
142 { 261 )
143 if (keysym == ks_bigfont)
144 { 262 {
145 change_font (0, FONT_UP); 263 const unsigned char ch = C0_ESC;
146 return; 264 tt_write (&ch, 1);
147 } 265 }
148 else if (keysym == ks_smallfont) 266
267 tt_write (kbuf0, l);
268 return;
269 }
270 else
271#endif
272 {
273 newlen = 1;
274 switch (keysym)
149 { 275 {
150 change_font (0, FONT_DN);
151 return;
152 }
153 }
154#endif
155
156 if (TermWin.saveLines) {
157#ifdef UNSHIFTED_SCROLLKEYS
158 if (!ctrl && !meta) {
159#else
160 if (IS_SCROLL_MOD) {
161#endif
162 int lnsppg;
163
164#ifdef PAGING_CONTEXT_LINES
165 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
166#else
167 lnsppg = TermWin.nrow * 4 / 5;
168#endif
169 if (keysym == XK_Prior) {
170 scr_page (UP, lnsppg);
171 return;
172 } else if (keysym == XK_Next) {
173 scr_page (DN, lnsppg);
174 return;
175 }
176 }
177#ifdef SCROLL_ON_UPDOWN_KEYS
178 if (IS_SCROLL_MOD) {
179 if (keysym == XK_Up) {
180 scr_page (UP, 1);
181 return;
182 } else if (keysym == XK_Down) {
183 scr_page (DN, 1);
184 return;
185 }
186 }
187#endif
188#ifdef SCROLL_ON_HOMEEND_KEYS
189 if (IS_SCROLL_MOD) {
190 if (keysym == XK_Home) {
191 scr_move_to (0, 1);
192 return;
193 } else if (keysym == XK_End) {
194 scr_move_to (1, 0);
195 return;
196 }
197 }
198#endif
199 }
200
201 if (shft) {
202 /* Shift + F1 - F10 generates F11 - F20 */
203 if (keysym >= XK_F1 && keysym <= XK_F10) {
204 keysym += (XK_F11 - XK_F1);
205 shft = 0; /* turn off Shift */
206 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) {
207 switch (keysym) {
208 /* normal XTerm key bindings */
209 case XK_Insert: /* Shift+Insert = paste mouse selection */
210 selection_request (ev->time, 0, 0);
211 return;
212 /* rxvt extras */
213 case XK_KP_Add: /* Shift+KP_Add = bigger font */
214 change_font (0, FONT_UP);
215 return;
216 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
217 change_font (0, FONT_DN);
218 return;
219 }
220 }
221 }
222#ifdef PRINTPIPE
223 if (keysym == XK_Print) {
224 scr_printscreen (ctrl | shft);
225 return;
226 }
227#endif
228#ifdef GREEK_SUPPORT
229 if (keysym == ks_greekmodeswith) {
230 greek_mode = !greek_mode;
231 if (greek_mode) {
232 xterm_seq (XTerm_title,
233 (greek_getmode() == GREEK_ELOT928
234 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
235 greek_reset();
236 } else
237 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
238 return;
239 }
240#endif
241
242 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
243#ifdef KEYSYM_RESOURCE
244 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) {
245 unsigned int l;
246 const unsigned char *kbuf0;
247 const unsigned char ch = C0_ESC;
248
249 kbuf0 = (Keysym_map[keysym & 0xFF]);
250 l = (unsigned int)*kbuf0++;
251
252 /* escape prefix */
253 if (meta)
254# ifdef META8_OPTION
255 if (meta_char == C0_ESC)
256# endif
257 tt_write (&ch, 1);
258 tt_write (kbuf0, l);
259 return;
260 } else
261#endif
262 {
263 newlen = 1;
264 switch (keysym) {
265#ifndef NO_BACKSPACE_KEY 276#ifndef NO_BACKSPACE_KEY
266 case XK_BackSpace: 277 case XK_BackSpace:
267 if (PrivateModes & PrivMode_HaveBackSpace) { 278 if (PrivateModes & PrivMode_HaveBackSpace)
279 {
268 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
269 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
270 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
271 } else 283 }
272 STRCPY(kbuf, key_backspace); 284 else
273# ifdef MULTICHAR_SET 285 STRCPY (kbuf, key_backspace);
274 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 286 break;
275 int col, row;
276
277 newlen = STRLEN(kbuf);
278 col = screen.cur.col - 1;
279 row = screen.cur.row + TermWin.saveLines;
280 if (IS_MULTI2(screen.rend[row][col]))
281 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
282 }
283# endif
284 break;
285#endif 287#endif
286#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
287 case XK_Delete: 289 case XK_Delete:
288 STRCPY(kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
289# ifdef MULTICHAR_SET 291 break;
290 if (Options & Opt_mc_hack) {
291 int col, row;
292
293 newlen = STRLEN(kbuf);
294 col = screen.cur.col;
295 row = screen.cur.row + TermWin.saveLines;
296 if (IS_MULTI1(screen.rend[row][col]))
297 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
298 }
299# endif 292#endif
300 break; 293 case XK_Tab:
301#endif 294 if (shft)
302 case XK_Tab: 295 STRCPY (kbuf, "\033[Z");
303 if (shft) 296 else
304 STRCPY(kbuf, "\033[Z"); 297 {
305 else {
306#ifdef CTRL_TAB_MAKES_META 298#ifdef CTRL_TAB_MAKES_META
307 if (ctrl) 299 if (ctrl)
308 meta = 1; 300 meta = 1;
309#endif 301#endif
310#ifdef MOD4_TAB_MAKES_META 302#ifdef MOD4_TAB_MAKES_META
311 if (ev->state & Mod4Mask) 303 if (ev.state & Mod4Mask)
312 meta = 1; 304 meta = 1;
313#endif 305#endif
314 newlen = 0; 306 newlen = 0;
315 } 307 }
316 break; 308 break;
317
318 309
319#ifdef XK_KP_Left 310#ifdef XK_KP_Left
320 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
321 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
322 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
323 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
324 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
325 STRCPY(kbuf, "\033OZ"); 316 {
326 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 317 STRCPY (kbuf, "\033OZ");
327 break; 318 kbuf[2] = "txvr"[keysym - XK_KP_Left];
328 } else 319 break;
320 }
321 else
329 /* translate to std. cursor key */ 322 /* translate to std. cursor key */
330 keysym = XK_Left + (keysym - XK_KP_Left); 323 keysym = XK_Left + (keysym - XK_KP_Left);
331 /* FALLTHROUGH */ 324 /* FALLTHROUGH */
332#endif 325#endif
333 case XK_Up: /* "\033[A" */ 326 case XK_Up: /* "\033[A" */
334 case XK_Down: /* "\033[B" */ 327 case XK_Down: /* "\033[B" */
335 case XK_Right: /* "\033[C" */ 328 case XK_Right: /* "\033[C" */
336 case XK_Left: /* "\033[D" */ 329 case XK_Left: /* "\033[D" */
337 STRCPY(kbuf, "\033[Z"); 330 STRCPY (kbuf, "\033[Z");
338 kbuf[2] = ("DACB"[keysym - XK_Left]); 331 kbuf[2] = "DACB"[keysym - XK_Left];
339 /* do Shift first */ 332 /* do Shift first */
340 if (shft) 333 if (shft)
341 kbuf[2] = ("dacb"[keysym - XK_Left]); 334 kbuf[2] = "dacb"[keysym - XK_Left];
342 else if (ctrl) { 335 else if (ctrl)
343 kbuf[1] = 'O'; 336 {
344 kbuf[2] = ("dacb"[keysym - XK_Left]); 337 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left];
339 }
345 } else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
346 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
347#ifdef MULTICHAR_SET 342 break;
348 //TODO: ??
349 if (Options & Opt_mc_hack) {
350 int col, row, m;
351
352 col = screen.cur.col;
353 row = screen.cur.row + TermWin.saveLines;
354 m = 0;
355 if (keysym == XK_Right
356 && IS_MULTI1(screen.rend[row][col]))
357 m = 1;
358 else if (keysym == XK_Left) {
359 if (col > 0) {
360 if (IS_MULTI2(screen.rend[row][col - 1]))
361 m = 1;
362 } else if (screen.cur.row > 0) {
363 col = screen.tlen[--row];
364 if (col == -1)
365 col = TermWin.ncol - 1;
366 else
367 col--;
368 if (col > 0
369 && IS_MULTI2(screen.rend[row][col]))
370 m = 1;
371 }
372 }
373 if (m)
374 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
375 }
376#endif
377 break;
378 343
379#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
380# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
381 case XK_KP_Prior: 346 case XK_KP_Prior:
382 /* allow shift to override */ 347 /* allow shift to override */
383 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033Oy"); 349 {
385 break; 350 STRCPY (kbuf, "\033Oy");
386 } 351 break;
387 /* FALLTHROUGH */ 352 }
353 /* FALLTHROUGH */
388# endif 354# endif
389 case XK_Prior: 355 case XK_Prior:
390 STRCPY(kbuf, "\033[5~"); 356 STRCPY (kbuf, "\033[5~");
391 break; 357 break;
392# ifdef XK_KP_Next 358# ifdef XK_KP_Next
393 case XK_KP_Next: 359 case XK_KP_Next:
394 /* allow shift to override */ 360 /* allow shift to override */
395 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
396 STRCPY(kbuf, "\033Os"); 362 {
397 break; 363 STRCPY (kbuf, "\033Os");
398 } 364 break;
399 /* FALLTHROUGH */ 365 }
366 /* FALLTHROUGH */
400# endif 367# endif
401 case XK_Next: 368 case XK_Next:
402 STRCPY(kbuf, "\033[6~"); 369 STRCPY (kbuf, "\033[6~");
403 break; 370 break;
404#endif 371#endif
405 case XK_KP_Enter: 372 case XK_KP_Enter:
406 /* allow shift to override */ 373 /* allow shift to override */
407 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
408 STRCPY(kbuf, "\033OM"); 375 {
409 } else { 376 STRCPY (kbuf, "\033OM");
410 kbuf[0] = '\r'; 377 }
411 kbuf[1] = '\0'; 378 else
412 } 379 {
413 break; 380 kbuf[0] = '\r';
381 kbuf[1] = '\0';
382 }
383 break;
414 384
415#ifdef XK_KP_Begin 385#ifdef XK_KP_Begin
416 case XK_KP_Begin: 386 case XK_KP_Begin:
417 STRCPY(kbuf, "\033Ou"); 387 STRCPY (kbuf, "\033Ou");
418 break; 388 break;
419 389
420 case XK_KP_Insert: 390 case XK_KP_Insert:
421 STRCPY(kbuf, "\033Op"); 391 STRCPY (kbuf, "\033Op");
422 break; 392 break;
423 393
424 case XK_KP_Delete: 394 case XK_KP_Delete:
425 STRCPY(kbuf, "\033On"); 395 STRCPY (kbuf, "\033On");
426 break; 396 break;
427#endif 397#endif
428 case XK_KP_F1: /* "\033OP" */ 398 case XK_KP_F1: /* "\033OP" */
429 case XK_KP_F2: /* "\033OQ" */ 399 case XK_KP_F2: /* "\033OQ" */
430 case XK_KP_F3: /* "\033OR" */ 400 case XK_KP_F3: /* "\033OR" */
431 case XK_KP_F4: /* "\033OS" */ 401 case XK_KP_F4: /* "\033OS" */
432 STRCPY(kbuf, "\033OP"); 402 STRCPY (kbuf, "\033OP");
433 kbuf[2] += (keysym - XK_KP_F1); 403 kbuf[2] += (keysym - XK_KP_F1);
434 break; 404 break;
435 405
436 case XK_KP_Multiply: /* "\033Oj" : "*" */ 406 case XK_KP_Multiply: /* "\033Oj" : "*" */
437 case XK_KP_Add: /* "\033Ok" : "+" */ 407 case XK_KP_Add: /* "\033Ok" : "+" */
438 case XK_KP_Separator: /* "\033Ol" : "," */ 408 case XK_KP_Separator: /* "\033Ol" : "," */
439 case XK_KP_Subtract: /* "\033Om" : "-" */ 409 case XK_KP_Subtract: /* "\033Om" : "-" */
440 case XK_KP_Decimal: /* "\033On" : "." */ 410 case XK_KP_Decimal: /* "\033On" : "." */
441 case XK_KP_Divide: /* "\033Oo" : "/" */ 411 case XK_KP_Divide: /* "\033Oo" : "/" */
442 case XK_KP_0: /* "\033Op" : "0" */ 412 case XK_KP_0: /* "\033Op" : "0" */
443 case XK_KP_1: /* "\033Oq" : "1" */ 413 case XK_KP_1: /* "\033Oq" : "1" */
444 case XK_KP_2: /* "\033Or" : "2" */ 414 case XK_KP_2: /* "\033Or" : "2" */
445 case XK_KP_3: /* "\033Os" : "3" */ 415 case XK_KP_3: /* "\033Os" : "3" */
446 case XK_KP_4: /* "\033Ot" : "4" */ 416 case XK_KP_4: /* "\033Ot" : "4" */
447 case XK_KP_5: /* "\033Ou" : "5" */ 417 case XK_KP_5: /* "\033Ou" : "5" */
448 case XK_KP_6: /* "\033Ov" : "6" */ 418 case XK_KP_6: /* "\033Ov" : "6" */
449 case XK_KP_7: /* "\033Ow" : "7" */ 419 case XK_KP_7: /* "\033Ow" : "7" */
450 case XK_KP_8: /* "\033Ox" : "8" */ 420 case XK_KP_8: /* "\033Ox" : "8" */
451 case XK_KP_9: /* "\033Oy" : "9" */ 421 case XK_KP_9: /* "\033Oy" : "9" */
452 /* allow shift to override */ 422 /* allow shift to override */
453 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
454 STRCPY(kbuf, "\033Oj"); 424 {
455 kbuf[2] += (keysym - XK_KP_Multiply); 425 STRCPY (kbuf, "\033Oj");
456 } else { 426 kbuf[2] += (keysym - XK_KP_Multiply);
427 }
428 else
429 {
457 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
458 kbuf[1] = '\0'; 431 kbuf[1] = '\0';
459 } 432 }
460 break; 433 break;
461 434
462 case XK_Find: 435 case XK_Find:
463 STRCPY(kbuf, "\033[1~"); 436 STRCPY (kbuf, "\033[1~");
464 break; 437 break;
465 case XK_Insert: 438 case XK_Insert:
466 STRCPY(kbuf, "\033[2~"); 439 STRCPY (kbuf, "\033[2~");
467 break; 440 break;
468#ifdef DXK_Remove /* support for DEC remove like key */ 441#ifdef DXK_Remove /* support for DEC remove like key */
469 case DXK_Remove: 442 case DXK_Remove:
470 /* FALLTHROUGH */ 443 /* FALLTHROUGH */
471#endif 444#endif
472 case XK_Execute: 445 case XK_Execute:
473 STRCPY(kbuf, "\033[3~"); 446 STRCPY (kbuf, "\033[3~");
474 break; 447 break;
475 case XK_Select: 448 case XK_Select:
476 STRCPY(kbuf, "\033[4~"); 449 STRCPY (kbuf, "\033[4~");
477 break; 450 break;
478#ifdef XK_KP_End 451#ifdef XK_KP_End
479 case XK_KP_End: 452 case XK_KP_End:
480 /* allow shift to override */ 453 /* allow shift to override */
481 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
482 STRCPY(kbuf, "\033Oq"); 455 {
483 break; 456 STRCPY (kbuf, "\033Oq");
484 } 457 break;
485 /* FALLTHROUGH */ 458 }
459 /* FALLTHROUGH */
486#endif 460#endif
487 case XK_End: 461 case XK_End:
488 STRCPY(kbuf, KS_END); 462 STRCPY (kbuf, KS_END);
489 break; 463 break;
490#ifdef XK_KP_Home 464#ifdef XK_KP_Home
491 case XK_KP_Home: 465 case XK_KP_Home:
492 /* allow shift to override */ 466 /* allow shift to override */
493 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
494 STRCPY(kbuf, "\033Ow"); 468 {
495 break; 469 STRCPY (kbuf, "\033Ow");
496 } 470 break;
497 /* FALLTHROUGH */ 471 }
472 /* FALLTHROUGH */
498#endif 473#endif
499 case XK_Home: 474 case XK_Home:
500 STRCPY(kbuf, KS_HOME); 475 STRCPY (kbuf, KS_HOME);
501 break; 476 break;
502 477
503#define FKEY(n, fkey) \ 478#define FKEY(n, fkey) \
504 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
505 480
506 case XK_F1: /* "\033[11~" */ 481 case XK_F1: /* "\033[11~" */
507 case XK_F2: /* "\033[12~" */ 482 case XK_F2: /* "\033[12~" */
508 case XK_F3: /* "\033[13~" */ 483 case XK_F3: /* "\033[13~" */
509 case XK_F4: /* "\033[14~" */ 484 case XK_F4: /* "\033[14~" */
510 case XK_F5: /* "\033[15~" */ 485 case XK_F5: /* "\033[15~" */
511 FKEY(11, XK_F1); 486 FKEY (11, XK_F1);
512 break; 487 break;
513 case XK_F6: /* "\033[17~" */ 488 case XK_F6: /* "\033[17~" */
514 case XK_F7: /* "\033[18~" */ 489 case XK_F7: /* "\033[18~" */
515 case XK_F8: /* "\033[19~" */ 490 case XK_F8: /* "\033[19~" */
516 case XK_F9: /* "\033[20~" */ 491 case XK_F9: /* "\033[20~" */
517 case XK_F10: /* "\033[21~" */ 492 case XK_F10: /* "\033[21~" */
518 FKEY(17, XK_F6); 493 FKEY (17, XK_F6);
519 break; 494 break;
520 case XK_F11: /* "\033[23~" */ 495 case XK_F11: /* "\033[23~" */
521 case XK_F12: /* "\033[24~" */ 496 case XK_F12: /* "\033[24~" */
522 case XK_F13: /* "\033[25~" */ 497 case XK_F13: /* "\033[25~" */
523 case XK_F14: /* "\033[26~" */ 498 case XK_F14: /* "\033[26~" */
524 FKEY(23, XK_F11); 499 FKEY (23, XK_F11);
525 break; 500 break;
526 case XK_F15: /* "\033[28~" */ 501 case XK_F15: /* "\033[28~" */
527 case XK_F16: /* "\033[29~" */ 502 case XK_F16: /* "\033[29~" */
528 FKEY(28, XK_F15); 503 FKEY (28, XK_F15);
529 break; 504 break;
530 case XK_Help: /* "\033[28~" */ 505 case XK_Help: /* "\033[28~" */
531 FKEY(28, XK_Help); 506 FKEY (28, XK_Help);
532 break; 507 break;
533 case XK_Menu: /* "\033[29~" */ 508 case XK_Menu: /* "\033[29~" */
534 FKEY(29, XK_Menu); 509 FKEY (29, XK_Menu);
535 break; 510 break;
536 case XK_F17: /* "\033[31~" */ 511 case XK_F17: /* "\033[31~" */
537 case XK_F18: /* "\033[32~" */ 512 case XK_F18: /* "\033[32~" */
538 case XK_F19: /* "\033[33~" */ 513 case XK_F19: /* "\033[33~" */
539 case XK_F20: /* "\033[34~" */ 514 case XK_F20: /* "\033[34~" */
540 case XK_F21: /* "\033[35~" */ 515 case XK_F21: /* "\033[35~" */
541 case XK_F22: /* "\033[36~" */ 516 case XK_F22: /* "\033[36~" */
542 case XK_F23: /* "\033[37~" */ 517 case XK_F23: /* "\033[37~" */
543 case XK_F24: /* "\033[38~" */ 518 case XK_F24: /* "\033[38~" */
544 case XK_F25: /* "\033[39~" */ 519 case XK_F25: /* "\033[39~" */
545 case XK_F26: /* "\033[40~" */ 520 case XK_F26: /* "\033[40~" */
546 case XK_F27: /* "\033[41~" */ 521 case XK_F27: /* "\033[41~" */
547 case XK_F28: /* "\033[42~" */ 522 case XK_F28: /* "\033[42~" */
548 case XK_F29: /* "\033[43~" */ 523 case XK_F29: /* "\033[43~" */
549 case XK_F30: /* "\033[44~" */ 524 case XK_F30: /* "\033[44~" */
550 case XK_F31: /* "\033[45~" */ 525 case XK_F31: /* "\033[45~" */
551 case XK_F32: /* "\033[46~" */ 526 case XK_F32: /* "\033[46~" */
552 case XK_F33: /* "\033[47~" */ 527 case XK_F33: /* "\033[47~" */
553 case XK_F34: /* "\033[48~" */ 528 case XK_F34: /* "\033[48~" */
554 case XK_F35: /* "\033[49~" */ 529 case XK_F35: /* "\033[49~" */
555 FKEY(31, XK_F17); 530 FKEY (31, XK_F17);
556 break; 531 break;
557#undef FKEY 532#undef FKEY
558 default: 533 default:
559 newlen = 0; 534 newlen = 0;
560 break; 535 break;
561 } 536 }
562 if (newlen) 537 if (newlen)
563 len = STRLEN(kbuf); 538 len = STRLEN (kbuf);
564 } 539 }
565 /* 540
541 /*
566 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
567 */ 543 */
568#ifdef META8_OPTION 544#ifdef META8_OPTION
569 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
570 kbuf[len - 1] |= 0x80; 546 kbuf[len - 1] |= 0x80;
571#endif 547#endif
548
549 }
572 } else if (ctrl && keysym == XK_minus) { 550 else if (ctrl && keysym == XK_minus)
551 {
573 len = 1; 552 len = 1;
574 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
575 } else { 554 }
555 else
556 {
576#ifdef META8_OPTION 557#ifdef META8_OPTION
577 /* set 8-bit on */ 558 /* set 8-bit on */
578 if (meta && (meta_char == 0x80)) { 559 if (meta && (meta_char == 0x80))
579 unsigned char *ch; 560 {
561 unsigned char *ch;
580 562
581 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
582 *ch |= 0x80; 564 *ch |= 0x80;
583 meta = 0; 565
566 meta = 0;
567 }
568#endif
569 /* nil */ ;
570 }
584 } 571 }
585#endif 572
586#ifdef GREEK_SUPPORT 573 if (len <= 0)
587 if (greek_mode) 574 return; /* not mapped */
588 len = greek_xlat(kbuf, len); 575
589#endif 576 if (Options & Opt_scrollTtyKeypress)
590 /* nil */ ; 577 if (TermWin.view_start)
591 } 578 {
579 TermWin.view_start = 0;
580 want_refresh = 1;
592 } 581 }
593 582
594 if (len <= 0) 583 /*
595 return; /* not mapped */
596
597 if (Options & Opt_scrollTtyKeypress)
598 if (TermWin.view_start) {
599 TermWin.view_start = 0;
600 want_refresh = 1;
601 }
602
603/*
604 * these modifications only affect the static keybuffer 584 * these modifications only affect the static keybuffer
605 * pass Shift/Control indicators for function keys ending with `~' 585 * pass Shift/Control indicators for function keys ending with `~'
606 * 586 *
607 * eg, 587 * eg,
608 * Prior = "ESC[5~" 588 * Prior = "ESC[5~"
609 * Shift+Prior = "ESC[5$" 589 * Shift+Prior = "ESC[5$"
610 * Ctrl+Prior = "ESC[5^" 590 * Ctrl+Prior = "ESC[5^"
611 * Ctrl+Shift+Prior = "ESC[5@" 591 * Ctrl+Shift+Prior = "ESC[5@"
612 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 592 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
613 */ 593 */
614 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 594 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
615 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
616 596
617/* escape prefix */ 597 /* escape prefix */
618 if (meta 598 if (meta
619#ifdef META8_OPTION 599#ifdef META8_OPTION
620 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
621#endif 601#endif
622 ) { 602 )
603 {
623 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
624
625 tt_write(&ch, 1); 605 tt_write (&ch, 1);
626 } 606 }
607
627#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
628 if (debug_key) { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
629 char *p; 610 unsigned char *p;
630 int i; 611 int i;
631 612
632 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
633 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
634 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
635 fprintf(stderr, "'\n"); 616 fprintf (stderr, "'\n");
636 }
637#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
638 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
639} 619}
640/*}}} */ 620/*}}} */
641 621
642#if (MENUBAR_MAX) 622#if (MENUBAR_MAX)
643/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
644/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
645unsigned int 625unsigned int
646rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
647{ 627{
648 unsigned int n, s; 628 unsigned int n, s;
649 629
650 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
651 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
652 if (n > 0 && s < count) { 633 if (n > 0 && s < count)
634 {
653 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
654 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
655 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
656 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
657 s += n; 639 s += n;
658 } 640 }
641
659 if (count > s) { 642 if (count > s)
660 rxvt_print_error("data loss: cmd_write too large");
661 count = s;
662 } 643 {
644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
645 count = s;
646 }
647
663 for (; count--;) 648 for (; count--;)
664 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
665 return 0; 653 return 0;
666} 654}
667#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
668 656
669void 657void
670rxvt_term::flush () 658rxvt_term::flush ()
… …
686#ifdef USE_XIM 674#ifdef USE_XIM
687 IMSendSpot (); 675 IMSendSpot ();
688#endif 676#endif
689 } 677 }
690 678
691 XFlush (Xdisplay); 679 display->flush ();
680
681 flush_ev.stop ();
692} 682}
693 683
694void 684void
695rxvt_term::check_cb (check_watcher &w) 685rxvt_term::check_cb (check_watcher &w)
696{ 686{
697 SET_R (this); 687 SET_R (this);
698 SET_LOCALE (locale); 688 SET_LOCALE (locale);
699 689
690 display->flush ();
691
692 if (!flush_ev.active)
693 flush_ev.start (NOW + 0.01);
694}
695
696void
697rxvt_term::flush_cb (time_watcher &w)
698{
699 SET_R (this);
700 SET_LOCALE (locale);
701
702 refresh_limit = 1;
703 refresh_count = 0;
700 flush (); 704 flush ();
701}
702
703void
704rxvt_term::process_x_events ()
705{
706 do
707 {
708 XEvent xev;
709
710 XNextEvent (Xdisplay, &xev);
711
712#if defined(CURSOR_BLINK)
713 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
714 {
715 if (hidden_cursor)
716 {
717 hidden_cursor = 0;
718 want_refresh = 1;
719 }
720
721 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
722 }
723#endif
724
725#if defined(POINTER_BLANK)
726 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
727 {
728 if (xev.type == MotionNotify
729 || xev.type == ButtonPress
730 || xev.type == ButtonRelease)
731 if (hidden_pointer)
732 pointer_unblank ();
733
734 if (xev.type == KeyPress && hidden_pointer == 0)
735 pointer_blank ();
736 }
737#endif
738
739#ifdef USE_XIM
740 if (!XFilterEvent (&xev, xev.xany.window))
741#endif
742 process_x_event (&xev);
743 }
744 while (XPending (Xdisplay));
745} 705}
746 706
747#ifdef CURSOR_BLINK 707#ifdef CURSOR_BLINK
748void 708void
749rxvt_term::cursor_blink_cb (time_watcher &w) 709rxvt_term::cursor_blink_cb (time_watcher &w)
… …
766 w.start (w.at + TEXT_BLINK_INTERVAL); 726 w.start (w.at + TEXT_BLINK_INTERVAL);
767 } 727 }
768} 728}
769#endif 729#endif
770 730
731#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
771void 732void
772rxvt_term::x_cb (io_watcher &w, short revents) 733rxvt_term::cont_scroll_cb (time_watcher &w)
773{ 734{
774 SET_R (this); 735 if ((scrollbar_isUp() || scrollbar_isDn()) &&
775 SET_LOCALE (locale); 736 scr_page (scrollbar_isUp() ? UP : DN, 1))
776 737 {
777 process_x_events (); 738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
741 }
778} 742}
743#endif
744
745#ifdef SELECTION_SCROLLING
746void
747rxvt_term::sel_scroll_cb (time_watcher &w)
748{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
755 }
756}
757#endif
758
759#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
760void
761rxvt_term::slip_wheel_cb (time_watcher &w)
762{
763 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed))
766 {
767 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 }
771}
772#endif
779 773
780bool 774bool
781rxvt_term::pty_fill () 775rxvt_term::pty_fill ()
782{ 776{
783 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 777 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778
779 if (CBUFSIZ == n)
780 {
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
782 n = 0;
783 }
784 784
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 785 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 786 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 787 cmdbuf_endp = cmdbuf_ptr + n;
788 788
789 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
790 790
791 if (n > 0) 791 if (n > 0)
792 { 792 {
793 cmdbuf_endp += n; 793 cmdbuf_endp += n;
794 return true; 794 return true;
795 } 795 }
796 else if (n < 0 && errno != EAGAIN) 796 else if (n < 0 && errno != EAGAIN)
797 destroy (); 797 destroy ();
798 798
799 return false; 799 return false;
800} 800}
801 801
802void 802void
803rxvt_term::pty_cb (io_watcher &w, short revents) 803rxvt_term::pty_cb (io_watcher &w, short revents)
… …
806 SET_LOCALE (locale); 806 SET_LOCALE (locale);
807 807
808 if (revents & EVENT_WRITE) 808 if (revents & EVENT_WRITE)
809 tt_write (0, 0); 809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 810 else if (revents & EVENT_READ)
811 {
812 bool flag = true;
813
814 // loop, but don't allow a single term to monopolize us 811 // loop, but don't allow a single term to monopolize us
815 // the number of loops is fully arbitrary, and thus wrong
816 while (flag && pty_fill ()) 812 while (pty_fill ())
817 { 813 if (cmd_parse ())
818 if (!seen_input)
819 {
820 seen_input = 1;
821 /* once we know the shell is running, send the screen size. Again! */
822 tt_winch ();
823 }
824
825 uint32_t ch = NOCHAR;
826
827 for (;;)
828 {
829 if (ch == NOCHAR)
830 ch = next_char ();
831
832 if (ch == NOCHAR) // TODO: improve
833 break; 814 break;
834
835 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
836 {
837 /* Read a text string from the input buffer */
838 uint32_t buf[BUFSIZ];
839 bool refreshnow = false;
840 int nlines = 0;
841 uint32_t *str = buf;
842
843 *str++ = ch;
844
845 for (;;)
846 {
847 ch = next_char ();
848
849 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
850 break;
851 else
852 {
853 *str++ = ch;
854
855 if (ch == '\n')
856 {
857 nlines++;
858 refresh_count++;
859
860 if (!(Options & Opt_jumpScroll)
861 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
862 {
863 refreshnow = true;
864 flag = false;
865 ch = NOCHAR;
866 break;
867 }
868 }
869
870 if (str >= buf + BUFSIZ)
871 {
872 ch = NOCHAR;
873 break;
874 }
875 }
876 }
877
878 scr_add_lines (buf, nlines, str - buf);
879
880 /*
881 * If there have been a lot of new lines, then update the screen
882 * What the heck I'll cheat and only refresh less than every page-full.
883 * the number of pages between refreshes is refresh_limit, which
884 * is incremented here because we must be doing flat-out scrolling.
885 *
886 * refreshing should be correct for small scrolls, because of the
887 * time-out
888 */
889 if (refreshnow)
890 {
891 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
892 refresh_limit++;
893
894 scr_refresh (refresh_type);
895 }
896
897 }
898 else
899 {
900 switch (ch)
901 {
902 default:
903 process_nonprinting (ch);
904 break;
905 case C0_ESC: /* escape char */
906 process_escape_seq ();
907 break;
908 /*case 0x9b: */ /* CSI */
909 /* process_csi_seq (); */
910 }
911
912 ch = NOCHAR;
913 }
914 }
915 }
916 }
917} 815}
918 816
919// read the next character, currently handles UTF-8 817void
920// will probably handle all sorts of other stuff in the future 818rxvt_term::pointer_unblank ()
921uint32_t
922rxvt_term::next_char ()
923{ 819{
924 while (cmdbuf_ptr < cmdbuf_endp) 820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
925 { 821 recolour_cursor ();
926 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
927 return *cmdbuf_ptr++;
928 822
929 wchar_t wc; 823#ifdef POINTER_BLANK
930 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 824 hidden_pointer = 0;
931 825
932 if (len == (size_t)-2) 826 if (Options & Opt_pointerBlank)
933 return NOCHAR; 827 pointer_ev.start (NOW + pointerBlankDelay);
934
935 if (len == (size_t)-1)
936 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
937
938 // assume wchar == unicode
939 cmdbuf_ptr += len;
940 return wc;
941 }
942
943 return NOCHAR;
944}
945
946/* rxvt_cmd_getc() - Return next input character */
947/*
948 * Return the next input character after first passing any keyboard input
949 * to the command.
950 */
951uint32_t
952rxvt_term::cmd_getc ()
953{
954 for (;;)
955 {
956 uint32_t c = next_char ();
957 if (c != NOCHAR)
958 return c;
959
960 // incomplete sequences should occur rarely, still, a better solution
961 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (cmd_fd, F_SETFL, 0);
963 pty_fill ();
964 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
965 }
966
967#if 0
968#define TIMEOUT_USEC 5000
969 fd_set readfds;
970 int quick_timeout, select_res;
971 int want_motion_time, want_keypress_time;
972 struct timeval value;
973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
974 struct timeval tp;
975#endif
976
977 for (;;) {
978 /* loop until we can return something */
979
980 if (v_bufstr < v_bufptr) /* output any pending chars */
981 tt_write(NULL, 0);
982
983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
984 if (mouse_slip_wheel_speed) {
985 quick_timeout = 1;
986 if (!mouse_slip_wheel_delay--
987 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
988 abs(mouse_slip_wheel_speed))) {
989 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
990 refresh_type |= SMOOTH_REFRESH;
991 want_refresh = 1;
992 }
993 }
994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
995#ifdef SELECTION_SCROLLING
996 if (pending_scroll_selection) {
997 quick_timeout = 1;
998 if (!scroll_selection_delay--
999 && scr_page (scroll_selection_dir,
1000 scroll_selection_lines)) {
1001 selection_extend (selection_save_x,
1002 selection_save_y, selection_save_state);
1003 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 }
1007 }
1008#endif
1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1011 quick_timeout = 1;
1012 if (!scroll_arrow_delay--
1013 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1014 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 }
1018 }
1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1020
1021#ifdef TRANSPARENT
1022 quick_timeout |= want_full_refresh;
1023#endif
1024#endif 828#endif
1025} 829}
1026 830
1027#ifdef POINTER_BLANK 831#ifdef POINTER_BLANK
1028void 832void
1029rxvt_term::pointer_unblank ()
1030{
1031 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1032 recolour_cursor ();
1033
1034 hidden_pointer = 0;
1035
1036 if (Options & Opt_pointerBlank)
1037 pointer_ev.start (NOW + pointerBlankDelay);
1038}
1039
1040void
1041rxvt_term::pointer_blank () 833rxvt_term::pointer_blank ()
1042{ 834{
1043 if (!(Options & Opt_pointerBlank)) 835 if (! (Options & Opt_pointerBlank))
1044 return; 836 return;
1045 837
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 838 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 839 XFlush (display->display);
1048 840
1049 hidden_pointer = 1; 841 hidden_pointer = 1;
1050} 842}
1051 843
1052void 844void
… …
1058 pointer_blank (); 850 pointer_blank ();
1059} 851}
1060#endif 852#endif
1061 853
1062void 854void
1063rxvt_term::mouse_report (const XButtonEvent *ev) 855rxvt_term::mouse_report (XButtonEvent &ev)
1064{ 856{
1065 int button_number, key_state = 0; 857 int button_number, key_state = 0;
1066 int x, y; 858 int x, y;
1067 859
1068 x = ev->x; 860 x = ev.x;
1069 y = ev->y; 861 y = ev.y;
1070 pixel_position (&x, &y); 862 pixel_position (&x, &y);
1071 863
1072 if (MEvent.button == AnyButton) { 864 if (MEvent.button == AnyButton)
865 {
1073 button_number = 3; 866 button_number = 3;
1074 } else { 867 }
868 else
869 {
1075 button_number = MEvent.button - Button1; 870 button_number = MEvent.button - Button1;
1076 /* add 0x3D for wheel events, like xterm does */ 871 /* add 0x3D for wheel events, like xterm does */
1077 if (button_number >= 3) 872 if (button_number >= 3)
1078 button_number += (64 - 3); 873 button_number += (64 - 3);
1079 } 874 }
1080 875
1081 if (PrivateModes & PrivMode_MouseX10) { 876 if (PrivateModes & PrivMode_MouseX10)
877 {
1082 /* 878 /*
1083 * do not report ButtonRelease 879 * do not report ButtonRelease
1084 * no state info allowed 880 * no state info allowed
1085 */ 881 */
1086 key_state = 0; 882 key_state = 0;
1087 if (button_number == 3) 883 if (button_number == 3)
1088 return; 884 return;
1089 } else { 885 }
886 else
887 {
1090 /* XTerm mouse reporting needs these values: 888 /* XTerm mouse reporting needs these values:
1091 * 4 = Shift 889 * 4 = Shift
1092 * 8 = Meta 890 * 8 = Meta
1093 * 16 = Control 891 * 16 = Control
1094 * plus will add in our own Double-Click reporting 892 * plus will add in our own Double-Click reporting
1095 * 32 = Double Click 893 * 32 = Double Click
1096 */ 894 */
1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 895 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1098 + ((MEvent.state & ModMetaMask) ? 8 : 0) 896 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1099 + ((MEvent.state & ControlMask) ? 16 : 0); 897 + ((MEvent.state & ControlMask) ? 16 : 0);
1100#ifdef MOUSE_REPORT_DOUBLECLICK 898#ifdef MOUSE_REPORT_DOUBLECLICK
1101 key_state += ((MEvent.clicks > 1) ? 32 : 0); 899 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1102#endif 900#endif
901
1103 } 902 }
1104 903
1105#ifdef DEBUG_MOUSEREPORT 904#ifdef DEBUG_MOUSEREPORT
1106 fprintf(stderr, "Mouse ["); 905 fprintf (stderr, "Mouse [");
1107 if (key_state & 16) 906 if (key_state & 16)
1108 fputc('C', stderr); 907 fputc ('C', stderr);
1109 if (key_state & 4) 908 if (key_state & 4)
1110 fputc('S', stderr); 909 fputc ('S', stderr);
1111 if (key_state & 8) 910 if (key_state & 8)
1112 fputc('A', stderr); 911 fputc ('A', stderr);
1113 if (key_state & 32) 912 if (key_state & 32)
1114 fputc('2', stderr); 913 fputc ('2', stderr);
1115 fprintf(stderr, "]: <%d>, %d/%d\n", 914 fprintf (stderr, "]: <%d>, %d/%d\n",
1116 button_number, 915 button_number,
1117 x + 1, 916 x + 1,
1118 y + 1); 917 y + 1);
1119#else 918#else
1120 tt_printf("\033[M%c%c%c", 919 tt_printf ("\033[M%c%c%c",
1121 (32 + button_number + key_state), 920 (32 + button_number + key_state),
1122 (32 + x + 1), 921 (32 + x + 1),
1123 (32 + y + 1)); 922 (32 + y + 1));
1124#endif 923#endif
1125} 924}
1126 925
1127#ifdef USING_W11LIB 926#ifdef USING_W11LIB
1128void 927void
1129rxvt_W11_process_x_event(XEvent *ev) 928rxvt_W11_process_x_event (XEvent *ev)
1130{ 929{
1131 rxvt_t *r = rxvt_get_r(); 930 rxvt_t *r = rxvt_get_r ();
1132 931
1133 process_x_event (ev); 932 x_cb (*ev);
1134} 933}
1135#endif 934#endif
1136 935
1137/*{{{ process an X event */ 936/*{{{ process an X event */
1138void 937void
1139rxvt_term::process_x_event (XEvent *ev) 938rxvt_term::x_cb (XEvent &ev)
1140{ 939{
940 SET_R (this);
941 SET_LOCALE (locale);
942
943#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 }
954#endif
955
956#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 {
959 if (ev.type == MotionNotify
960 || ev.type == ButtonPress
961 || ev.type == ButtonRelease)
962 if (hidden_pointer)
963 pointer_unblank ();
964
965 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank ();
967 }
968#endif
969
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
1141 Window unused_root, unused_child; 975 Window unused_root, unused_child;
1142 int unused_root_x, unused_root_y; 976 int unused_root_x, unused_root_y;
1143 unsigned int unused_mask; 977 unsigned int unused_mask;
1144 978
1145#ifdef DEBUG_X 979#ifdef DEBUG_X
1146 const char *const eventnames[] = 980 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 981 { /* mason - this matches my system */
1148 "", 982 "",
1149 "", 983 "",
1150 "KeyPress", 984 "KeyPress",
1151 "KeyRelease", 985 "KeyRelease",
1152 "ButtonPress", 986 "ButtonPress",
1153 "ButtonRelease", 987 "ButtonRelease",
1154 "MotionNotify", 988 "MotionNotify",
1155 "EnterNotify", 989 "EnterNotify",
1156 "LeaveNotify", 990 "LeaveNotify",
1157 "FocusIn", 991 "FocusIn",
1158 "FocusOut", 992 "FocusOut",
1159 "KeymapNotify", 993 "KeymapNotify",
1160 "Expose", 994 "Expose",
1161 "GraphicsExpose", 995 "GraphicsExpose",
1162 "NoExpose", 996 "NoExpose",
1163 "VisibilityNotify", 997 "VisibilityNotify",
1164 "CreateNotify", 998 "CreateNotify",
1165 "DestroyNotify", 999 "DestroyNotify",
1166 "UnmapNotify", 1000 "UnmapNotify",
1167 "MapNotify", 1001 "MapNotify",
1168 "MapRequest", 1002 "MapRequest",
1169 "ReparentNotify", 1003 "ReparentNotify",
1170 "ConfigureNotify", 1004 "ConfigureNotify",
1171 "ConfigureRequest", 1005 "ConfigureRequest",
1172 "GravityNotify", 1006 "GravityNotify",
1173 "ResizeRequest", 1007 "ResizeRequest",
1174 "CirculateNotify", 1008 "CirculateNotify",
1175 "CirculateRequest", 1009 "CirculateRequest",
1176 "PropertyNotify", 1010 "PropertyNotify",
1177 "SelectionClear", 1011 "SelectionClear",
1178 "SelectionRequest", 1012 "SelectionRequest",
1179 "SelectionNotify", 1013 "SelectionNotify",
1180 "ColormapNotify", 1014 "ColormapNotify",
1181 "ClientMessage", 1015 "ClientMessage",
1182 "MappingNotify" 1016 "MappingNotify"
1183 }; 1017 };
1184#endif 1018#endif
1185 1019
1186#ifdef DEBUG_X 1020#ifdef DEBUG_X
1187 struct timeval tp; 1021 struct timeval tp;
1188 struct tm *ltt; 1022 struct tm *ltt;
1189 (void)gettimeofday(&tp, NULL); 1023 (void)gettimeofday (&tp, NULL);
1190 ltt = localtime(&(tp.tv_sec)); 1024 ltt = localtime (& (tp.tv_sec));
1191 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == TermWin.parent[0] ? "parent" : (ev->xany.window == TermWin.vt ? "vt" : (ev->xany.window == scrollBar.win ? "scroll" : (ev->xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev->xany.window == TermWin.vt ? TermWin.vt : (ev->xany.window == scrollBar.win ? scrollBar.win : (ev->xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1025 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1192#endif 1026#endif
1193 1027
1194 switch (ev->type) { 1028 switch (ev.type)
1029 {
1195 case KeyPress: 1030 case KeyPress:
1196 lookup_key ((XKeyEvent *)ev); 1031 lookup_key (ev.xkey);
1197 break; 1032 break;
1198 1033
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 case KeyRelease: 1035 case KeyRelease:
1201 { 1036 {
1202 if (!(ev->xkey.state & ControlMask)) 1037 if (!(ev.xkey.state & ControlMask))
1203 mouse_slip_wheel_speed = 0; 1038 slip_wheel_ev.stop ();
1204 else { 1039 else
1205 KeySym ks; 1040 {
1206 1041 KeySym ks;
1042
1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1208 if (ks == XK_Control_L || ks == XK_Control_R) 1044 if (ks == XK_Control_L || ks == XK_Control_R)
1209 mouse_slip_wheel_speed = 0; 1045 mouse_slip_wheel_speed = 0;
1210 } 1046 }
1211 break; 1047 break;
1212 } 1048 }
1213#endif 1049#endif
1214 1050
1215 case ButtonPress: 1051 case ButtonPress:
1216 button_press ((XButtonEvent *)ev); 1052 button_press (ev.xbutton);
1217 break; 1053 break;
1218 1054
1219 case ButtonRelease: 1055 case ButtonRelease:
1220 button_release ((XButtonEvent *)ev); 1056 button_release (ev.xbutton);
1221 break; 1057 break;
1222 1058
1223 case ClientMessage: 1059 case ClientMessage:
1224 if (ev->xclient.format == 32 1060 if (ev.xclient.format == 32
1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1226 destroy (); 1062 destroy ();
1227#ifdef OFFIX_DND 1063#ifdef OFFIX_DND
1228 /* OffiX Dnd (drag 'n' drop) protocol */ 1064 /* OffiX Dnd (drag 'n' drop) protocol */
1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1230 && (ev->xclient.data.l[0] == DndFile 1066 && (ev.xclient.data.l[0] == DndFile
1231 || ev->xclient.data.l[0] == DndDir 1067 || ev.xclient.data.l[0] == DndDir
1232 || ev->xclient.data.l[0] == DndLink)) { 1068 || ev.xclient.data.l[0] == DndLink))
1233 /* Get Dnd data */ 1069 {
1234 Atom ActualType; 1070 /* Get Dnd data */
1235 int ActualFormat; 1071 Atom ActualType;
1072 int ActualFormat;
1236 unsigned char *data; 1073 unsigned char *data;
1237 unsigned long Size, RemainingBytes; 1074 unsigned long Size, RemainingBytes;
1238 1075
1239 XGetWindowProperty(Xdisplay, Xroot, 1076 XGetWindowProperty (display->display, display->root,
1240 xa[XA_DNDSELECTION], 1077 xa[XA_DNDSELECTION],
1241 0L, 1000000L, 1078 0L, 1000000L,
1242 False, AnyPropertyType, 1079 False, AnyPropertyType,
1243 &ActualType, &ActualFormat, 1080 &ActualType, &ActualFormat,
1244 &Size, &RemainingBytes, 1081 &Size, &RemainingBytes,
1245 &data); 1082 &data);
1246 XChangeProperty(Xdisplay, Xroot, 1083 XChangeProperty (display->display, display->root,
1247 XA_CUT_BUFFER0, XA_STRING, 1084 XA_CUT_BUFFER0, XA_STRING,
1248 8, PropModeReplace, 1085 8, PropModeReplace,
1249 data, STRLEN(data)); 1086 data, STRLEN (data));
1087 XFree (data);
1250 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1088 selection_paste (display->root, XA_CUT_BUFFER0, True);
1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1252 } 1090 }
1253#endif /* OFFIX_DND */ 1091#endif /* OFFIX_DND */
1254 break; 1092 break;
1255 1093
1256 case MappingNotify: 1094 case MappingNotify:
1257 XRefreshKeyboardMapping(&(ev->xmapping)); 1095 XRefreshKeyboardMapping (&ev.xmapping);
1258 break; 1096 break;
1259 1097
1260 /* 1098 /*
1261 * XXX: this is not the _current_ arrangement 1099 * XXX: this is not the _current_ arrangement
1262 * Here's my conclusion: 1100 * Here's my conclusion:
1263 * If the window is completely unobscured, use bitblt's 1101 * If the window is completely unobscured, use bitblt's
1264 * to scroll. Even then, they're only used when doing partial 1102 * to scroll. Even then, they're only used when doing partial
1265 * screen scrolling. When partially obscured, we have to fill 1103 * screen scrolling. When partially obscured, we have to fill
1266 * in the GraphicsExpose parts, which means that after each refresh, 1104 * in the GraphicsExpose parts, which means that after each refresh,
1267 * we need to wait for the graphics expose or Noexpose events, 1105 * we need to wait for the graphics expose or Noexpose events,
1268 * which ought to make things real slow! 1106 * which ought to make things real slow!
1269 */ 1107 */
1270 case VisibilityNotify: 1108 case VisibilityNotify:
1271 switch (ev->xvisibility.state) 1109 switch (ev.xvisibility.state)
1272 { 1110 {
1273 case VisibilityUnobscured: 1111 case VisibilityUnobscured:
1274 refresh_type = FAST_REFRESH; 1112 refresh_type = FAST_REFRESH;
1275 break; 1113 break;
1276 case VisibilityPartiallyObscured: 1114 case VisibilityPartiallyObscured:
… …
1278 break; 1116 break;
1279 default: 1117 default:
1280 refresh_type = NO_REFRESH; 1118 refresh_type = NO_REFRESH;
1281 break; 1119 break;
1282 } 1120 }
1283 break; 1121 break;
1284 1122
1285 case FocusIn: 1123 case FocusIn:
1286 if (!TermWin.focus) { 1124 if (!TermWin.focus)
1125 {
1287 TermWin.focus = 1; 1126 TermWin.focus = 1;
1288 want_refresh = 1; 1127 want_refresh = 1;
1289#ifdef USE_XIM 1128#ifdef USE_XIM
1290 if (Input_Context != NULL) 1129 if (Input_Context != NULL)
1291 XSetICFocus(Input_Context); 1130 XSetICFocus (Input_Context);
1292#endif 1131#endif
1293#ifdef CURSOR_BLINK 1132#ifdef CURSOR_BLINK
1294 if (Options & Opt_cursorBlink) 1133 if (Options & Opt_cursorBlink)
1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1296#endif 1135#endif
1297 } 1136#ifdef OFF_FOCUS_FADING
1298 break; 1137 if (rs[Rs_fade])
1138 {
1139 PixColors = PixColorsFocused;
1140 set_colorfgbg ();
1141 scr_clear ();
1142 scr_touch (true);
1143 }
1144#endif
1299 1145
1146 }
1147 break;
1148
1300 case FocusOut: 1149 case FocusOut:
1301 if (TermWin.focus) { 1150 if (TermWin.focus)
1151 {
1302 TermWin.focus = 0; 1152 TermWin.focus = 0;
1303 want_refresh = 1; 1153 want_refresh = 1;
1304#ifdef USE_XIM 1154#ifdef USE_XIM
1305 if (Input_Context != NULL) 1155 if (Input_Context != NULL)
1306 XUnsetICFocus(Input_Context); 1156 XUnsetICFocus (Input_Context);
1307#endif 1157#endif
1308#ifdef CURSOR_BLINK 1158#ifdef CURSOR_BLINK
1309 if (Options & Opt_cursorBlink) 1159 if (Options & Opt_cursorBlink)
1310 cursor_blink_ev.stop (); 1160 cursor_blink_ev.stop ();
1311 hidden_cursor = 0; 1161 hidden_cursor = 0;
1312#endif 1162#endif
1313 } 1163#ifdef OFF_FOCUS_FADING
1314 break; 1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1315 1172
1173 }
1174 break;
1175
1316 case ConfigureNotify: 1176 case ConfigureNotify:
1317 if (ev->xconfigure.window == TermWin.parent[0]) { 1177 if (ev.xconfigure.window == TermWin.parent[0])
1318 int height, width; 1178 {
1179 int height, width;
1319 1180
1181 do
1320 do { /* Wrap lots of configures into one */ 1182 { /* Wrap lots of configures into one */
1321 width = ev->xconfigure.width; 1183 width = ev.xconfigure.width;
1322 height = ev->xconfigure.height; 1184 height = ev.xconfigure.height;
1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1186 }
1325 ConfigureNotify, ev)); 1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1326 if (szHint.width != width || szHint.height != height) { 1189 if (szHint.width != width || szHint.height != height)
1327 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1328 resize_all_windows (width, height, 1); 1190 resize_all_windows (width, height, 1);
1329 } 1191
1330#ifdef DEBUG_SIZE
1331 else {
1332 D_SIZE((stderr, "Size: Not resizing"));
1333 }
1334#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) { 1193 if (Options & Opt_transparent)
1337 check_our_parents (); 1194 {
1338 if (am_transparent) 1195 check_our_parents ();
1196 if (am_transparent)
1339 want_full_refresh = 1; 1197 want_full_refresh = 1;
1340 } 1198 }
1341#endif 1199#endif
1342 } 1200 }
1343 break; 1201 break;
1344 1202
1345 case SelectionClear: 1203 case SelectionClear:
1346 selection_clear (); 1204 selection_clear ();
1347 break; 1205 break;
1348 1206
1349 case SelectionNotify: 1207 case SelectionNotify:
1350 if (selection_wait == Sel_normal) 1208 if (selection_wait == Sel_normal)
1351 selection_paste (ev->xselection.requestor, 1209 selection_paste (ev.xselection.requestor,
1352 ev->xselection.property, True); 1210 ev.xselection.property, True);
1353 break; 1211 break;
1354 1212
1355 case SelectionRequest: 1213 case SelectionRequest:
1356 selection_send (&(ev->xselectionrequest)); 1214 selection_send (ev.xselectionrequest);
1357 break; 1215 break;
1358 1216
1359 case UnmapNotify: 1217 case UnmapNotify:
1360 TermWin.mapped = 0; 1218 TermWin.mapped = 0;
1361#ifdef TEXT_BLINK 1219#ifdef TEXT_BLINK
1362 text_blink_ev.stop (); 1220 text_blink_ev.stop ();
1363#endif 1221#endif
1364 break; 1222 break;
1365 1223
1366 case MapNotify: 1224 case MapNotify:
1367 TermWin.mapped = 1; 1225 TermWin.mapped = 1;
1368#ifdef TEXT_BLINK 1226#ifdef TEXT_BLINK
1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370#endif 1228#endif
1371 break;
1372
1373 case PropertyNotify:
1374 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1375 if (ev->xproperty.state == PropertyNewValue)
1376 selection_property (ev->xproperty.window,
1377 ev->xproperty.atom);
1378 break; 1229 break;
1379 } 1230
1380#ifdef TRANSPARENT 1231#ifdef TRANSPARENT
1381 /*
1382 * if user used some Esetroot compatible prog to set the root bg,
1383 * use the property to determine the pixmap. We use it later on.
1384 */
1385 if (xa[XA_XROOTPMAPID] == 0)
1386 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1387 "_XROOTPMAP_ID", False);
1388 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1389 break;
1390 /* FALLTHROUGH */
1391 case ReparentNotify: 1232 case ReparentNotify:
1392 if ((Options & Opt_transparent) && check_our_parents ()) { 1233 rootwin_cb (ev);
1393 if (am_transparent) 1234 break;
1394 want_full_refresh = 1;
1395 }
1396#endif /* TRANSPARENT */ 1235#endif /* TRANSPARENT */
1397 break;
1398 1236
1399 case GraphicsExpose: 1237 case GraphicsExpose:
1400 case Expose: 1238 case Expose:
1401 if (ev->xany.window == TermWin.vt) { 1239 if (ev.xany.window == TermWin.vt)
1402#ifdef NO_SLOW_LINK_SUPPORT 1240 {
1241 do
1403 scr_expose (ev->xexpose.x, ev->xexpose.y, 1242 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev->xexpose.width, ev->xexpose.height, False); 1243 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1406 // don't understand this, so commented it out 1245
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1407 scr_expose (ev->xexpose.x, ev->xexpose.y, 1249 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev->xexpose.width, ev->xexpose.height, False); 1250 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev->xexpose.x, 0,
1410 // ev->xexpose.width, TermWin.height, False);
1411#endif
1412 want_refresh = 1;
1413 } else {
1414 XEvent unused_xevent;
1415 1251
1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1252 scr_refresh (refresh_type);
1417 Expose, 1253 }
1418 &unused_xevent)) ; 1254 else
1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1255 {
1420 GraphicsExpose, 1256 XEvent unused_event;
1421 &unused_xevent)) ; 1257
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1259 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1261 ;
1262
1422 if (isScrollbarWindow(ev->xany.window)) { 1263 if (isScrollbarWindow (ev.xany.window))
1423 scrollBar.setIdle(); 1264 {
1424 scrollbar_show (0); 1265 scrollBar.setIdle ();
1425 } 1266 scrollbar_show (0);
1267 }
1426#ifdef MENUBAR 1268#ifdef MENUBAR
1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1428 menubar_expose (); 1270 menubar_expose ();
1429#endif 1271#endif
1430#ifdef RXVT_GRAPHICS
1431 Gr_expose (ev->xany.window);
1432#endif
1433 }
1434 break;
1435 1272
1273#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window);
1276#endif
1277 }
1278 break;
1279
1436 case MotionNotify: 1280 case MotionNotify:
1437#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1282 if (hidden_pointer)
1439 pointer_unblank (); 1283 pointer_unblank ();
1440#endif 1284#endif
1441#if MENUBAR 1285#if MENUBAR
1442 if (isMenuBarWindow(ev->xany.window)) { 1286 if (isMenuBarWindow (ev.xany.window))
1287 {
1443 menubar_control (&(ev->xbutton)); 1288 menubar_control (ev.xbutton);
1444 break; 1289 break;
1445 } 1290 }
1446#endif 1291#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break; 1293 break;
1449 1294
1450 if (ev->xany.window == TermWin.vt) { 1295 if (ev.xany.window == TermWin.vt)
1296 {
1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1298 {
1453 MotionNotify, ev)) ; 1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1454 XQueryPointer(Xdisplay, TermWin.vt, 1300 ;
1455 &unused_root, &unused_child, 1301
1456 &unused_root_x, &unused_root_y, 1302 XQueryPointer (display->display, TermWin.vt,
1457 &(ev->xbutton.x), &(ev->xbutton.y), 1303 &unused_root, &unused_child,
1458 &unused_mask); 1304 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y),
1306 &unused_mask);
1459#ifdef MOUSE_THRESHOLD 1307#ifdef MOUSE_THRESHOLD
1460 /* deal with a `jumpy' mouse */ 1308 /* deal with a `jumpy' mouse */
1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 {
1462#endif 1311#endif
1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1464 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1313 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1465#ifdef SELECTION_SCROLLING 1314#ifdef SELECTION_SCROLLING
1466 if (ev->xbutton.y < TermWin.int_bwidth 1315 if (ev.xbutton.y < TermWin.int_bwidth
1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1468 int dist;
1469
1470 pending_scroll_selection=1;
1471
1472 /* don't clobber the current delay if we are
1473 * already in the middle of scrolling.
1474 */
1475 if (scroll_selection_delay<=0)
1476 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1477
1478 /* save the event params so we can highlight
1479 * the selection in the pending-scroll loop
1480 */
1481 selection_save_x=ev->xbutton.x;
1482 selection_save_y=ev->xbutton.y;
1483 selection_save_state=
1484 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1485
1486 /* calc number of lines to scroll */
1487 if (ev->xbutton.y<TermWin.int_bwidth) {
1488 scroll_selection_dir = UP;
1489 dist = TermWin.int_bwidth - ev->xbutton.y;
1490 }
1491 else {
1492 scroll_selection_dir = DN;
1493 dist = ev->xbutton.y -
1494 (TermWin.int_bwidth + TermWin.height);
1495 }
1496 scroll_selection_lines=(Pixel2Height(dist)/
1497 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1498 MIN_IT(scroll_selection_lines,
1499 SELECTION_SCROLL_MAX_LINES);
1500 }
1501 else {
1502 /* we are within the text window, so we
1503 * shouldn't be scrolling
1504 */
1505 pending_scroll_selection = 0;
1506 }
1507#endif
1508#ifdef MOUSE_THRESHOLD
1509 }
1510#endif
1511 }
1512 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1513 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1514 MotionNotify, ev)) ;
1515 XQueryPointer(Xdisplay, scrollBar.win,
1516 &unused_root, &unused_child,
1517 &unused_root_x, &unused_root_y,
1518 &(ev->xbutton.x), &(ev->xbutton.y),
1519 &unused_mask);
1520 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1521 scrollbar_size());
1522 scr_refresh (refresh_type);
1523 refresh_limit = 0;
1524 scrollbar_show (1);
1525 }
1526 break;
1527 }
1528}
1529
1530void
1531rxvt_term::button_press (XButtonEvent *ev)
1532{
1533 int reportmode = 0, clickintime;
1534
1535 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1536 if (!bypass_keystate)
1537 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1538/*
1539 * VT window processing of button press
1540 */
1541 if (ev->window == TermWin.vt)
1542 {
1543#if RXVT_GRAPHICS
1544 if (ev->subwindow != None)
1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1546 else
1547#endif
1548 {
1549 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1550 if (reportmode)
1551 {
1552 /* mouse report from vt window */
1553 /* save the xbutton state (for ButtonRelease) */
1554 MEvent.state = ev->state;
1555#ifdef MOUSE_REPORT_DOUBLECLICK
1556 if (ev->button == MEvent.button && clickintime)
1557 {
1558 /* same button, within alloted time */
1559 MEvent.clicks++;
1560 if (MEvent.clicks > 1)
1561 { 1317 {
1562 /* only report double clicks */ 1318 int dist;
1563 MEvent.clicks = 2;
1564 mouse_report (ev);
1565 1319
1566 /* don't report the release */ 1320 /* don't clobber the current delay if we are
1567 MEvent.clicks = 0; 1321 * already in the middle of scrolling.
1568 MEvent.button = AnyButton;
1569 }
1570 }
1571 else
1572 { 1322 */
1573 /* different button, or time expired */ 1323 if (!sel_scroll_ev.active)
1574 MEvent.clicks = 1; 1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1575 MEvent.button = ev->button; 1325
1576 mouse_report (ev); 1326 /* save the event params so we can highlight
1577 } 1327 * the selection in the pending-scroll loop
1578#else
1579 MEvent.button = ev->button;
1580 mouse_report (ev);
1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1582 }
1583 else
1584 {
1585 if (ev->button != MEvent.button)
1586 MEvent.clicks = 0;
1587 switch (ev->button)
1588 { 1328 */
1589 case Button1: 1329 selection_save_x=ev.xbutton.x;
1590 /* allow shift+left click to extend selection */ 1330 selection_save_y=ev.xbutton.y;
1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333
1334 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth)
1592 { 1336 {
1593 if (MEvent.button == Button1 && clickintime) 1337 scroll_selection_dir = UP;
1594 selection_rotate (ev->x, ev->y); 1338 dist = TermWin.int_bwidth - ev.xbutton.y;
1595 else
1596 selection_extend (ev->x, ev->y, 1);
1597 } 1339 }
1598 else 1340 else
1599 { 1341 {
1600 if (MEvent.button == Button1 && clickintime) 1342 scroll_selection_dir = DN;
1601 MEvent.clicks++; 1343 dist = ev.xbutton.y -
1602 else 1344 (TermWin.int_bwidth + TermWin.height);
1603 MEvent.clicks = 1;
1604
1605 selection_click (MEvent.clicks, ev->x, ev->y);
1606 } 1345 }
1346 scroll_selection_lines= (Pixel2Height (dist)/
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1348 MIN_IT (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES);
1350 }
1351 else
1352 {
1353 /* we are within the text window, so we
1354 * shouldn't be scrolling
1355 */
1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop();
1358 }
1359#endif
1360#ifdef MOUSE_THRESHOLD
1607 1361
1362 }
1363#endif
1364
1365 }
1366 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1370 MotionNotify, &ev)) ;
1371 XQueryPointer (display->display, scrollBar.win,
1372 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y),
1375 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ());
1378 scr_refresh (refresh_type);
1379 refresh_limit = 0;
1380 scrollbar_show (1);
1381 }
1382 break;
1383 }
1384}
1385
1386void
1387rxvt_term::rootwin_cb (XEvent &ev)
1388{
1389 SET_R (this);
1390 SET_LOCALE (locale);
1391
1392 switch (ev.type)
1393 {
1394 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /*
1405 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on.
1407 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1412 return;
1413 }
1414
1415 /* FALLTHROUGH */
1416 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1;
1419 break;
1420#endif
1421 }
1422}
1423
1424void
1425rxvt_term::button_press (XButtonEvent &ev)
1426{
1427 int reportmode = 0, clickintime;
1428
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1430 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1432 /*
1433 * VT window processing of button press
1434 */
1435 if (ev.window == TermWin.vt)
1436 {
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1438 if (reportmode)
1439 {
1440 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime)
1445 {
1446 /* same button, within alloted time */
1447 MEvent.clicks++;
1448 if (MEvent.clicks > 1)
1449 {
1450 /* only report double clicks */
1451 MEvent.clicks = 2;
1452 mouse_report (ev);
1453
1454 /* don't report the release */
1455 MEvent.clicks = 0;
1456 MEvent.button = AnyButton;
1457 }
1458 }
1459 else
1460 {
1461 /* different button, or time expired */
1462 MEvent.clicks = 1;
1463 MEvent.button = ev.button;
1464 mouse_report (ev);
1465 }
1466#else
1467 MEvent.button = ev.button;
1468 mouse_report (ev);
1469#endif /* MOUSE_REPORT_DOUBLECLICK */
1470
1471 }
1472 else
1473 {
1474 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0;
1476 switch (ev.button)
1477 {
1478 case Button1:
1479 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1481 {
1482 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y);
1484 else
1485 selection_extend (ev.x, ev.y, 1);
1486 }
1487 else
1488 {
1489 if (MEvent.button == Button1 && clickintime)
1490 MEvent.clicks++;
1491 else
1492 MEvent.clicks = 1;
1493
1494 selection_click (MEvent.clicks, ev.x, ev.y);
1495 }
1496
1608 MEvent.button = Button1; 1497 MEvent.button = Button1;
1498 break;
1499
1500 case Button3:
1501 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y);
1503 else
1504 selection_extend (ev.x, ev.y, 1);
1505 MEvent.button = Button3;
1506 break;
1507 }
1508 }
1509 MEvent.time = ev.time;
1510 return;
1511 }
1512
1513 /*
1514 * Scrollbar window processing of button press
1515 */
1516 if (isScrollbarWindow (ev.window))
1517 {
1518 scrollBar.setIdle ();
1519 /*
1520 * Rxvt-style scrollbar:
1521 * move up if mouse is above slider
1522 * move dn if mouse is below slider
1523 *
1524 * XTerm-style scrollbar:
1525 * Move display proportional to pointer location
1526 * pointer near top -> scroll one line
1527 * pointer near bot -> scroll full page
1528 */
1529#ifndef NO_SCROLLBAR_REPORT
1530 if (reportmode)
1531 {
1532 /*
1533 * Mouse report disabled scrollbar:
1534 * arrow buttons - send up/down
1535 * click on scrollbar - send pageup/down
1536 */
1537 if ((scrollBar.style == R_SB_NEXT
1538 && scrollbarnext_upButton (ev.y))
1539 || (scrollBar.style == R_SB_RXVT
1540 && scrollbarrxvt_upButton (ev.y)))
1541 tt_printf ("\033[A");
1542 else if ((scrollBar.style == R_SB_NEXT
1543 && scrollbarnext_dnButton (ev.y))
1544 || (scrollBar.style == R_SB_RXVT
1545 && scrollbarrxvt_dnButton (ev.y)))
1546 tt_printf ("\033[B");
1547 else
1548 switch (ev.button)
1549 {
1550 case Button2:
1551 tt_printf ("\014");
1552 break;
1553 case Button1:
1554 tt_printf ("\033[6~");
1555 break;
1556 case Button3:
1557 tt_printf ("\033[5~");
1558 break;
1559 }
1560 }
1561 else
1562#endif /* NO_SCROLLBAR_REPORT */
1563
1564 {
1565 char upordown = 0;
1566
1567 if (scrollBar.style == R_SB_NEXT)
1568 {
1569 if (scrollbarnext_upButton (ev.y))
1570 upordown = -1; /* up */
1571 else if (scrollbarnext_dnButton (ev.y))
1572 upordown = 1; /* down */
1573 }
1574 else if (scrollBar.style == R_SB_RXVT)
1575 {
1576 if (scrollbarrxvt_upButton (ev.y))
1577 upordown = -1; /* up */
1578 else if (scrollbarrxvt_dnButton (ev.y))
1579 upordown = 1; /* down */
1580 }
1581 if (upordown)
1582 {
1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1585#endif
1586 if (scr_page (upordown < 0 ? UP : DN, 1))
1587 {
1588 if (upordown < 0)
1589 scrollBar.setUp ();
1590 else
1591 scrollBar.setDn ();
1592 }
1593 }
1594 else
1595 switch (ev.button)
1596 {
1597 case Button2:
1598 switch (scrollbar_align)
1599 {
1600 case R_SB_ALIGN_TOP:
1601 csrO = 0;
1609 break; 1602 break;
1610 1603 case R_SB_ALIGN_CENTRE:
1611 case Button3: 1604 csrO = (scrollBar.bot - scrollBar.top) / 2;
1612 if (MEvent.button == Button3 && clickintime)
1613 selection_rotate (ev->x, ev->y);
1614 else
1615 selection_extend (ev->x, ev->y, 1);
1616 MEvent.button = Button3;
1617 break; 1605 break;
1606 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top;
1608 break;
1609 }
1610 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO,
1614 scrollbar_size ());
1615 scrollBar.setMotion ();
1616 break;
1617
1618 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1620 csrO = ev.y - scrollBar.top;
1621 /* FALLTHROUGH */
1622
1623 case Button3:
1624 if (scrollBar.style != R_SB_XTERM)
1625 {
1626 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1);
1629# else
1630 scr_page (UP, TermWin.nrow / 4);
1631# endif
1632 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1);
1635# else
1636 scr_page (DN, TermWin.nrow / 4);
1637# endif
1638 else
1639 scrollBar.setMotion ();
1640 }
1641 else
1642 {
1643 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow
1645 * scrollbar_position (ev.y)
1646 / scrollbar_size ()));
1647 }
1648 break;
1649 }
1618 } 1650 }
1619 }
1620 MEvent.time = ev->time;
1621 return; 1651 return;
1622 }
1623 }
1624
1625/*
1626 * Scrollbar window processing of button press
1627 */
1628 if (isScrollbarWindow(ev->window))
1629 {
1630 scrollBar.setIdle ();
1631 /*
1632 * Rxvt-style scrollbar:
1633 * move up if mouse is above slider
1634 * move dn if mouse is below slider
1635 *
1636 * XTerm-style scrollbar:
1637 * Move display proportional to pointer location
1638 * pointer near top -> scroll one line
1639 * pointer near bot -> scroll full page
1640 */
1641#ifndef NO_SCROLLBAR_REPORT
1642 if (reportmode) {
1643 /*
1644 * Mouse report disabled scrollbar:
1645 * arrow buttons - send up/down
1646 * click on scrollbar - send pageup/down
1647 */
1648 if ((scrollBar.style == R_SB_NEXT
1649 && scrollbarnext_upButton(ev->y))
1650 || (scrollBar.style == R_SB_RXVT
1651 && scrollbarrxvt_upButton(ev->y)))
1652 tt_printf("\033[A");
1653 else if ((scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_dnButton(ev->y))
1655 || (scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_dnButton(ev->y)))
1657 tt_printf("\033[B");
1658 else
1659 switch (ev->button) {
1660 case Button2:
1661 tt_printf("\014");
1662 break;
1663 case Button1:
1664 tt_printf("\033[6~");
1665 break;
1666 case Button3:
1667 tt_printf("\033[5~");
1668 break;
1669 }
1670 }
1671 else
1672#endif /* NO_SCROLLBAR_REPORT */
1673 {
1674 char upordown = 0;
1675
1676 if (scrollBar.style == R_SB_NEXT) {
1677 if (scrollbarnext_upButton(ev->y))
1678 upordown = -1; /* up */
1679 else if (scrollbarnext_dnButton(ev->y))
1680 upordown = 1; /* down */
1681 } else if (scrollBar.style == R_SB_RXVT) {
1682 if (scrollbarrxvt_upButton(ev->y))
1683 upordown = -1; /* up */
1684 else if (scrollbarrxvt_dnButton(ev->y))
1685 upordown = 1; /* down */
1686 } 1652 }
1687 if (upordown) { 1653#if MENUBAR
1654 /*
1655 * Menubar window processing of button press
1656 */
1657 if (isMenuBarWindow (ev.window))
1658 menubar_control (ev);
1659#endif
1660}
1661
1662void
1663rxvt_term::button_release (XButtonEvent &ev)
1664{
1665 int reportmode = 0;
1666
1667 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1670
1671 if (scrollbar_isUpDn ())
1672 {
1673 scrollBar.setIdle ();
1674 scrollbar_show (0);
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1676 refresh_type &= ~SMOOTH_REFRESH;
1690#endif
1691 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 } else
1698 switch (ev->button) {
1699 case Button2:
1700 switch (scrollbar_align) {
1701 case R_SB_ALIGN_TOP:
1702 csrO = 0;
1703 break;
1704 case R_SB_ALIGN_CENTRE:
1705 csrO = (scrollBar.bot - scrollBar.top) / 2;
1706 break;
1707 case R_SB_ALIGN_BOTTOM:
1708 csrO = scrollBar.bot - scrollBar.top;
1709 break;
1710 }
1711 if (scrollBar.style == R_SB_XTERM
1712 || scrollbar_above_slider(ev->y)
1713 || scrollbar_below_slider(ev->y))
1714 scr_move_to ( scrollbar_position(ev->y) - csrO,
1715 scrollbar_size());
1716 scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1721 csrO = ev->y - scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 scr_page (UP, TermWin.nrow - 1);
1729# else
1730 scr_page (UP, TermWin.nrow / 4);
1731# endif 1677#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 scr_page (DN, TermWin.nrow - 1);
1735# else
1736 scr_page (DN, TermWin.nrow / 4);
1737# endif
1738 else
1739 scrollBar.setMotion ();
1740 } else {
1741 scr_page ((ev->button == Button1 ? DN : UP),
1742 (TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 menubar_control (ev);
1757#endif
1758}
1759 1678
1760void
1761rxvt_term::button_release (XButtonEvent *ev)
1762{
1763 int reportmode = 0;
1764
1765 csrO = 0; /* reset csr Offset */
1766 if (!bypass_keystate)
1767 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1768
1769 if (scrollbar_isUpDn()) {
1770 scrollBar.setIdle ();
1771 scrollbar_show (0);
1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1773 refresh_type &= ~SMOOTH_REFRESH;
1774#endif
1775 } 1679 }
1776#ifdef SELECTION_SCROLLING 1680#ifdef SELECTION_SCROLLING
1777 pending_scroll_selection=0; 1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop();
1778#endif 1683#endif
1779 if (ev->window == TermWin.vt) 1684 if (ev.window == TermWin.vt)
1780 { 1685 {
1781#ifdef RXVT_GRAPHICS
1782 if (ev->subwindow != None)
1783 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1784 else
1785#endif
1786 {
1787 if (reportmode) 1686 if (reportmode)
1788 { 1687 {
1789 /* mouse report from vt window */ 1688 /* mouse report from vt window */
1790 /* don't report release of wheel "buttons" */ 1689 /* don't report release of wheel "buttons" */
1791 if (ev->button >= 4) 1690 if (ev.button >= 4)
1792 return; 1691 return;
1793#ifdef MOUSE_REPORT_DOUBLECLICK 1692#ifdef MOUSE_REPORT_DOUBLECLICK
1794 /* only report the release of 'slow' single clicks */ 1693 /* only report the release of 'slow' single clicks */
1795 if (MEvent.button != AnyButton 1694 if (MEvent.button != AnyButton
1796 && (ev->button != MEvent.button 1695 && (ev.button != MEvent.button
1797 || (ev->time - MEvent.time 1696 || (ev.time - MEvent.time
1798 > MULTICLICK_TIME / 2))) 1697 > MULTICLICK_TIME / 2)))
1799 { 1698 {
1800 MEvent.clicks = 0; 1699 MEvent.clicks = 0;
1801 MEvent.button = AnyButton; 1700 MEvent.button = AnyButton;
1802 mouse_report (ev); 1701 mouse_report (ev);
1803 } 1702 }
1804#else /* MOUSE_REPORT_DOUBLECLICK */ 1703#else /* MOUSE_REPORT_DOUBLECLICK */
1805 MEvent.button = AnyButton; 1704 MEvent.button = AnyButton;
1806 mouse_report (ev); 1705 mouse_report (ev);
1807#endif /* MOUSE_REPORT_DOUBLECLICK */ 1706#endif /* MOUSE_REPORT_DOUBLECLICK */
1808 return; 1707 return;
1809 } 1708 }
1810 /* 1709 /*
1811 * dumb hack to compensate for the failure of click-and-drag 1710 * dumb hack to compensate for the failure of click-and-drag
1812 * when overriding mouse reporting 1711 * when overriding mouse reporting
1813 */ 1712 */
1814 if (PrivateModes & PrivMode_mouse_report 1713 if (PrivateModes & PrivMode_mouse_report
1815 && bypass_keystate 1714 && bypass_keystate
1816 && ev->button == Button1 && MEvent.clicks <= 1) 1715 && ev.button == Button1 && MEvent.clicks <= 1)
1817 selection_extend (ev->x, ev->y, 0); 1716 selection_extend (ev.x, ev.y, 0);
1818 1717
1819 switch (ev->button) { 1718 switch (ev.button)
1719 {
1820 case Button1: 1720 case Button1:
1821 case Button3: 1721 case Button3:
1822 selection_make (ev->time); 1722 selection_make (ev.time);
1823 break; 1723 break;
1824 case Button2: 1724 case Button2:
1825 selection_request (ev->time, ev->x, ev->y); 1725 selection_request (ev.time, ev.x, ev.y);
1826 break; 1726 break;
1827#ifdef MOUSE_WHEEL 1727#ifdef MOUSE_WHEEL
1828 case Button4: 1728 case Button4:
1829 case Button5: 1729 case Button5:
1830 { 1730 {
1831 int i; 1731 int i;
1832 page_dirn v; 1732 page_dirn v;
1833 1733
1834 v = (ev->button == Button4) ? UP : DN; 1734 v = ev.button == Button4 ? UP : DN;
1735
1835 if (ev->state & ShiftMask) 1736 if (ev.state & ShiftMask)
1836 i = 1; 1737 i = 1;
1837 else if ((Options & Opt_mouseWheelScrollPage)) 1738 else if (Options & Opt_mouseWheelScrollPage)
1838 i = TermWin.nrow - 1; 1739 i = TermWin.nrow - 1;
1839 else 1740 else
1840 i = 5; 1741 i = 5;
1742
1841# ifdef MOUSE_SLIP_WHEELING 1743# ifdef MOUSE_SLIP_WHEELING
1842 if (ev->state & ControlMask) 1744 if (ev.state & ControlMask)
1843 { 1745 {
1844 mouse_slip_wheel_speed += (v ? -1 : 1); 1746 mouse_slip_wheel_speed += v ? -1 : 1;
1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1846 } 1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1749
1750 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752
1753 slip_wheel_ev.start ();
1754 }
1755 else
1756 {
1847# endif 1757# endif
1848# ifdef JUMP_MOUSE_WHEEL 1758# ifdef JUMP_MOUSE_WHEEL
1849 scr_page (v, i); 1759 scr_page (v, i);
1850 scr_refresh (SMOOTH_REFRESH); 1760 scr_refresh (SMOOTH_REFRESH);
1851 scrollbar_show (1); 1761 scrollbar_show (1);
1852# else 1762# else
1853 while (i--) 1763 while (i--)
1854 { 1764 {
1855 scr_page (v, 1); 1765 scr_page (v, 1);
1856 scr_refresh (SMOOTH_REFRESH); 1766 scr_refresh (SMOOTH_REFRESH);
1857 scrollbar_show (1); 1767 scrollbar_show (1);
1858 } 1768 }
1859# endif 1769# endif
1860 } 1770# ifdef MOUSE_SLIP_WHEELING
1861 break; 1771 }
1862#endif 1772#endif
1773 }
1774 break;
1775#endif
1863 } 1776 }
1777 }
1778#ifdef MENUBAR
1779 else if (isMenuBarWindow (ev.window))
1780 menubar_control (ev);
1781#endif
1782}
1783
1784#ifdef TRANSPARENT
1785#if TINTING
1786/* taken from aterm-0.4.2 */
1787
1788typedef uint32_t RUINT32T;
1789
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{
1792 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i;
1798
1799 Visual* visual = display->visual;
1800
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802
1803 /* for convenience */
1804 mask_r = visual->red_mask;
1805 mask_g = visual->green_mask;
1806 mask_b = visual->blue_mask;
1807
1808 /* boring lookup table pre-initialization */
1809 switch (srcImage->bits_per_pixel) {
1810 case 15:
1811 if ((mask_r != 0x7c00) ||
1812 (mask_g != 0x03e0) ||
1813 (mask_b != 0x001f))
1814 return;
1815 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1816 lookup_r = lookup;
1817 lookup_g = lookup+32;
1818 lookup_b = lookup+32+32;
1819 sh_r = 10;
1820 sh_g = 5;
1821 sh_b = 0;
1822 break;
1823 case 16:
1824 if ((mask_r != 0xf800) ||
1825 (mask_g != 0x07e0) ||
1826 (mask_b != 0x001f))
1827 return;
1828 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1829 lookup_r = lookup;
1830 lookup_g = lookup+32;
1831 lookup_b = lookup+32+64;
1832 sh_r = 11;
1833 sh_g = 5;
1834 sh_b = 0;
1835 break;
1836 case 24:
1837 if ((mask_r != 0xff0000) ||
1838 (mask_g != 0x00ff00) ||
1839 (mask_b != 0x0000ff))
1840 return;
1841 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1842 lookup_r = lookup;
1843 lookup_g = lookup+256;
1844 lookup_b = lookup+256+256;
1845 sh_r = 16;
1846 sh_g = 8;
1847 sh_b = 0;
1848 break;
1849 case 32:
1850 if ((mask_r != 0xff0000) ||
1851 (mask_g != 0x00ff00) ||
1852 (mask_b != 0x0000ff))
1853 return;
1854 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1855 lookup_r = lookup;
1856 lookup_g = lookup+256;
1857 lookup_b = lookup+256+256;
1858 sh_r = 16;
1859 sh_g = 8;
1860 sh_b = 0;
1861 break;
1862 default:
1863 return; /* we do not support this color depth */
1864 } 1864 }
1865
1866 /* prepare limits for color transformation (each channel is handled separately) */
1867 if (shade < 0) {
1868 shade = -shade;
1869 if (shade < 0) shade = 0;
1870 if (shade > 100) shade = 100;
1871
1872 lower_lim_r = 65535-rm;
1873 lower_lim_g = 65535-gm;
1874 lower_lim_b = 65535-bm;
1875
1876 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1877 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1878 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1879
1880 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1881 } else {
1882 if (shade < 0) shade = 0;
1883 if (shade > 100) shade = 100;
1884
1885 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1886
1887 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1888 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1889 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1890 }
1891
1892 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1893 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1894 {
1895 unsigned int tmp;
1896
1897 tmp = lower_lim_r;
1898 lower_lim_r = lower_lim_b;
1899 lower_lim_b = tmp;
1900
1901 tmp = upper_lim_r;
1902 upper_lim_r = upper_lim_b;
1903 upper_lim_b = tmp;
1904 }
1905
1906 /* fill our lookup tables */
1907 for (i = 0; i <= mask_r>>sh_r; i++)
1908 {
1909 RUINT32T tmp;
1910 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1911 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1912 lookup_r[i] = (tmp/65535)<<sh_r;
1913 }
1914 for (i = 0; i <= mask_g>>sh_g; i++)
1915 {
1916 RUINT32T tmp;
1917 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1918 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1919 lookup_g[i] = (tmp/65535)<<sh_g;
1920 }
1921 for (i = 0; i <= mask_b>>sh_b; i++)
1922 {
1923 RUINT32T tmp;
1924 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1925 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1926 lookup_b[i] = (tmp/65535)<<sh_b;
1927 }
1928
1929 /* apply table to input image (replacing colors by newly calculated ones) */
1930 switch (srcImage->bits_per_pixel)
1931 {
1932 case 15:
1933 {
1934 unsigned short *p1, *pf, *p, *pl;
1935 p1 = (unsigned short *) srcImage->data;
1936 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1937 while (p1 < pf)
1938 {
1939 p = p1;
1940 pl = p1 + srcImage->width;
1941 for (; p < pl; p++)
1942 {
1943 *p = lookup_r[(*p & 0x7c00)>>10] |
1944 lookup_g[(*p & 0x03e0)>> 5] |
1945 lookup_b[(*p & 0x001f)];
1946 }
1947 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1865 } 1948 }
1866#ifdef MENUBAR 1949 break;
1867 else if (isMenuBarWindow(ev->window)) 1950 }
1868 menubar_control (ev); 1951 case 16:
1869#endif 1952 {
1870} 1953 unsigned short *p1, *pf, *p, *pl;
1954 p1 = (unsigned short *) srcImage->data;
1955 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1956 while (p1 < pf)
1957 {
1958 p = p1;
1959 pl = p1 + srcImage->width;
1960 for (; p < pl; p++)
1961 {
1962 *p = lookup_r[(*p & 0xf800)>>11] |
1963 lookup_g[(*p & 0x07e0)>> 5] |
1964 lookup_b[(*p & 0x001f)];
1965 }
1966 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1967 }
1968 break;
1969 }
1970 case 24:
1971 {
1972 unsigned char *p1, *pf, *p, *pl;
1973 p1 = (unsigned char *) srcImage->data;
1974 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1975 while (p1 < pf)
1976 {
1977 p = p1;
1978 pl = p1 + srcImage->width * 3;
1979 for (; p < pl; p += 3)
1980 {
1981 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1982 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1983 p[2] = lookup_r[(p[2] & 0x0000ff)];
1984 }
1985 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1986 }
1987 break;
1988 }
1989 case 32:
1990 {
1991 RUINT32T *p1, *pf, *p, *pl;
1992 p1 = (RUINT32T *) srcImage->data;
1993 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1871 1994
1995 while (p1 < pf)
1996 {
1997 p = p1;
1998 pl = p1 + srcImage->width;
1999 for (; p < pl; p++)
2000 {
2001 *p = lookup_r[(*p & 0xff0000)>>16] |
2002 lookup_g[(*p & 0x00ff00)>> 8] |
2003 lookup_b[(*p & 0x0000ff)] |
2004 (*p & ~0xffffff);
2005 }
2006 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2007 }
2008 break;
2009 }
2010 }
1872 2011
1873#ifdef TRANSPARENT 2012 free (lookup);
2013}
2014#endif
2015
1874/* 2016/*
1875 * Check our parents are still who we think they are. 2017 * Check our parents are still who we think they are.
1876 * Do transparency updates if required 2018 * Do transparency updates if required
1877 */ 2019 */
1878int 2020int
1879rxvt_term::check_our_parents () 2021rxvt_term::check_our_parents ()
1880{ 2022{
1881 int i, pchanged, aformat, have_pixmap, rootdepth; 2023 int i, pchanged, aformat, have_pixmap, rootdepth;
1882 unsigned long nitems, bytes_after; 2024 unsigned long nitems, bytes_after;
1883 Atom atype; 2025 Atom atype;
1884 unsigned char *prop = NULL; 2026 unsigned char *prop = NULL;
1885 Window root, oldp, *list; 2027 Window root, oldp, *list;
1886 Pixmap rootpixmap = None; 2028 Pixmap rootpixmap = None;
1887 XWindowAttributes wattr, wrootattr; 2029 XWindowAttributes wattr, wrootattr;
1888 2030
1889 pchanged = 0; 2031 pchanged = 0;
1890 2032
1891 if (!(Options & Opt_transparent)) 2033 if (!(Options & Opt_transparent))
1892 return pchanged; /* Don't try any more */ 2034 return pchanged; /* Don't try any more */
1893 2035
1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
1895 rootdepth = wrootattr.depth; 2037 rootdepth = wrootattr.depth;
1896 2038
1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
1898 if (rootdepth != wattr.depth) { 2041 if (rootdepth != wattr.depth)
2042 {
1899 if (am_transparent) { 2043 if (am_transparent)
2044 {
1900 pchanged = 1; 2045 pchanged = 1;
1901 XSetWindowBackground(Xdisplay, TermWin.vt, 2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1902 PixColors[Color_bg]);
1903 am_transparent = am_pixmap_trans = 0; 2047 am_transparent = am_pixmap_trans = 0;
1904 } 2048 }
2049
1905 return pchanged; /* Don't try any more */ 2050 return pchanged; /* Don't try any more */
1906 } 2051 }
1907 2052
1908/* Get all X ops out of the queue so that our information is up-to-date. */ 2053 /* Get all X ops out of the queue so that our information is up-to-date. */
1909 XSync(Xdisplay, False); 2054 XSync (display->display, False);
1910 2055
2056 /*
2057 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that.
2060 */
2061 i = (xa[XA_XROOTPMAPID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success);
2065
2066 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success);
2071
2072 if (!i || prop == NULL
2073#if TINTING
2074 || !rs[Rs_color + Color_tint]
2075#endif
2076 )
2077 have_pixmap = 0;
2078 else
2079 {
2080 have_pixmap = 1;
2081 rootpixmap = *(Pixmap *)prop;
2082 XFree (prop);
2083 }
2084
2085 if (have_pixmap)
2086 {
2087 /*
2088 * Copy display->root pixmap transparency
2089 */
2090 int sx, sy, nx, ny;
2091 unsigned int nw, nh;
2092 Window cr;
2093 XImage *image;
2094 GC gc;
2095 XGCValues gcvalue;
2096
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2098 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height;
2101 nx = ny = 0;
2102
2103 if (sx < 0)
2104 {
2105 nw += sx;
2106 nx = -sx;
2107 sx = 0;
2108 }
2109
2110 if (sy < 0)
2111 {
2112 nh += sy;
2113 ny = -sy;
2114 sy = 0;
2115 }
2116
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2119 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */
2124 allowedxerror = 0;
2125
2126 if (image == NULL)
2127 {
2128 if (am_transparent && am_pixmap_trans)
2129 {
2130 pchanged = 1;
2131 if (TermWin.pixmap != None)
2132 {
2133 XFreePixmap (display->display, TermWin.pixmap);
2134 TermWin.pixmap = None;
2135 }
2136 }
2137
2138 am_pixmap_trans = 0;
2139 }
2140 else
2141 {
2142 if (TermWin.pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap);
2144
2145#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint))
2147 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2152
2153 ShadeXImage (display, image, shade, rm, gm, bm);
2154 }
2155#endif
2156
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2158 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc);
2163 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]);
2166
2167 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1;
2169
2170 am_transparent = am_pixmap_trans = 1;
2171 }
2172 }
2173
2174 if (!am_pixmap_trans)
2175 {
2176 unsigned int n;
2177 /*
2178 * InheritPixmap transparency
2179 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 {
2183 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n);
2186 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
2189 if (TermWin.parent[i] == display->root)
2190 {
2191 if (oldp != None)
2192 pchanged = 1;
2193
2194 break;
2195 }
2196
2197 if (oldp != TermWin.parent[i])
2198 pchanged = 1;
2199 }
2200
2201 n = 0;
2202
2203 if (pchanged)
2204 {
2205 for (; n < (unsigned int)i; n++)
2206 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break;
2213 }
2214 }
2215 }
2216
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2222 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */
2224 }
2225 else
2226 {
2227#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1);
2231#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2240 am_transparent = 1;
2241 }
2242
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None;
2245 }
2246
2247 // this is experimental
2248 if (scrollBar.win)
2249 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle ();
2253 scrollbar_show (0);
2254 }
2255
2256 return pchanged;
2257}
2258#endif
2259
2260/*}}} */
2261
2262bool
2263rxvt_term::cmd_parse ()
2264{
2265 bool flag = false;
2266 unicode_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here
2268
2269 for (;;)
2270 {
2271 if (ch == NOCHAR)
2272 {
2273 seq_begin = cmdbuf_ptr;
2274 ch = next_char ();
2275 }
2276
2277 if (ch == NOCHAR) // TODO: improve
2278 break;
2279
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 {
2282 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false;
2285 int nlines = 0;
2286 unicode_t *str = buf;
2287
2288 *str++ = ch;
2289
2290 for (;;)
2291 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break;
2297
2298 *str++ = ch;
2299
2300 if (ch == C0_LF)
2301 {
2302 nlines++;
2303 refresh_count++;
2304
2305 if (! (Options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 {
2308 refreshnow = true;
2309 ch = NOCHAR;
2310 break;
2311 }
2312
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1)
2315 {
2316 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0;
2318 str = buf;
2319 }
2320 }
2321
2322 if (str >= buf + UBUFSIZ)
2323 {
2324 ch = NOCHAR;
2325 break;
2326 }
2327 }
2328
2329 scr_add_lines (buf, nlines, str - buf);
2330
2331 /*
2332 * If there have been a lot of new lines, then update the screen
2333 * What the heck I'll cheat and only refresh less than every page-full.
2334 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling.
2336 */
2337 if (refreshnow)
2338 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++;
2341 else
2342 {
2343 flag = true;
2344 scr_refresh (refresh_type);
2345 }
2346 }
2347
2348 }
2349 else
2350 {
2351 try
2352 {
2353 process_nonprinting (ch);
2354 }
2355 catch (const class out_of_input &o)
2356 {
2357 // we ran out of input, retry later
2358 cmdbuf_ptr = seq_begin;
2359 break;
2360 }
2361
2362 ch = NOCHAR;
2363 }
2364 }
2365
2366 return flag;
2367}
2368
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376}
2377
2378// read the next character
2379unicode_t
2380rxvt_term::next_char ()
2381{
2382 while (cmdbuf_ptr < cmdbuf_endp)
2383 {
2384 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++;
2387
2388 wchar_t wc;
2389 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390
2391 if (len == (size_t)-2)
2392 {
2393 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp;
2395 break;
2396 }
2397
2398 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400
2401 // assume wchar == unicode
2402 cmdbuf_ptr += len;
2403 return wc;
2404 }
2405
2406 return NOCHAR;
2407}
2408
2409/* rxvt_cmd_getc () - Return next input character */
1911/* 2410/*
1912 * Make the frame window set by the window manager have 2411 * Return the next input character after first passing any keyboard input
1913 * the root background. Some window managers put multiple nested frame 2412 * to the command.
1914 * windows for each client, so we have to take care about that.
1915 */ 2413 */
1916 i = (xa[XA_XROOTPMAPID] != 0 2414unicode_t
1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 2415rxvt_term::cmd_getc ()
1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2416{
1919 &nitems, &bytes_after, &prop) == Success)); 2417 unicode_t c = next_char ();
1920 if (!i || prop == NULL)
1921 have_pixmap = 0;
1922 else {
1923 have_pixmap = 1;
1924 rootpixmap = *((Pixmap *)prop);
1925 XFree(prop);
1926 }
1927 if (have_pixmap) {
1928/*
1929 * Copy Xroot pixmap transparency
1930 */
1931 int sx, sy, nx, ny;
1932 unsigned int nw, nh;
1933 Window cr;
1934 XImage *image;
1935 GC gc;
1936 XGCValues gcvalue;
1937 2418
1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2419 if (c == NOCHAR)
1939 0, 0, &sx, &sy, &cr); 2420 throw out_of_input;
1940 nw = (unsigned int)szHint.width;
1941 nh = (unsigned int)szHint.height;
1942 nx = ny = 0;
1943 if (sx < 0) {
1944 nw += sx;
1945 nx = -sx;
1946 sx = 0;
1947 }
1948 if (sy < 0) {
1949 nh += sy;
1950 ny = -sy;
1951 sy = 0;
1952 }
1953 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1954 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1955 allowedxerror = -1;
1956 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1957 ZPixmap);
1958 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1959 /* XXX: may need a delay here? */
1960 allowedxerror = 0;
1961 if (image == NULL) {
1962 if (am_transparent && am_pixmap_trans) {
1963 pchanged = 1;
1964 if (TermWin.pixmap != None) {
1965 XFreePixmap(Xdisplay, TermWin.pixmap);
1966 TermWin.pixmap = None;
1967 }
1968 }
1969 am_pixmap_trans = 0;
1970 } else {
1971 if (TermWin.pixmap != None)
1972 XFreePixmap(Xdisplay, TermWin.pixmap);
1973 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt,
1974 (unsigned int)szHint.width,
1975 (unsigned int)szHint.height,
1976 (unsigned int)image->depth);
1977 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue);
1978 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0,
1979 nx, ny, (unsigned int)image->width,
1980 (unsigned int)image->height);
1981 XFreeGC(Xdisplay, gc);
1982 XDestroyImage(image);
1983 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
1984 TermWin.pixmap);
1985 if (!am_transparent || !am_pixmap_trans)
1986 pchanged = 1;
1987 am_transparent = am_pixmap_trans = 1;
1988 }
1989 }
1990 if (!am_pixmap_trans) {
1991 unsigned int n;
1992/*
1993 * InheritPixmap transparency
1994 */
1995 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
1996 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
1997 i++) {
1998 oldp = TermWin.parent[i];
1999 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root,
2000 &TermWin.parent[i], &list, &n);
2001 XFree(list);
2002 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2003 if (TermWin.parent[i] == Xroot) {
2004 if (oldp != None)
2005 pchanged = 1;
2006 break;
2007 }
2008 if (oldp != TermWin.parent[i])
2009 pchanged = 1;
2010 }
2011 n = 0;
2012 if (pchanged) {
2013 for (; n < (unsigned int)i; n++) {
2014 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr);
2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2017 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2018 break;
2019 }
2020 }
2021 }
2022 if (n > (int)(sizeof(TermWin.parent)
2023 / sizeof(TermWin.parent[0]))) {
2024 D_X((stderr, "InheritPixmap Turning off"));
2025 XSetWindowBackground(Xdisplay, TermWin.parent[0],
2026 PixColors[Color_fg]);
2027 XSetWindowBackground(Xdisplay, TermWin.vt,
2028 PixColors[Color_bg]);
2029 am_transparent = 0;
2030 /* XXX: also turn off Opt_transparent? */
2031 } else {
2032 /* wait (an arbitrary period) for the WM to do its thing
2033 * needed for fvwm2.2.2 (and before?) */
2034# ifdef HAVE_NANOSLEEP
2035 struct timespec rqt;
2036 2421
2037 rqt.tv_sec = 1; 2422 return c;
2038 rqt.tv_nsec = 0;
2039 nanosleep(&rqt, NULL);
2040# else
2041 sleep(1);
2042# endif
2043 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2044 for (n = 0; n < (unsigned int)i; n++)
2045 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n],
2046 ParentRelative);
2047 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
2048 ParentRelative);
2049 am_transparent = 1;
2050 }
2051 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2052 TermWin.parent[i] = None;
2053 }
2054 return pchanged;
2055} 2423}
2056#endif
2057 2424
2058/*}}} */ 2425unicode_t
2426rxvt_term::cmd_get8 ()
2427{
2428 unicode_t c = next_octet ();
2429
2430 if (c == NOCHAR)
2431 throw out_of_input;
2432
2433 return c;
2434}
2059 2435
2060/*{{{ print pipe */ 2436/*{{{ print pipe */
2061/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2062#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2063FILE * 2439FILE *
2064rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2065{ 2441{
2066 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe], "w");
2067 2443
2068 if (stream == NULL) 2444 if (stream == NULL)
2069 rxvt_print_error("can't open printer pipe"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2446
2070 return stream; 2447 return stream;
2071} 2448}
2072 2449
2073int 2450int
2074rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2075{ 2452{
2076 fflush (stream); 2453 fflush (stream);
2077/* pclose() reported not to work on SunOS 4.1.3 */
2078# if defined (__sun__) /* TODO: RESOLVE THIS */
2079/* pclose works provided SIGCHLD handler uses waitpid */
2080 return pclose (stream); /* return fclose (stream); */
2081# else
2082 return pclose (stream); 2454 return pclose (stream);
2083# endif
2084} 2455}
2085 2456
2086/* 2457/*
2087 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2088 */ 2459 */
2089void 2460void
2090rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2091{ 2462{
2092 int done; 2463 int done;
2093 FILE *fd; 2464 FILE *fd;
2094 2465
2095 if ((fd = popen_printer ()) == NULL) 2466 if ((fd = popen_printer ()) == NULL)
2096 return; 2467 return;
2097 2468
2098/* 2469 /*
2099 * Send all input to the printer until either ESC[4i or ESC[?4i 2470 * Send all input to the printer until either ESC[4i or ESC[?4i
2100 * is received. 2471 * is received.
2101 */ 2472 */
2102 for (done = 0; !done;) { 2473 for (done = 0; !done;)
2474 {
2103 unsigned char buf[8]; 2475 unsigned char buf[8];
2104 unsigned char ch; 2476 unicode_t ch;
2105 unsigned int i, len; 2477 unsigned int i, len;
2106 2478
2107 if ((ch = cmd_getc ()) != C0_ESC) { 2479 if ((ch = cmd_getc ()) != C0_ESC)
2480 {
2108 if (putc(ch, fd) == EOF) 2481 if (putc (ch, fd) == EOF)
2109 break; /* done = 1 */ 2482 break; /* done = 1 */
2110 } else { 2483 }
2484 else
2485 {
2111 len = 0; 2486 len = 0;
2112 buf[len++] = ch; 2487 buf[len++] = ch;
2113 2488
2114 if ((buf[len++] = cmd_getc ()) == '[') { 2489 if ((buf[len++] = cmd_getc ()) == '[')
2490 {
2115 if ((ch = cmd_getc ()) == '?') { 2491 if ((ch = cmd_getc ()) == '?')
2116 buf[len++] = '?'; 2492 {
2117 ch = cmd_getc (); 2493 buf[len++] = '?';
2118 } 2494 ch = cmd_getc ();
2495 }
2119 if ((buf[len++] = ch) == '4') { 2496 if ((buf[len++] = ch) == '4')
2497 {
2120 if ((buf[len++] = cmd_getc ()) == 'i') 2498 if ((buf[len++] = cmd_getc ()) == 'i')
2121 break; /* done = 1 */ 2499 break; /* done = 1 */
2122 } 2500 }
2501 }
2502
2503 for (i = 0; i < len; i++)
2504 if (putc (buf[i], fd) == EOF)
2505 {
2506 done = 1;
2507 break;
2508 }
2509 }
2123 } 2510 }
2124 for (i = 0; i < len; i++) 2511
2125 if (putc(buf[i], fd) == EOF) {
2126 done = 1;
2127 break;
2128 }
2129 }
2130 }
2131 pclose_printer (fd); 2512 pclose_printer (fd);
2132} 2513}
2133#endif /* PRINTPIPE */ 2514#endif /* PRINTPIPE */
2134/*}}} */ 2515/*}}} */
2135 2516
2136/* *INDENT-OFF* */ 2517/* *INDENT-OFF* */
2137enum { 2518enum {
2138 C1_40 = 0x40, 2519 C1_40 = 0x40,
2139 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2140 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2141 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2522 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2142 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2143}; 2524};
2144/* *INDENT-ON* */ 2525/* *INDENT-ON* */
2145 2526
2146/*{{{ process non-printing single characters */ 2527/*{{{ process non-printing single characters */
2147void 2528void
2148rxvt_term::process_nonprinting (unsigned char ch) 2529rxvt_term::process_nonprinting (unicode_t ch)
2149{ 2530{
2150 switch (ch) { 2531 switch (ch)
2532 {
2533 case C0_ESC:
2534 process_escape_seq ();
2535 break;
2151 case C0_ENQ: /* terminal Status */ 2536 case C0_ENQ: /* terminal Status */
2152 if (rs[Rs_answerbackstring]) 2537 if (rs[Rs_answerbackstring])
2153 tt_write(
2154 (const unsigned char *)rs[Rs_answerbackstring], 2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2155 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2156 else 2540 else
2157 tt_write((unsigned char *)VT100_ANS, 2541 tt_write ((unsigned char *)VT100_ANS,
2158 (unsigned int)STRLEN(VT100_ANS)); 2542 (unsigned int)STRLEN (VT100_ANS));
2159 break; 2543 break;
2160 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2161 scr_bell (); 2545 scr_bell ();
2162 break; 2546 break;
2163 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
2164 scr_backspace (); 2548 scr_backspace ();
2165 break; 2549 break;
2166 case C0_HT: /* tab */ 2550 case C0_HT: /* tab */
2167 scr_tab (1); 2551 scr_tab (1);
2168 break; 2552 break;
2169 case C0_CR: /* carriage return */ 2553 case C0_CR: /* carriage return */
2170 scr_gotorc (0, 0, R_RELATIVE); 2554 scr_gotorc (0, 0, R_RELATIVE);
2171 break; 2555 break;
2172 case C0_VT: /* vertical tab, form feed */ 2556 case C0_VT: /* vertical tab, form feed */
2173 case C0_FF: 2557 case C0_FF:
2174 case C0_LF: /* line feed */ 2558 case C0_LF: /* line feed */
2175 scr_index (UP); 2559 scr_index (UP);
2176 break; 2560 break;
2177 case C0_SO: /* shift out - acs */ 2561 case C0_SO: /* shift out - acs */
2178 scr_charset_choose (1); 2562 scr_charset_choose (1);
2179 break; 2563 break;
2180 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2181 scr_charset_choose (0); 2565 scr_charset_choose (0);
2182 break; 2566 break;
2567
2568#ifdef EIGHT_BIT_CONTROLS
2569 // 8-bit controls
2570 case 0x90: /* DCS */
2571 process_dcs_seq ();
2572 break;
2573 case 0x9b: /* CSI */
2574 process_csi_seq ();
2575 break;
2576 case 0x9d: /* CSI */
2577 process_osc_seq ();
2578 break;
2579#endif
2183 } 2580 }
2184} 2581}
2185/*}}} */ 2582/*}}} */
2186 2583
2187 2584
2188/*{{{ process VT52 escape sequences */ 2585/*{{{ process VT52 escape sequences */
2189void 2586void
2190rxvt_term::process_escape_vt52 (unsigned char ch) 2587rxvt_term::process_escape_vt52 (unicode_t ch)
2191{ 2588{
2192 int row, col; 2589 int row, col;
2590
2591 switch (ch)
2193 2592 {
2194 switch (ch) {
2195 case 'A': /* cursor up */ 2593 case 'A': /* cursor up */
2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2594 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2197 break; 2595 break;
2198 case 'B': /* cursor down */ 2596 case 'B': /* cursor down */
2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2597 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2200 break; 2598 break;
2201 case 'C': /* cursor right */ 2599 case 'C': /* cursor right */
2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2600 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2203 break; 2601 break;
2204 case 'D': /* cursor left */ 2602 case 'D': /* cursor left */
2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2603 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2206 break; 2604 break;
2207 case 'H': /* cursor home */ 2605 case 'H': /* cursor home */
2208 scr_gotorc (0, 0, 0); 2606 scr_gotorc (0, 0, 0);
2209 break; 2607 break;
2210 case 'I': /* cursor up and scroll down if needed */ 2608 case 'I': /* cursor up and scroll down if needed */
2211 scr_index (DN); 2609 scr_index (DN);
2212 break; 2610 break;
2213 case 'J': /* erase to end of screen */ 2611 case 'J': /* erase to end of screen */
2214 scr_erase_screen (0); 2612 scr_erase_screen (0);
2215 break; 2613 break;
2216 case 'K': /* erase to end of line */ 2614 case 'K': /* erase to end of line */
2217 scr_erase_line (0); 2615 scr_erase_line (0);
2218 break; 2616 break;
2219 case 'Y': /* move to specified row and col */ 2617 case 'Y': /* move to specified row and col */
2220 /* full command is 'ESC Y row col' where row and col 2618 /* full command is 'ESC Y row col' where row and col
2221 * are encoded by adding 32 and sending the ascii 2619 * are encoded by adding 32 and sending the ascii
2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2620 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2223 * etc. */ 2621 * etc. */
2224 row = cmd_getc () - ' '; 2622 row = cmd_getc () - ' ';
2225 col = cmd_getc () - ' '; 2623 col = cmd_getc () - ' ';
2226 scr_gotorc (row, col, 0); 2624 scr_gotorc (row, col, 0);
2227 break; 2625 break;
2228 case 'Z': /* identify the terminal type */ 2626 case 'Z': /* identify the terminal type */
2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2627 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2230 break; 2628 break;
2231 case '<': /* turn off VT52 mode */ 2629 case '<': /* turn off VT52 mode */
2232 PrivMode(0, PrivMode_vt52); 2630 PrivMode (0, PrivMode_vt52);
2233 break; 2631 break;
2234 case 'F': /* use special graphics character set */ 2632 case 'F': /* use special graphics character set */
2235 case 'G': /* use regular character set */ 2633 case 'G': /* use regular character set */
2236 /* unimplemented */ 2634 /* unimplemented */
2237 break; 2635 break;
2238 case '=': /* use alternate keypad mode */ 2636 case '=': /* use alternate keypad mode */
2239 case '>': /* use regular keypad mode */ 2637 case '>': /* use regular keypad mode */
2240 /* unimplemented */ 2638 /* unimplemented */
2241 break; 2639 break;
2242 } 2640 }
2243} 2641}
2244/*}}} */ 2642/*}}} */
2245 2643
2246 2644
2247/*{{{ process escape sequences */ 2645/*{{{ process escape sequences */
2248void 2646void
2249rxvt_term::process_escape_seq () 2647rxvt_term::process_escape_seq ()
2250{ 2648{
2251 unsigned char ch = cmd_getc (); 2649 unicode_t ch = cmd_getc ();
2252 2650
2253 if (PrivateModes & PrivMode_vt52) { 2651 if (PrivateModes & PrivMode_vt52)
2254 process_escape_vt52 (ch);
2255 return;
2256 }
2257 2652 {
2653 process_escape_vt52 (ch);
2654 return;
2655 }
2656
2258 switch (ch) { 2657 switch (ch)
2658 {
2259 /* case 1: do_tek_mode (); break; */ 2659 /* case 1: do_tek_mode (); break; */
2260 case '#': 2660 case '#':
2261 if (cmd_getc () == '8') 2661 if (cmd_getc () == '8')
2262 scr_E (); 2662 scr_E ();
2263 break; 2663 break;
2264 case '(': 2664 case '(':
2265 scr_charset_set (0, (unsigned int)cmd_getc ()); 2665 scr_charset_set (0, (unsigned int)cmd_getc ());
2266 break; 2666 break;
2267 case ')': 2667 case ')':
2268 scr_charset_set (1, (unsigned int)cmd_getc ()); 2668 scr_charset_set (1, (unsigned int)cmd_getc ());
2269 break; 2669 break;
2270 case '*': 2670 case '*':
2271 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
2272 break; 2672 break;
2273 case '+': 2673 case '+':
2274 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
2275 break; 2675 break;
2276#ifdef MULTICHAR_SET
2277 case '$':
2278 scr_charset_set (-2, (unsigned int)cmd_getc ());
2279 break;
2280#endif
2281#ifndef NO_FRILLS 2676#ifndef NO_FRILLS
2282 case '6': 2677 case '6':
2283 scr_backindex (); 2678 scr_backindex ();
2284 break; 2679 break;
2285#endif 2680#endif
2286 case '7': 2681 case '7':
2287 scr_cursor (SAVE); 2682 scr_cursor (SAVE);
2288 break; 2683 break;
2289 case '8': 2684 case '8':
2290 scr_cursor (RESTORE); 2685 scr_cursor (RESTORE);
2291 break; 2686 break;
2292#ifndef NO_FRILLS 2687#ifndef NO_FRILLS
2293 case '9': 2688 case '9':
2294 scr_forwardindex (); 2689 scr_forwardindex ();
2295 break; 2690 break;
2296#endif 2691#endif
2297 case '=': 2692 case '=':
2298 case '>': 2693 case '>':
2299 PrivMode((ch == '='), PrivMode_aplKP); 2694 PrivMode ((ch == '='), PrivMode_aplKP);
2300 break; 2695 break;
2301 2696
2302 case C1_40: 2697 case C1_40:
2303 cmd_getc (); 2698 cmd_getc ();
2304 break; 2699 break;
2305 case C1_44: 2700 case C1_44:
2306 scr_index (UP); 2701 scr_index (UP);
2307 break; 2702 break;
2308 2703
2309 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2310 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2311 { 2706 {
2312 uint32_t nlcr[] = { '\n', '\r' }; 2707 unicode_t nlcr[] = { C0_LF, C0_CR };
2313 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, 1, 2);
2314 } 2709 }
2315 break; 2710 break;
2316 2711
2317 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
2318 case C1_ESA: /* ESC G */ 2713 case C1_ESA: /* ESC G */
2319 process_graphics (); 2714 process_graphics ();
2320 break; 2715 break;
2321 2716
2322 /* 8.3.63: CHARACTER TABULATION SET */ 2717 /* 8.3.63: CHARACTER TABULATION SET */
2323 case C1_HTS: /* ESC H */ 2718 case C1_HTS: /* ESC H */
2324 scr_set_tab (1); 2719 scr_set_tab (1);
2325 break; 2720 break;
2326 2721
2327 /* 8.3.105: REVERSE LINE FEED */ 2722 /* 8.3.105: REVERSE LINE FEED */
2328 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2329 scr_index (DN); 2724 scr_index (DN);
2330 break; 2725 break;
2331 2726
2332 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2333 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2334 2729
2335 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2336 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2337 2732
2338 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2339 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2340 process_dcs_seq (); 2735 process_dcs_seq ();
2341 break; 2736 break;
2342 2737
2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2344 case C1_SCI: /* ESC Z */ 2739 case C1_SCI: /* ESC Z */
2345 tt_write((const unsigned char *)ESCZ_ANSWER, 2740 tt_write ((const unsigned char *)ESCZ_ANSWER,
2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2347 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2348 2743
2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2350 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2351 process_csi_seq (); 2746 process_csi_seq ();
2352 break; 2747 break;
2353 2748
2354 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND */
2355 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
2356 process_osc_seq (); 2751 process_osc_seq ();
2357 break; 2752 break;
2358 2753
2359 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE */
2360 case 'c': 2755 case 'c':
2756 mbstate.reset ();
2361 scr_poweron (); 2757 scr_poweron ();
2362 scrollbar_show (1); 2758 scrollbar_show (1);
2363 break; 2759 break;
2364 2760
2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2366 case 'n': 2762 case 'n':
2367 scr_charset_choose (2); 2763 scr_charset_choose (2);
2368 break; 2764 break;
2369 2765
2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2766 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2371 case 'o': 2767 case 'o':
2372 scr_charset_choose (3); 2768 scr_charset_choose (3);
2373 break; 2769 break;
2374 } 2770 }
2375} 2771}
2376/*}}} */ 2772/*}}} */
2377 2773
2378/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2379/* *INDENT-OFF* */ 2775/* *INDENT-OFF* */
2380enum { 2776enum {
2381 CSI_ICH = 0x40, 2777 CSI_ICH = 0x40,
2382 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2778 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2383 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2779 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2384 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2780 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2385 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2781 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2386 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2782 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2387 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2783 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2388 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2784 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2389 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2785 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2390}; 2786};
2391 2787
2392#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2788#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2393 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2789 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2394 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2790 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2395#define get_byte_array_bit(array, bit) \ 2791#define get_byte_array_bit(array, bit) \
2396 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2792 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2397 2793
2398const unsigned char csi_defaults[] = { 2794const unsigned char csi_defaults[] =
2795 {
2399 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2796 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2400 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2797 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2401 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2798 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2402 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2799 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2403 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2800 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2404 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2801 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2405 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2406 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2803 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2407}; 2804 };
2408/* *INDENT-ON* */ 2805/* *INDENT-ON* */
2409 2806
2410void 2807void
2411rxvt_term::process_csi_seq () 2808rxvt_term::process_csi_seq ()
2412{ 2809{
2413 unsigned char ch, priv, i; 2810 unicode_t ch, priv, i;
2414 unsigned int nargs, p; 2811 unsigned int nargs, p;
2415 int n, ndef; 2812 int n, ndef;
2416 int arg[ESC_ARGS]; 2813 int arg[ESC_ARGS];
2417 2814
2418 for (nargs = ESC_ARGS; nargs > 0;) 2815 for (nargs = ESC_ARGS; nargs > 0;)
2419 arg[--nargs] = 0; 2816 arg[--nargs] = 0;
2420 2817
2421 priv = 0; 2818 priv = 0;
2819 ch = cmd_getc ();
2820 if (ch >= '<' && ch <= '?')
2821 { /* '<' '=' '>' '?' */
2822 priv = ch;
2422 ch = cmd_getc (); 2823 ch = cmd_getc ();
2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2424 priv = ch;
2425 ch = cmd_getc ();
2426 } 2824 }
2825
2427/* read any numerical arguments */ 2826 /* read any numerical arguments */
2428 for (n = -1; ch < CSI_ICH; ) { 2827 for (n = -1; ch < CSI_ICH; )
2828 {
2429 if (isdigit(ch)) { 2829 if (isdigit (ch))
2830 {
2430 if (n < 0) 2831 if (n < 0)
2431 n = ch - '0'; 2832 n = ch - '0';
2432 else 2833 else
2433 n = n * 10 + ch - '0'; 2834 n = n * 10 + ch - '0';
2835 }
2434 } else if (ch == ';') { 2836 else if (ch == ';')
2837 {
2435 if (nargs < ESC_ARGS) 2838 if (nargs < ESC_ARGS)
2436 arg[nargs++] = n; 2839 arg[nargs++] = n;
2437 n = -1; 2840 n = -1;
2438 } else if (ch == '\b') { 2841 }
2439 scr_backspace (); 2842 else if (IS_CONTROL (ch))
2440 } else if (ch == C0_ESC) { 2843 process_nonprinting (ch);
2441 process_escape_seq (); 2844
2845 ch = cmd_getc ();
2846 }
2847
2848 if (ch > CSI_7F)
2442 return; 2849 return;
2443 } else if (ch < ' ') {
2444 process_nonprinting (ch);
2445 }
2446 ch = cmd_getc ();
2447 }
2448 2850
2449 if (ch > CSI_7F)
2450 return;
2451
2452 if (nargs < ESC_ARGS) 2851 if (nargs < ESC_ARGS)
2453 arg[nargs++] = n; 2852 arg[nargs++] = n;
2454 2853
2455 i = ch - CSI_ICH; 2854 i = ch - CSI_ICH;
2456 ndef = get_byte_array_bit(csi_defaults, i); 2855 ndef = get_byte_array_bit (csi_defaults, i);
2457 for (p = 0; p < nargs; p++) 2856 for (p = 0; p < nargs; p++)
2458 if (arg[p] == -1) 2857 if (arg[p] == -1)
2459 arg[p] = ndef; 2858 arg[p] = ndef;
2460 2859
2461#ifdef DEBUG_CMD 2860#ifdef DEBUG_CMD
2462 fprintf(stderr, "CSI "); 2861 fprintf (stderr, "CSI ");
2463 for (p = 0; p < nargs; p++) 2862 for (p = 0; p < nargs; p++)
2464 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2863 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2465 fprintf(stderr, "%c\n", ch); 2864 fprintf (stderr, "%c\n", ch);
2466#endif 2865#endif
2467 2866
2468/* 2867 /*
2469 * private mode handling 2868 * private mode handling
2470 */ 2869 */
2471 if (priv) { 2870 if (priv)
2472 switch (priv) { 2871 {
2473 case '>': 2872 switch (priv)
2873 {
2874 case '>':
2474 if (ch == CSI_DA) /* secondary device attributes */ 2875 if (ch == CSI_DA) /* secondary device attributes */
2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2476 break; 2877 break;
2477 case '?': 2878 case '?':
2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2479 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2480 break; 2881 break;
2481 } 2882 }
2482 return; 2883 return;
2483 } 2884 }
2484 2885
2485 switch (ch) { 2886 switch (ch)
2486/* 2887 {
2888 /*
2487 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2889 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2488 */ 2890 */
2489#ifdef PRINTPIPE 2891#ifdef PRINTPIPE
2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2892 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2491 switch (arg[0]) { 2893 switch (arg[0])
2894 {
2492 case 0: /* initiate transfer to primary aux device */ 2895 case 0: /* initiate transfer to primary aux device */
2493 scr_printscreen (0); 2896 scr_printscreen (0);
2494 break; 2897 break;
2495 case 5: /* start relay to primary aux device */ 2898 case 5: /* start relay to primary aux device */
2496 process_print_pipe (); 2899 process_print_pipe ();
2900 break;
2901 }
2497 break; 2902 break;
2498 }
2499 break;
2500#endif 2903#endif
2501 2904
2502 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2905 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2906 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2504 arg[0] = -arg[0]; 2907 arg[0] = -arg[0];
2505 /* FALLTHROUGH */ 2908 /* FALLTHROUGH */
2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2909 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2910 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2508 scr_gotorc (arg[0], 0, RELATIVE); 2911 scr_gotorc (arg[0], 0, RELATIVE);
2509 break; 2912 break;
2510 2913
2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2914 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2915 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2513#ifdef ISO6429 2916#ifdef ISO6429
2514 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2515#else /* emulate common DEC VTs */ 2918#else /* emulate common DEC VTs */
2516 arg[0] = arg[0] ? -arg[0] : -1; 2919 arg[0] = arg[0] ? -arg[0] : -1;
2517#endif 2920#endif
2518 /* FALLTHROUGH */ 2921 /* FALLTHROUGH */
2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2922 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2923 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2521#ifdef ISO6429 2924#ifdef ISO6429
2522 scr_gotorc (0, arg[0], RELATIVE); 2925 scr_gotorc (0, arg[0], RELATIVE);
2523#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2927 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2525#endif 2928#endif
2526 break; 2929 break;
2527 2930
2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2931 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2529 arg[0] = -arg[0]; 2932 arg[0] = -arg[0];
2530 /* FALLTHROUGH */ 2933 /* FALLTHROUGH */
2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2934 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2532 scr_gotorc (arg[0], 0, R_RELATIVE); 2935 scr_gotorc (arg[0], 0, R_RELATIVE);
2533 break; 2936 break;
2534 2937
2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2938 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2939 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2940 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2538 break; 2941 break;
2539 2942
2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2943 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2944 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2542 break; 2945 break;
2543 2946
2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2947 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2545 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2948 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2546 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2949 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2547 break; 2950 break;
2548 2951
2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2952 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2550 arg[0] = -arg[0]; 2953 arg[0] = -arg[0];
2551 /* FALLTHROUGH */ 2954 /* FALLTHROUGH */
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2955 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 scr_tab (arg[0]); 2956 scr_tab (arg[0]);
2554 break; 2957 break;
2555 2958
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2959 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 scr_erase_screen (arg[0]); 2960 scr_erase_screen (arg[0]);
2558 break; 2961 break;
2559 2962
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2963 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 scr_erase_line (arg[0]); 2964 scr_erase_line (arg[0]);
2562 break; 2965 break;
2563 2966
2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2967 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2565 scr_insdel_chars (arg[0], INSERT); 2968 scr_insdel_chars (arg[0], INSERT);
2566 break; 2969 break;
2567 2970
2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2971 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2569 scr_insdel_lines (arg[0], INSERT); 2972 scr_insdel_lines (arg[0], INSERT);
2570 break; 2973 break;
2571 2974
2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2975 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2573 scr_insdel_lines (arg[0], DELETE); 2976 scr_insdel_lines (arg[0], DELETE);
2574 break; 2977 break;
2575 2978
2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2979 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2577 scr_insdel_chars (arg[0], ERASE); 2980 scr_insdel_chars (arg[0], ERASE);
2578 break; 2981 break;
2579 2982
2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2983 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2581 scr_insdel_chars (arg[0], DELETE); 2984 scr_insdel_chars (arg[0], DELETE);
2582 break; 2985 break;
2583 2986
2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2585 arg[0] = -arg[0]; 2988 arg[0] = -arg[0];
2586 /* FALLTHROUGH */ 2989 /* FALLTHROUGH */
2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2589 break; 2992 break;
2590 2993
2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2592 tt_write((const unsigned char *)VT100_ANS, 2995 tt_write ((const unsigned char *)VT100_ANS,
2593 (unsigned int)(sizeof(VT100_ANS) - 1)); 2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2594 break; 2997 break;
2595 2998
2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2597 process_sgr_mode (nargs, arg); 3000 process_sgr_mode (nargs, arg);
2598 break; 3001 break;
2599 3002
2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3003 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2601 switch (arg[0]) { 3004 switch (arg[0])
3005 {
2602 case 5: /* DSR requested */ 3006 case 5: /* DSR requested */
2603 tt_printf("\033[0n"); 3007 tt_printf ("\033[0n");
2604 break; 3008 break;
2605 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2606 scr_report_position (); 3010 scr_report_position ();
2607 break; 3011 break;
2608#if defined (ENABLE_DISPLAY_ANSWER)
2609 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure)
2610 tt_printf("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2611 break; 3015 break;
2612#endif
2613 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break;
3019 }
2615 break; 3020 break;
2616 }
2617 break;
2618 3021
2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2620 switch (arg[0]) { 3023 switch (arg[0])
3024 {
2621 case 0: /* char tab stop cleared at active position */ 3025 case 0: /* char tab stop cleared at active position */
2622 scr_set_tab (0); 3026 scr_set_tab (0);
2623 break; 3027 break;
2624 /* case 1: */ /* line tab stop cleared in active line */ 3028 /* case 1: */ /* line tab stop cleared in active line */
2625 /* case 2: */ /* char tab stops cleared in active line */ 3029 /* case 2: */ /* char tab stops cleared in active line */
2626 case 3: /* all char tab stops are cleared */ 3030 case 3: /* all char tab stops are cleared */
2627 /* case 4: */ /* all line tab stops are cleared */ 3031 /* case 4: */ /* all line tab stops are cleared */
2628 case 5: /* all tab stops are cleared */ 3032 case 5: /* all tab stops are cleared */
2629 scr_set_tab (-1); 3033 scr_set_tab (-1);
3034 break;
3035 }
2630 break; 3036 break;
2631 }
2632 break;
2633 3037
2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 3038 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2635 switch (arg[0]) { 3039 switch (arg[0])
3040 {
2636 case 0: /* char tab stop set at active position */ 3041 case 0: /* char tab stop set at active position */
2637 scr_set_tab (1); 3042 scr_set_tab (1);
2638 break; /* = ESC H */ 3043 break; /* = ESC H */
2639 /* case 1: */ /* line tab stop set at active line */ 3044 /* case 1: */ /* line tab stop set at active line */
2640 case 2: /* char tab stop cleared at active position */ 3045 case 2: /* char tab stop cleared at active position */
2641 scr_set_tab (0); 3046 scr_set_tab (0);
2642 break; /* = ESC [ 0 g */ 3047 break; /* = ESC [ 0 g */
2643 /* case 3: */ /* line tab stop cleared at active line */ 3048 /* case 3: */ /* line tab stop cleared at active line */
2644 /* case 4: */ /* char tab stops cleared at active line */ 3049 /* case 4: */ /* char tab stops cleared at active line */
2645 case 5: /* all char tab stops are cleared */ 3050 case 5: /* all char tab stops are cleared */
2646 scr_set_tab (-1); 3051 scr_set_tab (-1);
2647 break; /* = ESC [ 3 g */ 3052 break; /* = ESC [ 3 g */
2648 /* case 6: */ /* all line tab stops are cleared */ 3053 /* case 6: */ /* all line tab stops are cleared */
2649 } 3054 }
2650 break; 3055 break;
2651 3056
2652 case CSI_RM: /* 8.3.107: RESET MODE */ 3057 case CSI_RM: /* 8.3.107: RESET MODE */
2653 if (arg[0] == 4) 3058 if (arg[0] == 4)
2654 scr_insert_mode (0); 3059 scr_insert_mode (0);
2655 break; 3060 break;
2656 3061
2657 case CSI_SM: /* 8.3.126: SET MODE */ 3062 case CSI_SM: /* 8.3.126: SET MODE */
2658 if (arg[0] == 4) 3063 if (arg[0] == 4)
2659 scr_insert_mode (1); 3064 scr_insert_mode (1);
2660 break; 3065 break;
2661 3066
2662/* 3067 /*
2663 * PRIVATE USE beyond this point. All CSI_7? sequences here 3068 * PRIVATE USE beyond this point. All CSI_7? sequences here
2664 */ 3069 */
2665 case CSI_72: /* DECSTBM: set top and bottom margins */ 3070 case CSI_72: /* DECSTBM: set top and bottom margins */
2666 if (nargs == 1) 3071 if (nargs == 1)
2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 3072 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2668 else if (nargs == 0 || arg[0] >= arg[1]) 3073 else if (nargs == 0 || arg[0] >= arg[1])
2669 scr_scroll_region (0, MAX_ROWS - 1); 3074 scr_scroll_region (0, MAX_ROWS - 1);
2670 else 3075 else
2671 scr_scroll_region (arg[0] - 1, arg[1] - 1); 3076 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2672 break; 3077 break;
2673 3078
2674 case CSI_73: 3079 case CSI_73:
2675 scr_cursor (SAVE); 3080 scr_cursor (SAVE);
2676 break; 3081 break;
2677 case CSI_75: 3082 case CSI_75:
2678 scr_cursor (RESTORE); 3083 scr_cursor (RESTORE);
2679 break; 3084 break;
2680 3085
2681#ifndef NO_FRILLS 3086#ifndef NO_FRILLS
2682 case CSI_74: 3087 case CSI_74:
2683 process_window_ops (arg, nargs); 3088 process_window_ops (arg, nargs);
2684 break; 3089 break;
2685#endif 3090#endif
2686 3091
2687 case CSI_78: /* DECREQTPARM */ 3092 case CSI_78: /* DECREQTPARM */
2688 if (arg[0] == 0 || arg[0] == 1) 3093 if (arg[0] == 0 || arg[0] == 1)
2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3094 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2690 /* FALLTHROUGH */ 3095 break;
2691 3096
2692 default: 3097 default:
2693 break; 3098 break;
2694 } 3099 }
2695} 3100}
2696/*}}} */ 3101/*}}} */
2697 3102
2698#ifndef NO_FRILLS 3103#ifndef NO_FRILLS
2699/* ARGSUSED */ 3104/* ARGSUSED */
2700void 3105void
2701rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3106rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2702{ 3107{
2703 int x, y; 3108 int x, y;
2704#if 0
2705 char *s;
2706#endif
2707 XWindowAttributes wattr; 3109 XWindowAttributes wattr;
2708 Window wdummy; 3110 Window wdummy;
2709 3111
2710 if (nargs == 0) 3112 if (nargs == 0)
2711 return; 3113 return;
3114
2712 switch (args[0]) { 3115 switch (args[0])
3116 {
2713 /* 3117 /*
2714 * commands 3118 * commands
2715 */ 3119 */
2716 case 1: /* deiconify window */ 3120 case 1: /* deiconify window */
2717 XMapWindow(Xdisplay, TermWin.parent[0]); 3121 XMapWindow (display->display, TermWin.parent[0]);
2718 break; 3122 break;
2719 case 2: /* iconify window */ 3123 case 2: /* iconify window */
2720 XIconifyWindow(Xdisplay, TermWin.parent[0], 3124 XIconifyWindow (display->display, TermWin.parent[0],
2721 DefaultScreen(Xdisplay)); 3125 DefaultScreen (display->display));
2722 break; 3126 break;
2723 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2725 break; 3129 break;
2726 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2728 break; 3132 break;
2729 case 5: /* raise window */ 3133 case 5: /* raise window */
2730 XRaiseWindow(Xdisplay, TermWin.parent[0]); 3134 XRaiseWindow (display->display, TermWin.parent[0]);
2731 break; 3135 break;
2732 case 6: /* lower window */ 3136 case 6: /* lower window */
2733 XLowerWindow(Xdisplay, TermWin.parent[0]); 3137 XLowerWindow (display->display, TermWin.parent[0]);
2734 break; 3138 break;
2735 case 7: /* refresh window */ 3139 case 7: /* refresh window */
2736 scr_touch (true); 3140 scr_touch (true);
2737 break; 3141 break;
2738 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2740 (unsigned int)(args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * TermWin.fheight));
2741 break; 3145 break;
3146
3147 //case 9: NYI, TODO, restore maximized window or maximize window
2742 default: 3148 default:
2743 if (args[0] >= 24) /* set height (chars) */ 3149 if (args[0] >= 24) /* set height (chars) */
2744 set_widthheight ((unsigned int)TermWin.width, 3150 set_widthheight ((unsigned int)TermWin.width,
2745 (unsigned int)(args[1] * TermWin.fheight)); 3151 (unsigned int) (args[1] * TermWin.fheight));
2746 break; 3152 break;
3153
3154
2747 /* 3155 /*
2748 * reports - some output format copied from XTerm 3156 * reports - some output format copied from XTerm
2749 */ 3157 */
2750 case 11: /* report window state */ 3158 case 11: /* report window state */
2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2753 break; 3161 break;
2754 case 13: /* report window position */ 3162 case 13: /* report window position */
2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2757 -wattr.border_width, -wattr.border_width, 3165 -wattr.border_width, -wattr.border_width,
2758 &x, &y, &wdummy); 3166 &x, &y, &wdummy);
2759 tt_printf("\033[3;%d;%dt", x, y); 3167 tt_printf ("\033[3;%d;%dt", x, y);
2760 break; 3168 break;
2761 case 14: /* report window size (pixels) */ 3169 case 14: /* report window size (pixels) */
2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2764 break; 3172 break;
3173 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3175 break;
2765 case 18: /* report window size (chars) */ 3176 case 19: /* report window size (chars) */
2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2767 break; 3178 break;
2768#if 0 /* XXX: currently disabled due to security concerns */
2769 case 20: /* report icon label */ 3179 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 {
3182 char *s;
2770 XGetIconName(Xdisplay, TermWin.parent[0], &s); 3183 XGetIconName (display->display, TermWin.parent[0], &s);
2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2772 break; 3185 }
3186 break;
2773 case 21: /* report window title */ 3187 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 {
3190 char *s;
2774 XFetchName(Xdisplay, TermWin.parent[0], &s); 3191 XFetchName (display->display, TermWin.parent[0], &s);
2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2776 break; 3193 }
2777#endif 3194 break;
2778 } 3195 }
2779} 3196}
2780#endif 3197#endif
2781 3198
2782/*----------------------------------------------------------------------*/ 3199/*----------------------------------------------------------------------*/
2783/* 3200/*
2784 * get input up until STRING TERMINATOR (or BEL) 3201 * get input up until STRING TERMINATOR (or BEL)
2785 * ends_how is terminator used. returned input must be free()d 3202 * ends_how is terminator used. returned input must be free()'d
2786 */ 3203 */
2787unsigned char * 3204unsigned char *
2788rxvt_term::get_to_st (unsigned char *ends_how) 3205rxvt_term::get_to_st (unicode_t &ends_how)
2789{ 3206{
2790 int seen_esc = 0; /* seen escape? */ 3207 unicode_t prev = 0, ch;
2791 unsigned int n = 0; 3208 unsigned int n = 0;
2792 unsigned char *s; 3209 unsigned char *s;
2793 unsigned char ch, string[STRING_MAX]; 3210 unsigned char string[STRING_MAX];
2794 3211
2795 for (; (ch = cmd_getc ());) { 3212 while ((ch = cmd_getc ()) != NOCHAR)
2796 if (ch == C0_BEL 3213 {
2797 || ch == CHAR_ST 3214 if (prev == C0_ESC)
2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3215 {
3216 if (ch == 0x5c) /* 7bit ST */
3217 break;
3218 else
3219 return NULL;
3220 }
3221 else if (ch == C0_BEL || ch == CHAR_ST)
2799 break; 3222 break;
2800 if (ch == C0_ESC) { 3223 else if (ch < 0x20)
2801 seen_esc = 1;
2802 continue;
2803 } else if (ch == '\t')
2804 ch = ' '; /* translate '\t' to space */
2805 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2806 return NULL; /* other control character - exit */ 3224 return NULL; /* other control character - exit */
3225
2807 if (n < sizeof(string) - 1) 3226 if (n >= sizeof (string) - 1)
3227 // stop at some sane length
3228 return NULL;
3229
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
2808 string[n++] = ch; 3236 string[n++] = prev = ch;
2809 seen_esc = 0;
2810 } 3237 }
3238
2811 string[n++] = '\0'; 3239 string[n++] = '\0';
3240
2812 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2813 return NULL; 3242 return NULL;
3243
2814 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3244 ends_how = (ch == 0x5c ? C0_ESC : ch);
2815 STRNCPY(s, string, n); 3245 STRNCPY (s, string, n);
2816 return s; 3246 return s;
2817} 3247}
2818 3248
2819/*----------------------------------------------------------------------*/ 3249/*----------------------------------------------------------------------*/
2820/* 3250/*
2821 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2822 */ 3252 */
2823void 3253void
2824rxvt_term::process_dcs_seq () 3254rxvt_term::process_dcs_seq ()
2825{ 3255{
2826 unsigned char eh, *s; 3256 unsigned char *s;
2827/* 3257 unicode_t eh;
3258
3259 /*
2828 * Not handled yet 3260 * Not handled yet
2829 */ 3261 */
2830 s = get_to_st (&eh); 3262 s = get_to_st (eh);
2831 if (s) 3263 if (s)
2832 free(s); 3264 free (s);
3265
2833 return; 3266 return;
2834} 3267}
2835 3268
2836/*----------------------------------------------------------------------*/ 3269/*----------------------------------------------------------------------*/
2837/* 3270/*
2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2839 */ 3272 */
2840void 3273void
2841rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
2842{ 3275{
2843 unsigned char ch, eh, *s; 3276 unicode_t ch, eh;
2844 int arg; 3277 int arg;
2845 3278
2846 ch = cmd_getc (); 3279 ch = cmd_getc ();
2847 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2848 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
2849 3282
2850 if (ch == ';') { 3283 if (ch == ';')
2851 s = get_to_st (&eh);
2852 if (s) {
2853 /*
2854 * rxvt_menubar_dispatch() violates the constness of the string,
2855 * so do it here
2856 */
2857 if (arg == XTerm_Menu)
2858#if 0 /* XXX: currently disabled due to security concerns */
2859 menubar_dispatch ((char *)s);
2860#else
2861 (void)0;
2862#endif
2863 else
2864 xterm_seq (arg, (char *)s, eh);
2865 free(s);
2866 }
2867 } 3284 {
3285 unsigned char *s = get_to_st (eh);
3286
3287 if (s)
3288 {
3289 process_xterm_seq (arg, (char *)s, eh);
3290 free (s);
3291 }
3292 }
2868} 3293}
3294
3295void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{
3298 if (str[0] == '?' && !str[1])
3299 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 }
3307 else
3308 set_window_color (color, str);
3309}
3310
2869/* 3311/*
2870 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2871 * 0 = change iconName/title 3313 * 0 = change iconName/title
2872 * 1 = change iconName 3314 * 1 = change iconName
2873 * 2 = change title 3315 * 2 = change title
2874 * 4 = change color 3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
2875 * 12 = change text color 3319 * 12 = change text color
2876 * 13 = change mouse foreground color 3320 * 13 = change mouse foreground color
2877 * 17 = change highlight character colour 3321 * 17 = change highlight character colour
2878 * 18 = change bold character color 3322 * 18 = change bold character color
2879 * 19 = change underlined character color 3323 * 19 = change underlined character color
2880 * 46 = change logfile (not implemented) 3324 * 46 = change logfile (not implemented)
2881 * 50 = change font 3325 * 50 = change font
2882 * 3326 *
2883 * rxvt extensions: 3327 * rxvt extensions:
2884 * 10 = menu (may change in future)
2885 * 20 = bg pixmap 3328 * 20 = bg pixmap
2886 * 39 = change default fg color 3329 * 39 = change default fg color
2887 * 49 = change default bg color 3330 * 49 = change default bg color
2888 * 55 = dump scrollback buffer and all of screen 3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
2889 */ 3335 */
2890void 3336void
2891rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2892{ 3338{
2893 int changed = 0; 3339 int changed = 0;
2894 int color; 3340 int color;
2895 char *buf, *name; 3341 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1];
2896 3343
2897 assert(str != NULL); 3344 assert (str != NULL);
2898 switch (op) { 3345 switch (op)
3346 {
2899 case XTerm_name: 3347 case XTerm_name:
2900 set_title (str); 3348 set_title (str);
2901 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
2902 case XTerm_iconName: 3350 case XTerm_iconName:
2903 set_iconName (str); 3351 set_icon_name (str);
2904 break; 3352 break;
2905 case XTerm_title: 3353 case XTerm_title:
2906 set_title (str); 3354 set_title (str);
2907 break; 3355 break;
3356 case XTerm_property:
3357 if (str[0] == '?')
3358 {
3359 Atom prop = XInternAtom (display->display, str + 1, True);
3360 Atom actual_type;
3361 int actual_format;
3362 unsigned long nitems;
3363 unsigned long bytes_after;
3364 unsigned char *value = 0;
3365 const char *str = "";
3366
3367 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None
3373 && actual_format == 8)
3374 str = (const char *)(value);
3375
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3377
3378 XFree (value);
3379 }
3380 else
3381 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383
3384 if (eq)
3385 {
3386 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0],
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 }
3392 else
3393 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str));
3395 }
3396 break;
3397
2908 case XTerm_Color: 3398 case XTerm_Color:
2909 for (buf = (char *)str; buf && *buf;) { 3399 for (buf = (char *)str; buf && *buf;)
3400 {
2910 if ((name = STRCHR(buf, ';')) == NULL) 3401 if ((name = STRCHR (buf, ';')) == NULL)
2911 break; 3402 break;
3403
2912 *name++ = '\0'; 3404 *name++ = '\0';
2913 color = atoi(buf); 3405 color = atoi (buf);
3406
2914 if (color < 0 || color >= TOTAL_COLORS) 3407 if (color < 0 || color >= TOTAL_COLORS)
2915 break; 3408 break;
3409
2916 if ((buf = STRCHR(name, ';')) != NULL) 3410 if ((buf = STRCHR (name, ';')) != NULL)
2917 *buf++ = '\0'; 3411 *buf++ = '\0';
3412
3413 if (name[0] == '?' && !name[1])
3414 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 }
3422 else
2918 set_window_color (color + minCOLOR, name); 3423 set_window_color (color + minCOLOR, name);
2919 } 3424 }
2920 break; 3425 break;
3426 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3428 break;
3429 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3431 break;
2921#ifndef NO_CURSORCOLOR 3432#ifndef NO_CURSORCOLOR
2922 case XTerm_Color_cursor: 3433 case XTerm_Color_cursor:
2923 set_window_color (Color_cursor, str); 3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2924 break; 3435 break;
2925#endif 3436#endif
2926 case XTerm_Color_pointer: 3437 case XTerm_Color_pointer_fg:
2927 set_window_color (Color_pointer, str); 3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
2928 break; 3439 break;
3440 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3442 break;
2929#ifndef NO_BOLD_UNDERLINE_REVERSE 3443#ifndef NO_BOLD_UNDERLINE_REVERSE
2930 case XTerm_Color_BD: 3444 case XTerm_Color_BD:
2931 set_window_color (Color_BD, str); 3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
2932 break; 3446 break;
2933 case XTerm_Color_UL: 3447 case XTerm_Color_UL:
2934 set_window_color (Color_UL, str); 3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
2935 break; 3449 break;
2936 case XTerm_Color_RV: 3450 case XTerm_Color_RV:
2937 set_window_color (Color_RV, str); 3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2938 break; 3452 break;
2939#endif 3453#endif
2940 3454
2941 case XTerm_Menu:
2942 /*
2943 * rxvt_menubar_dispatch() violates the constness of the string,
2944 * so DON'T do it here
2945 */
2946 break;
2947 case XTerm_Pixmap: 3455 case XTerm_Pixmap:
2948 if (*str != ';') { 3456 if (*str != ';')
3457 {
2949#if XPM_BACKGROUND 3458#if XPM_BACKGROUND
2950 scale_pixmap (""); /* reset to default scaling */ 3459 scale_pixmap (""); /* reset to default scaling */
2951 set_bgPixmap (str); /* change pixmap */ 3460 set_bgPixmap (str); /* change pixmap */
2952#endif 3461#endif
2953 scr_touch (true); 3462 scr_touch (true);
2954 } 3463 }
2955 while ((str = STRCHR(str, ';')) != NULL) { 3464 while ((str = STRCHR (str, ';')) != NULL)
2956 str++; 3465 {
3466 str++;
2957#if XPM_BACKGROUND 3467#if XPM_BACKGROUND
2958 changed += scale_pixmap (str); 3468 changed += scale_pixmap (str);
2959#endif 3469#endif
2960 } 3470
2961 if (changed) { 3471 }
3472 if (changed)
3473 {
2962#ifdef XPM_BACKGROUND 3474#ifdef XPM_BACKGROUND
2963 resize_pixmap (); 3475 resize_pixmap ();
2964#endif 3476#endif
2965 scr_touch (true); 3477 scr_touch (true);
2966 } 3478 }
2967 break; 3479 break;
2968 3480
2969 case XTerm_restoreFG: 3481 case XTerm_restoreFG:
2970 set_window_color (Color_fg, str); 3482 set_window_color (Color_fg, str);
2971 break; 3483 break;
2972 case XTerm_restoreBG: 3484 case XTerm_restoreBG:
2973 set_window_color (Color_bg, str); 3485 set_window_color (Color_bg, str);
2974 break; 3486 break;
3487
2975 case XTerm_logfile: 3488 case XTerm_logfile:
2976 break; 3489 // TODO, when secure mode?
3490 break;
3491
2977 case XTerm_font: 3492 case XTerm_font:
2978 change_font (0, str); 3493 if (query)
2979 break; 3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break;
3537#endif
2980#if 0 3538#if 0
2981 case XTerm_dumpscreen: /* no error notices */ 3539 case XTerm_dumpscreen: /* no error notices */
2982 { 3540 {
2983 int fd; 3541 int fd;
2984 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2985 scr_dump (fd); 3543 {
2986 close(fd); 3544 scr_dump (fd);
2987 } 3545 close (fd);
2988 } 3546 }
2989 break; 3547 }
3548 break;
2990#endif 3549#endif
2991 } 3550 }
2992} 3551}
2993/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
2994 3553
… …
3003 * so no need for fancy checking 3562 * so no need for fancy checking
3004 */ 3563 */
3005int 3564int
3006rxvt_term::privcases (int mode, unsigned long bit) 3565rxvt_term::privcases (int mode, unsigned long bit)
3007{ 3566{
3008 int state; 3567 int state;
3009 3568
3010 if (mode == 's') { 3569 if (mode == 's')
3570 {
3011 SavedModes |= (PrivateModes & bit); 3571 SavedModes |= (PrivateModes & bit);
3012 return -1; 3572 return -1;
3013 } else { 3573 }
3574 else
3575 {
3014 if (mode == 'r') 3576 if (mode == 'r')
3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3016 else 3578 else
3017 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3018 PrivMode(state, bit); 3580 PrivMode (state, bit);
3019 } 3581 }
3582
3020 return state; 3583 return state;
3021} 3584}
3022 3585
3023/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3024void 3587void
3025rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3026{ 3589{
3027 unsigned int i, j; 3590 unsigned int i, j;
3028 int state; 3591 int state;
3592
3029 static const struct { 3593 static const struct
3594 {
3030 const int argval; 3595 const int argval;
3031 const unsigned long bit; 3596 const unsigned long bit;
3597 }
3598
3032 } argtopriv[] = { 3599 argtopriv[] = {
3033 { 1, PrivMode_aplCUR }, 3600 { 1, PrivMode_aplCUR },
3034 { 2, PrivMode_vt52 }, 3601 { 2, PrivMode_vt52 },
3035 { 3, PrivMode_132 }, 3602 { 3, PrivMode_132 },
3036 { 4, PrivMode_smoothScroll }, 3603 { 4, PrivMode_smoothScroll },
3037 { 5, PrivMode_rVideo }, 3604 { 5, PrivMode_rVideo },
3038 { 6, PrivMode_relOrigin }, 3605 { 6, PrivMode_relOrigin },
3039 { 7, PrivMode_Autowrap }, 3606 { 7, PrivMode_Autowrap },
3040 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
3041#ifdef menuBar_esc 3608#ifdef menuBar_esc
3042 { menuBar_esc, PrivMode_menuBar }, 3609 { menuBar_esc, PrivMode_menuBar },
3043#endif 3610#endif
3044#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3045 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3046#endif 3613#endif
3614 // 18, 19 printing-related
3047 { 25, PrivMode_VisibleCursor }, 3615 { 25, PrivMode_VisibleCursor },
3048 { 35, PrivMode_ShiftKeys }, 3616 // 30 show scrollbar rxvt. extension
3049 { 40, PrivMode_132OK }, 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3050 { 47, PrivMode_Screen }, 3618 { 40, PrivMode_132OK },
3051 { 66, PrivMode_aplKP }, 3619 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI
3621 // 46 start logging
3622 { 47, PrivMode_Screen },
3623 { 66, PrivMode_aplKP },
3052#ifndef NO_BACKSPACE_KEY 3624#ifndef NO_BACKSPACE_KEY
3053 { 67, PrivMode_BackSpace }, 3625 { 67, PrivMode_BackSpace },
3054#endif 3626#endif
3055 { 1000, PrivMode_MouseX11 }, 3627 { 1000, PrivMode_MouseX11 },
3056 { 1010, PrivMode_TtyOutputInh }, 3628 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3057 { 1011, PrivMode_Keypress }, 3629 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3058 { 1047, PrivMode_Screen }, 3630 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3060 }; 3632 { 1011, PrivMode_Keypress }, // rxvt extension
3633 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 };
3061 3641
3062 if (nargs == 0) 3642 if (nargs == 0)
3063 return; 3643 return;
3064 3644
3065/* make lo/hi boolean */ 3645 /* make lo/hi boolean */
3066 if (mode == 'l') 3646 if (mode == 'l')
3067 mode = 0; /* reset */ 3647 mode = 0; /* reset */
3068 else if (mode == 'h') 3648 else if (mode == 'h')
3069 mode = 1; /* set */ 3649 mode = 1; /* set */
3070 3650
3071 for (i = 0; i < nargs; i++) { 3651 for (i = 0; i < nargs; i++)
3652 {
3072 state = -1; 3653 state = -1;
3073 3654
3074 /* basic handling */ 3655 /* basic handling */
3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3656 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3076 if (argtopriv[j].argval == arg[i]) { 3657 if (argtopriv[j].argval == arg[i])
3658 {
3077 state = privcases (mode, argtopriv[j].bit); 3659 state = privcases (mode, argtopriv[j].bit);
3078 break; 3660 break;
3079 } 3661 }
3080 3662
3081 /* extra handling for values with state unkept */ 3663 /* extra handling for values with state unkept */
3082 if (state == -1)
3083 switch (arg[i]) { 3664 switch (arg[i])
3665 {
3084 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3085 if (mode == 0) 3667 if (Options & Opt_secondaryScreen)
3668 if (mode == 0)
3086 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3087 else if (mode == 1) 3670 else if (mode == 1)
3088 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3089 /* FALLTHROUGH */ 3672 break;
3090 default: 3673 }
3091 continue; /* for(;i;) */
3092 }
3093 3674
3675 if (state >= 0)
3094 /* extra handling for values with valid 0 or 1 state */ 3676 /* extra handling for values with valid 0 or 1 state */
3095 switch (arg[i]) { 3677 switch (arg[i])
3678 {
3096 /* case 1: - application cursor keys */ 3679 /* case 1: - application cursor keys */
3097 case 2: /* VT52 mode */ 3680 case 2: /* VT52 mode */
3098 /* oddball mode. should be set regardless of set/reset 3681 /* oddball mode. should be set regardless of set/reset
3099 * parameter. Return from VT52 mode with an ESC < from 3682 * parameter. Return from VT52 mode with an ESC < from
3100 * within VT52 mode 3683 * within VT52 mode
3101 */ 3684 */
3102 PrivMode(1, PrivMode_vt52); 3685 PrivMode (1, PrivMode_vt52);
3103 break; 3686 break;
3104 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3105 if (PrivateModes & PrivMode_132OK) 3688 if (PrivateModes & PrivMode_132OK)
3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3107 (unsigned int)TermWin.height); 3690 break;
3108 break;
3109 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3110 if (state) 3692 if (state)
3111 Options &= ~Opt_jumpScroll; 3693 Options &= ~Opt_jumpScroll;
3112 else 3694 else
3113 Options |= Opt_jumpScroll; 3695 Options |= Opt_jumpScroll;
3114 break; 3696 break;
3115 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3116 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
3117 break; 3699 break;
3118 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
3119 scr_relative_origin (state); 3701 scr_relative_origin (state);
3120 break; 3702 break;
3121 case 7: /* autowrap */ 3703 case 7: /* autowrap */
3122 scr_autowrap (state); 3704 scr_autowrap (state);
3123 break; 3705 break;
3124 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3125 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3126 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3127 PrivateModes &= ~(PrivMode_MouseX11); 3709 PrivateModes &= ~PrivMode_MouseX11;
3128 break; 3710 break;
3129#ifdef menuBar_esc 3711#ifdef menuBar_esc
3130 case menuBar_esc: 3712 case menuBar_esc:
3131#ifdef MENUBAR 3713#ifdef MENUBAR
3132 map_menuBar (state); 3714 map_menuBar (state);
3133#endif 3715#endif
3134 break; 3716 break;
3135#endif 3717#endif
3136#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
3137 case scrollBar_esc: 3719 case scrollBar_esc:
3138 if (scrollbar_mapping (state)) { 3720 if (scrollbar_mapping (state))
3139 resize_all_windows (0, 0, 0); 3721 {
3722 resize_all_windows (0, 0, 0);
3140 scr_touch (true); 3723 scr_touch (true);
3141 } 3724 }
3142 break; 3725 break;
3143#endif 3726#endif
3144 case 25: /* visible/invisible cursor */ 3727 case 25: /* visible/invisible cursor */
3145 scr_cursor_visible (state); 3728 scr_cursor_visible (state);
3146 break; 3729 break;
3147 /* case 35: - shift keys */ 3730 /* case 35: - shift keys */
3148 /* case 40: - 80 <--> 132 mode */ 3731 /* case 40: - 80 <--> 132 mode */
3149 case 47: /* secondary screen */ 3732 case 47: /* secondary screen */
3150 scr_change_screen (state); 3733 scr_change_screen (state);
3151 break; 3734 break;
3152 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
3153 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
3154 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
3155 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
3156 PrivateModes &= ~(PrivMode_MouseX10); 3739 PrivateModes &= ~PrivMode_MouseX10;
3157 break; 3740 break;
3158#if 0 3741#if 0
3159 case 1001: 3742 case 1001:
3160 break; /* X11 mouse highlighting */ 3743 break; /* X11 mouse highlighting */
3161#endif 3744#endif
3162 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3163 if (state) 3746 if (state)
3164 Options &= ~Opt_scrollTtyOutput; 3747 Options &= ~Opt_scrollTtyOutput;
3165 else 3748 else
3166 Options |= Opt_scrollTtyOutput; 3749 Options |= Opt_scrollTtyOutput;
3167 break; 3750 break;
3168 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
3169 if (state) 3752 if (state)
3170 Options |= Opt_scrollTtyKeypress; 3753 Options |= Opt_scrollTtyKeypress;
3171 else 3754 else
3172 Options &= ~Opt_scrollTtyKeypress; 3755 Options &= ~Opt_scrollTtyKeypress;
3173 break; 3756 break;
3174 case 1047: /* secondary screen w/ clearing */ 3757 case 1047: /* secondary screen w/ clearing last */
3175 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3758 if (Options & Opt_secondaryScreen)
3176 if (current_screen != PRIMARY) 3759 if (current_screen != PRIMARY)
3177 scr_erase_screen (2); 3760 scr_erase_screen (2);
3178 scr_change_screen (state); 3761 scr_change_screen (state);
3179 /* FALLTHROUGH */ 3762 break;
3180 default: 3763 case 1049: /* secondary screen w/ clearing first */
3181 break; 3764 scr_change_screen (state);
3182 } 3765 if (Options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY)
3767 scr_erase_screen (2);
3768 break;
3769 default:
3770 break;
3771 }
3183 } 3772 }
3184} 3773}
3185/*}}} */ 3774/*}}} */
3186 3775
3187/*{{{ process sgr sequences */ 3776/*{{{ process sgr sequences */
3188void 3777void
3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3778rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3190{ 3779{
3191 unsigned int i; 3780 unsigned int i;
3192 short rendset; 3781 short rendset;
3193 int rendstyle; 3782 int rendstyle;
3194 3783
3195 if (nargs == 0) { 3784 if (nargs == 0)
3785 {
3196 scr_rendition (0, ~RS_None); 3786 scr_rendition (0, ~RS_None);
3197 return; 3787 return;
3198 } 3788 }
3789
3199 for (i = 0; i < nargs; i++) { 3790 for (i = 0; i < nargs; i++)
3791 {
3200 rendset = -1; 3792 rendset = -1;
3201 switch (arg[i]) { 3793 switch (arg[i])
3202 case 0: 3794 {
3795 case 0:
3203 rendset = 0, rendstyle = ~RS_None; 3796 rendset = 0, rendstyle = ~RS_None;
3204 break; 3797 break;
3205 case 1: 3798 case 1:
3206 rendset = 1, rendstyle = RS_Bold; 3799 rendset = 1, rendstyle = RS_Bold;
3207 break; 3800 break;
3208 case 4: 3801 //case 2: // faint or second colour
3802 case 4:
3209 rendset = 1, rendstyle = RS_Uline; 3803 rendset = 1, rendstyle = RS_Uline;
3210 break; 3804 break;
3211 case 5: 3805 case 5: // slowly blinking
3806 case 6: // rapidly blinking
3212 rendset = 1, rendstyle = RS_Blink; 3807 rendset = 1, rendstyle = RS_Blink;
3213 break; 3808 break;
3214 case 7: 3809 //case 6: // scoansi light background
3810 case 7:
3215 rendset = 1, rendstyle = RS_RVid; 3811 rendset = 1, rendstyle = RS_RVid;
3216 break; 3812 break;
3217 case 22: 3813 case 8:
3814 // invisible. NYI
3815 break;
3816 //case 9: // crossed out
3817 //case 10: // scoansi acs off, primary font
3818 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font
3820 //...
3821 //case 19: // ninth alt font
3822 //case 20: // gothic
3823 case 21: // disable bold, faint
3218 rendset = 0, rendstyle = RS_Bold; 3824 rendset = 0, rendstyle = RS_Bold;
3219 break; 3825 break;
3220 case 24: 3826 case 22:
3827 rendset = 0, rendstyle = RS_Bold;
3828 break;
3829 //case 23: disable italic
3830 case 24:
3221 rendset = 0, rendstyle = RS_Uline; 3831 rendset = 0, rendstyle = RS_Uline;
3222 break; 3832 break;
3223 case 25: 3833 case 25:
3224 rendset = 0, rendstyle = RS_Blink; 3834 rendset = 0, rendstyle = RS_Blink;
3225 break; 3835 break;
3226 case 27: 3836 case 27:
3227 rendset = 0, rendstyle = RS_RVid; 3837 rendset = 0, rendstyle = RS_RVid;
3228 break; 3838 break;
3229 } 3839 //case 28: // visible. NYI
3840 //case 29: // not crossed-out
3841 }
3842
3230 if (rendset != -1) { 3843 if (rendset != -1)
3844 {
3231 scr_rendition (rendset, rendstyle); 3845 scr_rendition (rendset, rendstyle);
3232 continue; /* for(;i;) */ 3846 continue; /* for (;i;) */
3233 } 3847 }
3234 3848
3235 switch (arg[i]) { 3849 switch (arg[i])
3236 case 30: 3850 {
3851 case 30:
3237 case 31: /* set fg color */ 3852 case 31: /* set fg color */
3238 case 32: 3853 case 32:
3239 case 33: 3854 case 33:
3240 case 34: 3855 case 34:
3241 case 35: 3856 case 35:
3242 case 36: 3857 case 36:
3243 case 37: 3858 case 37:
3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3245 Color_fg); 3860 break;
3246 break;
3247#ifdef TTY_256COLOR 3861#ifdef TTY_256COLOR
3248 case 38: 3862 case 38:
3249 if (nargs > i + 2 && arg[i + 1] == 5) { 3863 if (nargs > i + 2 && arg[i + 1] == 5)
3864 {
3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3251 Color_fg); 3866 i += 2;
3252 i += 2; 3867 }
3253 } 3868 break;
3254 break;
3255#endif 3869#endif
3256 case 39: /* default fg */ 3870 case 39: /* default fg */
3257 scr_color (Color_fg, Color_fg); 3871 scr_color (Color_fg, Color_fg);
3258 break; 3872 break;
3259 3873
3260 case 40: 3874 case 40:
3261 case 41: /* set bg color */ 3875 case 41: /* set bg color */
3262 case 42: 3876 case 42:
3263 case 43: 3877 case 43:
3264 case 44: 3878 case 44:
3265 case 45: 3879 case 45:
3266 case 46: 3880 case 46:
3267 case 47: 3881 case 47:
3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3269 Color_bg); 3883 break;
3270 break;
3271#ifdef TTY_256COLOR 3884#ifdef TTY_256COLOR
3272 case 48: 3885 case 48:
3273 if (nargs > i + 2 && arg[i + 1] == 5) { 3886 if (nargs > i + 2 && arg[i + 1] == 5)
3887 {
3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3275 Color_bg); 3889 i += 2;
3276 i += 2; 3890 }
3277 } 3891 break;
3278 break;
3279#endif 3892#endif
3280 case 49: /* default bg */ 3893 case 49: /* default bg */
3281 scr_color (Color_bg, Color_bg); 3894 scr_color (Color_bg, Color_bg);
3282 break; 3895 break;
3283 3896
3284#ifndef NO_BRIGHTCOLOR 3897#ifndef NO_BRIGHTCOLOR
3285 case 90: 3898 case 90:
3286 case 91: /* set bright fg color */ 3899 case 91: /* set bright fg color */
3287 case 92: 3900 case 92:
3288 case 93: 3901 case 93:
3289 case 94: 3902 case 94:
3290 case 95: 3903 case 95:
3291 case 96: 3904 case 96:
3292 case 97: 3905 case 97:
3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3294 Color_fg); 3907 Color_fg);
3295 break; 3908 break;
3296 case 100: 3909 case 100:
3297 case 101: /* set bright bg color */ 3910 case 101: /* set bright bg color */
3298 case 102: 3911 case 102:
3299 case 103: 3912 case 103:
3300 case 104: 3913 case 104:
3301 case 105: 3914 case 105:
3302 case 106: 3915 case 106:
3303 case 107: 3916 case 107:
3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3305 Color_bg); 3918 Color_bg);
3306 break; 3919 break;
3307#endif 3920#endif
3308 } 3921
3922 }
3309 } 3923 }
3310} 3924}
3311/*}}} */ 3925/*}}} */
3312 3926
3313/*{{{ process Rob Nation's own graphics mode sequences */ 3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3314void 3928void
3315rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
3316{ 3930{
3317 unsigned char ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
3318 3932
3319#ifndef RXVT_GRAPHICS 3933 if (cmd == 'Q')
3320 if (cmd == 'Q') { /* query graphics */ 3934 { /* query graphics */
3321 tt_printf("\033G0\n"); /* no graphics */ 3935 tt_printf ("\033G0\n"); /* no graphics */
3322 return; 3936 return;
3323 } 3937 }
3324/* swallow other graphics sequences until terminating ':' */ 3938 /* swallow other graphics sequences until terminating ':' */
3325 do 3939 do
3326 ch = cmd_getc ();
3327 while (ch != ':');
3328#else
3329 unsigned int nargs;
3330 int args[NGRX_PTS];
3331 unsigned char *text = NULL;
3332
3333 if (cmd == 'Q') { /* query graphics */
3334 tt_printf("\033G1\n"); /* yes, graphics (color) */
3335 return;
3336 }
3337 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3338 int neg;
3339
3340 ch = cmd_getc ();
3341 neg = (ch == '-');
3342 if (neg || ch == '+')
3343 ch = cmd_getc (); 3940 ch = cmd_getc ();
3344 3941 while (ch != ':');
3345 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3346 args[nargs] = args[nargs] * 10 + (ch - '0');
3347 if (neg)
3348 args[nargs] = -args[nargs];
3349
3350 nargs++;
3351 args[nargs] = 0;
3352 if (ch != ';')
3353 break;
3354 }
3355
3356 if ((cmd == 'T') && (nargs >= 5)) {
3357 int i, len = args[4];
3358
3359 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3360
3361 if (text != NULL) {
3362 for (i = 0; i < len; i++)
3363 text[i] = cmd_getc ();
3364 text[len] = '\0';
3365 }
3366 }
3367 Gr_do_graphics (cmd, nargs, args, text);
3368#endif
3369} 3942}
3370/*}}} */ 3943/*}}} */
3371 3944
3372/* ------------------------------------------------------------------------- */ 3945/* ------------------------------------------------------------------------- */
3373 3946
3374/* 3947/*
3375 * Send printf() formatted output to the command. 3948 * Send printf () formatted output to the command.
3376 * Only use for small amounts of data. 3949 * Only use for small amounts of data.
3377 */ 3950 */
3378void 3951void
3379rxvt_term::tt_printf (const char *fmt,...) 3952rxvt_term::tt_printf (const char *fmt,...)
3380{ 3953{

Diff Legend

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