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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 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 ()
… …
684 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
685 scrollbar_show (1); 673 scrollbar_show (1);
686#ifdef USE_XIM 674#ifdef USE_XIM
687 IMSendSpot (); 675 IMSendSpot ();
688#endif 676#endif
689 }
690 677
691 XFlush (Xdisplay); 678 }
679
680 display->flush ();
692} 681}
693 682
694void 683void
695rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
696{ 685{
697 SET_R (this); 686 SET_R (this);
698 SET_LOCALE (locale); 687 SET_LOCALE (locale);
699 688
700 flush (); 689 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} 690}
746 691
747#ifdef CURSOR_BLINK 692#ifdef CURSOR_BLINK
748void 693void
749rxvt_term::cursor_blink_cb (time_watcher &w) 694rxvt_term::cursor_blink_cb (time_watcher &w)
… …
766 w.start (w.at + TEXT_BLINK_INTERVAL); 711 w.start (w.at + TEXT_BLINK_INTERVAL);
767 } 712 }
768} 713}
769#endif 714#endif
770 715
771void
772rxvt_term::x_cb (io_watcher &w, short revents)
773{
774 SET_R (this);
775 SET_LOCALE (locale);
776
777 process_x_events ();
778}
779
780bool 716bool
781rxvt_term::pty_fill () 717rxvt_term::pty_fill ()
782{ 718{
783 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 719 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
784 720
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 721 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 722 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 723 cmdbuf_endp = cmdbuf_ptr + n;
788 724
789 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
790 726
791 if (n > 0) 727 if (n > 0)
792 { 728 {
793 cmdbuf_endp += n; 729 cmdbuf_endp += n;
794 return true; 730 return true;
795 } 731 }
796 else if (n < 0 && errno != EAGAIN) 732 else if (n < 0 && errno != EAGAIN)
797 destroy (); 733 destroy ();
798 734
799 return false; 735 return false;
800} 736}
801 737
802void 738void
803rxvt_term::pty_cb (io_watcher &w, short revents) 739rxvt_term::pty_cb (io_watcher &w, short revents)
… …
807 743
808 if (revents & EVENT_WRITE) 744 if (revents & EVENT_WRITE)
809 tt_write (0, 0); 745 tt_write (0, 0);
810 else if (revents & EVENT_READ) 746 else if (revents & EVENT_READ)
811 { 747 {
812 bool flag = true;
813
814 // loop, but don't allow a single term to monopolize us 748 // loop, but don't allow a single term to monopolize us
815 // the number of loops is fully arbitrary, and thus wrong 749 // the number of loops is fully arbitrary, and thus wrong
816 while (flag && pty_fill ()) 750 while (pty_fill ())
817 { 751 {
818 if (!seen_input) 752 if (!seen_input)
819 { 753 {
820 seen_input = 1; 754 seen_input = 1;
821 /* once we know the shell is running, send the screen size. Again! */ 755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
822 tt_winch (); 757 tt_winch ();
823 } 758 }
824 759
825 uint32_t ch = NOCHAR; 760 if (cmd_parse ())
826
827 for (;;)
828 {
829 if (ch == NOCHAR)
830 ch = next_char ();
831
832 if (ch == NOCHAR) // TODO: improve
833 break; 761 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 } 762 }
915 }
916 }
917}
918
919// read the next character, currently handles UTF-8
920// will probably handle all sorts of other stuff in the future
921uint32_t
922rxvt_term::next_char ()
923{
924 while (cmdbuf_ptr < cmdbuf_endp)
925 {
926 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
927 return *cmdbuf_ptr++;
928
929 wchar_t wc;
930 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
931
932 if (len == (size_t)-2)
933 return NOCHAR;
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 } 763 }
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
1025} 764}
1026 765
1027#ifdef POINTER_BLANK 766#ifdef POINTER_BLANK
1028void 767void
1029rxvt_term::pointer_unblank () 768rxvt_term::pointer_unblank ()
1030{ 769{
1031 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1032 recolour_cursor (); 771 recolour_cursor ();
1033 772
1034 hidden_pointer = 0; 773 hidden_pointer = 0;
1035 774
1036 if (Options & Opt_pointerBlank) 775 if (Options & Opt_pointerBlank)
… …
1038} 777}
1039 778
1040void 779void
1041rxvt_term::pointer_blank () 780rxvt_term::pointer_blank ()
1042{ 781{
1043 if (!(Options & Opt_pointerBlank)) 782 if (! (Options & Opt_pointerBlank))
1044 return; 783 return;
1045 784
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 785 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 786 XFlush (display->display);
1048 787
1049 hidden_pointer = 1; 788 hidden_pointer = 1;
1050} 789}
1051 790
1052void 791void
… …
1058 pointer_blank (); 797 pointer_blank ();
1059} 798}
1060#endif 799#endif
1061 800
1062void 801void
1063rxvt_term::mouse_report (const XButtonEvent *ev) 802rxvt_term::mouse_report (XButtonEvent &ev)
1064{ 803{
1065 int button_number, key_state = 0; 804 int button_number, key_state = 0;
1066 int x, y; 805 int x, y;
1067 806
1068 x = ev->x; 807 x = ev.x;
1069 y = ev->y; 808 y = ev.y;
1070 pixel_position (&x, &y); 809 pixel_position (&x, &y);
1071 810
1072 if (MEvent.button == AnyButton) { 811 if (MEvent.button == AnyButton)
812 {
1073 button_number = 3; 813 button_number = 3;
1074 } else { 814 }
815 else
816 {
1075 button_number = MEvent.button - Button1; 817 button_number = MEvent.button - Button1;
1076 /* add 0x3D for wheel events, like xterm does */ 818 /* add 0x3D for wheel events, like xterm does */
1077 if (button_number >= 3) 819 if (button_number >= 3)
1078 button_number += (64 - 3); 820 button_number += (64 - 3);
1079 } 821 }
1080 822
1081 if (PrivateModes & PrivMode_MouseX10) { 823 if (PrivateModes & PrivMode_MouseX10)
824 {
1082 /* 825 /*
1083 * do not report ButtonRelease 826 * do not report ButtonRelease
1084 * no state info allowed 827 * no state info allowed
1085 */ 828 */
1086 key_state = 0; 829 key_state = 0;
1087 if (button_number == 3) 830 if (button_number == 3)
1088 return; 831 return;
1089 } else { 832 }
833 else
834 {
1090 /* XTerm mouse reporting needs these values: 835 /* XTerm mouse reporting needs these values:
1091 * 4 = Shift 836 * 4 = Shift
1092 * 8 = Meta 837 * 8 = Meta
1093 * 16 = Control 838 * 16 = Control
1094 * plus will add in our own Double-Click reporting 839 * plus will add in our own Double-Click reporting
1095 * 32 = Double Click 840 * 32 = Double Click
1096 */ 841 */
1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 842 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1098 + ((MEvent.state & ModMetaMask) ? 8 : 0) 843 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1099 + ((MEvent.state & ControlMask) ? 16 : 0); 844 + ((MEvent.state & ControlMask) ? 16 : 0);
1100#ifdef MOUSE_REPORT_DOUBLECLICK 845#ifdef MOUSE_REPORT_DOUBLECLICK
1101 key_state += ((MEvent.clicks > 1) ? 32 : 0); 846 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1102#endif 847#endif
848
1103 } 849 }
1104 850
1105#ifdef DEBUG_MOUSEREPORT 851#ifdef DEBUG_MOUSEREPORT
1106 fprintf(stderr, "Mouse ["); 852 fprintf (stderr, "Mouse [");
1107 if (key_state & 16) 853 if (key_state & 16)
1108 fputc('C', stderr); 854 fputc ('C', stderr);
1109 if (key_state & 4) 855 if (key_state & 4)
1110 fputc('S', stderr); 856 fputc ('S', stderr);
1111 if (key_state & 8) 857 if (key_state & 8)
1112 fputc('A', stderr); 858 fputc ('A', stderr);
1113 if (key_state & 32) 859 if (key_state & 32)
1114 fputc('2', stderr); 860 fputc ('2', stderr);
1115 fprintf(stderr, "]: <%d>, %d/%d\n", 861 fprintf (stderr, "]: <%d>, %d/%d\n",
1116 button_number, 862 button_number,
1117 x + 1, 863 x + 1,
1118 y + 1); 864 y + 1);
1119#else 865#else
1120 tt_printf("\033[M%c%c%c", 866 tt_printf ("\033[M%c%c%c",
1121 (32 + button_number + key_state), 867 (32 + button_number + key_state),
1122 (32 + x + 1), 868 (32 + x + 1),
1123 (32 + y + 1)); 869 (32 + y + 1));
1124#endif 870#endif
1125} 871}
1126 872
1127#ifdef USING_W11LIB 873#ifdef USING_W11LIB
1128void 874void
1129rxvt_W11_process_x_event(XEvent *ev) 875rxvt_W11_process_x_event (XEvent *ev)
1130{ 876{
1131 rxvt_t *r = rxvt_get_r(); 877 rxvt_t *r = rxvt_get_r ();
1132 878
1133 process_x_event (ev); 879 x_cb (*ev);
1134} 880}
1135#endif 881#endif
1136 882
1137/*{{{ process an X event */ 883/*{{{ process an X event */
1138void 884void
1139rxvt_term::process_x_event (XEvent *ev) 885rxvt_term::x_cb (XEvent &ev)
1140{ 886{
887 SET_R (this);
888 SET_LOCALE (locale);
889
890#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 }
901#endif
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
1141 Window unused_root, unused_child; 922 Window unused_root, unused_child;
1142 int unused_root_x, unused_root_y; 923 int unused_root_x, unused_root_y;
1143 unsigned int unused_mask; 924 unsigned int unused_mask;
1144 925
1145#ifdef DEBUG_X 926#ifdef DEBUG_X
1146 const char *const eventnames[] = 927 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 928 { /* mason - this matches my system */
1148 "", 929 "",
1149 "", 930 "",
1150 "KeyPress", 931 "KeyPress",
1151 "KeyRelease", 932 "KeyRelease",
1152 "ButtonPress", 933 "ButtonPress",
1153 "ButtonRelease", 934 "ButtonRelease",
1154 "MotionNotify", 935 "MotionNotify",
1155 "EnterNotify", 936 "EnterNotify",
1156 "LeaveNotify", 937 "LeaveNotify",
1157 "FocusIn", 938 "FocusIn",
1158 "FocusOut", 939 "FocusOut",
1159 "KeymapNotify", 940 "KeymapNotify",
1160 "Expose", 941 "Expose",
1161 "GraphicsExpose", 942 "GraphicsExpose",
1162 "NoExpose", 943 "NoExpose",
1163 "VisibilityNotify", 944 "VisibilityNotify",
1164 "CreateNotify", 945 "CreateNotify",
1165 "DestroyNotify", 946 "DestroyNotify",
1166 "UnmapNotify", 947 "UnmapNotify",
1167 "MapNotify", 948 "MapNotify",
1168 "MapRequest", 949 "MapRequest",
1169 "ReparentNotify", 950 "ReparentNotify",
1170 "ConfigureNotify", 951 "ConfigureNotify",
1171 "ConfigureRequest", 952 "ConfigureRequest",
1172 "GravityNotify", 953 "GravityNotify",
1173 "ResizeRequest", 954 "ResizeRequest",
1174 "CirculateNotify", 955 "CirculateNotify",
1175 "CirculateRequest", 956 "CirculateRequest",
1176 "PropertyNotify", 957 "PropertyNotify",
1177 "SelectionClear", 958 "SelectionClear",
1178 "SelectionRequest", 959 "SelectionRequest",
1179 "SelectionNotify", 960 "SelectionNotify",
1180 "ColormapNotify", 961 "ColormapNotify",
1181 "ClientMessage", 962 "ClientMessage",
1182 "MappingNotify" 963 "MappingNotify"
1183 }; 964 };
1184#endif 965#endif
1185 966
1186#ifdef DEBUG_X 967#ifdef DEBUG_X
1187 struct timeval tp; 968 struct timeval tp;
1188 struct tm *ltt; 969 struct tm *ltt;
1189 (void)gettimeofday(&tp, NULL); 970 (void)gettimeofday (&tp, NULL);
1190 ltt = localtime(&(tp.tv_sec)); 971 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)); 972 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 973#endif
1193 974
1194 switch (ev->type) { 975 switch (ev.type)
976 {
1195 case KeyPress: 977 case KeyPress:
1196 lookup_key ((XKeyEvent *)ev); 978 lookup_key (ev.xkey);
1197 break; 979 break;
1198 980
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 case KeyRelease: 982 case KeyRelease:
1201 { 983 {
1202 if (!(ev->xkey.state & ControlMask)) 984 if (! (ev.xkey.state & ControlMask))
1203 mouse_slip_wheel_speed = 0;
1204 else {
1205 KeySym ks;
1206
1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1208 if (ks == XK_Control_L || ks == XK_Control_R)
1209 mouse_slip_wheel_speed = 0; 985 mouse_slip_wheel_speed = 0;
1210 } 986 else
1211 break; 987 {
1212 } 988 KeySym ks;
1213#endif
1214 989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break;
995 }
996#endif
997
1215 case ButtonPress: 998 case ButtonPress:
1216 button_press ((XButtonEvent *)ev); 999 button_press (ev.xbutton);
1217 break; 1000 break;
1218 1001
1219 case ButtonRelease: 1002 case ButtonRelease:
1220 button_release ((XButtonEvent *)ev); 1003 button_release (ev.xbutton);
1221 break; 1004 break;
1222 1005
1223 case ClientMessage: 1006 case ClientMessage:
1224 if (ev->xclient.format == 32 1007 if (ev.xclient.format == 32
1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1226 destroy (); 1009 destroy ();
1227#ifdef OFFIX_DND 1010#ifdef OFFIX_DND
1228 /* OffiX Dnd (drag 'n' drop) protocol */ 1011 /* OffiX Dnd (drag 'n' drop) protocol */
1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1230 && (ev->xclient.data.l[0] == DndFile 1013 && (ev.xclient.data.l[0] == DndFile
1231 || ev->xclient.data.l[0] == DndDir 1014 || ev.xclient.data.l[0] == DndDir
1232 || ev->xclient.data.l[0] == DndLink)) { 1015 || ev.xclient.data.l[0] == DndLink))
1233 /* Get Dnd data */ 1016 {
1017 /* Get Dnd data */
1234 Atom ActualType; 1018 Atom ActualType;
1235 int ActualFormat; 1019 int ActualFormat;
1236 unsigned char *data; 1020 unsigned char *data;
1237 unsigned long Size, RemainingBytes; 1021 unsigned long Size, RemainingBytes;
1238 1022
1239 XGetWindowProperty(Xdisplay, Xroot, 1023 XGetWindowProperty (display->display, display->root,
1240 xa[XA_DNDSELECTION], 1024 xa[XA_DNDSELECTION],
1241 0L, 1000000L, 1025 0L, 1000000L,
1242 False, AnyPropertyType, 1026 False, AnyPropertyType,
1243 &ActualType, &ActualFormat, 1027 &ActualType, &ActualFormat,
1244 &Size, &RemainingBytes, 1028 &Size, &RemainingBytes,
1245 &data); 1029 &data);
1246 XChangeProperty(Xdisplay, Xroot, 1030 XChangeProperty (display->display, display->root,
1247 XA_CUT_BUFFER0, XA_STRING, 1031 XA_CUT_BUFFER0, XA_STRING,
1248 8, PropModeReplace, 1032 8, PropModeReplace,
1249 data, STRLEN(data)); 1033 data, STRLEN (data));
1250 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1034 selection_paste (display->root, XA_CUT_BUFFER0, True);
1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1252 } 1036 }
1253#endif /* OFFIX_DND */ 1037#endif /* OFFIX_DND */
1254 break; 1038 break;
1255 1039
1256 case MappingNotify: 1040 case MappingNotify:
1257 XRefreshKeyboardMapping(&(ev->xmapping)); 1041 XRefreshKeyboardMapping (& (ev.xmapping));
1258 break; 1042 break;
1259 1043
1260 /* 1044 /*
1261 * XXX: this is not the _current_ arrangement 1045 * XXX: this is not the _current_ arrangement
1262 * Here's my conclusion: 1046 * Here's my conclusion:
1263 * If the window is completely unobscured, use bitblt's 1047 * If the window is completely unobscured, use bitblt's
1264 * to scroll. Even then, they're only used when doing partial 1048 * to scroll. Even then, they're only used when doing partial
1265 * screen scrolling. When partially obscured, we have to fill 1049 * screen scrolling. When partially obscured, we have to fill
1266 * in the GraphicsExpose parts, which means that after each refresh, 1050 * in the GraphicsExpose parts, which means that after each refresh,
1267 * we need to wait for the graphics expose or Noexpose events, 1051 * we need to wait for the graphics expose or Noexpose events,
1268 * which ought to make things real slow! 1052 * which ought to make things real slow!
1269 */ 1053 */
1270 case VisibilityNotify: 1054 case VisibilityNotify:
1271 switch (ev->xvisibility.state) 1055 switch (ev.xvisibility.state)
1272 { 1056 {
1273 case VisibilityUnobscured: 1057 case VisibilityUnobscured:
1274 refresh_type = FAST_REFRESH; 1058 refresh_type = FAST_REFRESH;
1275 break; 1059 break;
1276 case VisibilityPartiallyObscured: 1060 case VisibilityPartiallyObscured:
… …
1278 break; 1062 break;
1279 default: 1063 default:
1280 refresh_type = NO_REFRESH; 1064 refresh_type = NO_REFRESH;
1281 break; 1065 break;
1282 } 1066 }
1283 break; 1067 break;
1284 1068
1285 case FocusIn: 1069 case FocusIn:
1286 if (!TermWin.focus) { 1070 if (!TermWin.focus)
1071 {
1287 TermWin.focus = 1; 1072 TermWin.focus = 1;
1288 want_refresh = 1; 1073 want_refresh = 1;
1289#ifdef USE_XIM 1074#ifdef USE_XIM
1290 if (Input_Context != NULL) 1075 if (Input_Context != NULL)
1291 XSetICFocus(Input_Context); 1076 XSetICFocus (Input_Context);
1292#endif 1077#endif
1293#ifdef CURSOR_BLINK 1078#ifdef CURSOR_BLINK
1294 if (Options & Opt_cursorBlink) 1079 if (Options & Opt_cursorBlink)
1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1296#endif 1081#endif
1297 }
1298 break;
1299 1082
1083 }
1084 break;
1085
1300 case FocusOut: 1086 case FocusOut:
1301 if (TermWin.focus) { 1087 if (TermWin.focus)
1088 {
1302 TermWin.focus = 0; 1089 TermWin.focus = 0;
1303 want_refresh = 1; 1090 want_refresh = 1;
1304#ifdef USE_XIM 1091#ifdef USE_XIM
1305 if (Input_Context != NULL) 1092 if (Input_Context != NULL)
1306 XUnsetICFocus(Input_Context); 1093 XUnsetICFocus (Input_Context);
1307#endif 1094#endif
1308#ifdef CURSOR_BLINK 1095#ifdef CURSOR_BLINK
1309 if (Options & Opt_cursorBlink) 1096 if (Options & Opt_cursorBlink)
1310 cursor_blink_ev.stop (); 1097 cursor_blink_ev.stop ();
1311 hidden_cursor = 0; 1098 hidden_cursor = 0;
1312#endif 1099#endif
1313 }
1314 break;
1315 1100
1101 }
1102 break;
1103
1316 case ConfigureNotify: 1104 case ConfigureNotify:
1317 if (ev->xconfigure.window == TermWin.parent[0]) { 1105 if (ev.xconfigure.window == TermWin.parent[0])
1318 int height, width; 1106 {
1107 int height, width;
1319 1108
1109 do
1320 do { /* Wrap lots of configures into one */ 1110 { /* Wrap lots of configures into one */
1321 width = ev->xconfigure.width; 1111 width = ev.xconfigure.width;
1322 height = ev->xconfigure.height; 1112 height = ev.xconfigure.height;
1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1114 }
1325 ConfigureNotify, ev)); 1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1326 if (szHint.width != width || szHint.height != height) { 1117 if (szHint.width != width || szHint.height != height)
1118 {
1327 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1328 resize_all_windows (width, height, 1); 1120 resize_all_windows (width, height, 1);
1329 } 1121 }
1330#ifdef DEBUG_SIZE 1122#ifdef DEBUG_SIZE
1331 else { 1123 else
1124 {
1332 D_SIZE((stderr, "Size: Not resizing")); 1125 D_SIZE ((stderr, "Size: Not resizing"));
1333 } 1126 }
1334#endif 1127#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) { 1129 if (Options & Opt_transparent)
1337 check_our_parents (); 1130 {
1338 if (am_transparent) 1131 check_our_parents ();
1132 if (am_transparent)
1339 want_full_refresh = 1; 1133 want_full_refresh = 1;
1340 } 1134 }
1341#endif 1135#endif
1342 }
1343 break;
1344 1136
1137 }
1138 break;
1139
1345 case SelectionClear: 1140 case SelectionClear:
1346 selection_clear (); 1141 selection_clear ();
1347 break; 1142 break;
1348 1143
1349 case SelectionNotify: 1144 case SelectionNotify:
1350 if (selection_wait == Sel_normal) 1145 if (selection_wait == Sel_normal)
1351 selection_paste (ev->xselection.requestor, 1146 selection_paste (ev.xselection.requestor,
1352 ev->xselection.property, True); 1147 ev.xselection.property, True);
1353 break; 1148 break;
1354 1149
1355 case SelectionRequest: 1150 case SelectionRequest:
1356 selection_send (&(ev->xselectionrequest)); 1151 selection_send (ev.xselectionrequest);
1357 break; 1152 break;
1358 1153
1359 case UnmapNotify: 1154 case UnmapNotify:
1360 TermWin.mapped = 0; 1155 TermWin.mapped = 0;
1361#ifdef TEXT_BLINK 1156#ifdef TEXT_BLINK
1362 text_blink_ev.stop (); 1157 text_blink_ev.stop ();
1363#endif 1158#endif
1364 break; 1159 break;
1365 1160
1366 case MapNotify: 1161 case MapNotify:
1367 TermWin.mapped = 1; 1162 TermWin.mapped = 1;
1368#ifdef TEXT_BLINK 1163#ifdef TEXT_BLINK
1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370#endif 1165#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; 1166 break;
1379 } 1167
1380#ifdef TRANSPARENT 1168#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: 1169 case ReparentNotify:
1392 if ((Options & Opt_transparent) && check_our_parents ()) { 1170 rootwin_cb (ev);
1393 if (am_transparent) 1171 break;
1394 want_full_refresh = 1;
1395 }
1396#endif /* TRANSPARENT */ 1172#endif /* TRANSPARENT */
1397 break;
1398 1173
1399 case GraphicsExpose: 1174 case GraphicsExpose:
1400 case Expose: 1175 case Expose:
1401 if (ev->xany.window == TermWin.vt) { 1176 if (ev.xany.window == TermWin.vt)
1177 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1178#ifdef NO_SLOW_LINK_SUPPORT
1403 scr_expose (ev->xexpose.x, ev->xexpose.y, 1179 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev->xexpose.width, ev->xexpose.height, False); 1180 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1181#else
1406 // don't understand this, so commented it out 1182 // don't understand this, so commented it out
1407 scr_expose (ev->xexpose.x, ev->xexpose.y, 1183 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev->xexpose.width, ev->xexpose.height, False); 1184 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev->xexpose.x, 0, 1185 //scr_expose (ev.xexpose.x, 0,
1410 // ev->xexpose.width, TermWin.height, False); 1186 // ev.xexpose.width, TermWin.height, False);
1411#endif 1187#endif
1412 want_refresh = 1; 1188 want_refresh = 1;
1413 } else { 1189 }
1414 XEvent unused_xevent; 1190 else
1191 {
1192 XEvent unused_event;
1415 1193
1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1417 Expose, 1195 Expose,
1418 &unused_xevent)) ; 1196 &unused_event)) ;
1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1420 GraphicsExpose, 1198 GraphicsExpose,
1421 &unused_xevent)) ; 1199 &unused_event)) ;
1422 if (isScrollbarWindow(ev->xany.window)) { 1200 if (isScrollbarWindow (ev.xany.window))
1423 scrollBar.setIdle(); 1201 {
1424 scrollbar_show (0); 1202 scrollBar.setIdle ();
1425 } 1203 scrollbar_show (0);
1204 }
1426#ifdef MENUBAR 1205#ifdef MENUBAR
1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1428 menubar_expose (); 1207 menubar_expose ();
1429#endif 1208#endif
1430#ifdef RXVT_GRAPHICS 1209 }
1431 Gr_expose (ev->xany.window); 1210 break;
1432#endif
1433 }
1434 break;
1435 1211
1436 case MotionNotify: 1212 case MotionNotify:
1437#ifdef POINTER_BLANK 1213#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1214 if (hidden_pointer)
1439 pointer_unblank (); 1215 pointer_unblank ();
1440#endif 1216#endif
1441#if MENUBAR 1217#if MENUBAR
1442 if (isMenuBarWindow(ev->xany.window)) { 1218 if (isMenuBarWindow (ev.xany.window))
1219 {
1443 menubar_control (&(ev->xbutton)); 1220 menubar_control (ev.xbutton);
1444 break; 1221 break;
1445 } 1222 }
1446#endif 1223#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break; 1225 break;
1449 1226
1450 if (ev->xany.window == TermWin.vt) { 1227 if (ev.xany.window == TermWin.vt)
1228 {
1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1230 {
1453 MotionNotify, ev)) ; 1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1454 XQueryPointer(Xdisplay, TermWin.vt, 1232 ;
1455 &unused_root, &unused_child, 1233
1456 &unused_root_x, &unused_root_y, 1234 XQueryPointer (display->display, TermWin.vt,
1457 &(ev->xbutton.x), &(ev->xbutton.y), 1235 &unused_root, &unused_child,
1458 &unused_mask); 1236 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y),
1238 &unused_mask);
1459#ifdef MOUSE_THRESHOLD 1239#ifdef MOUSE_THRESHOLD
1460 /* deal with a `jumpy' mouse */ 1240 /* deal with a `jumpy' mouse */
1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 {
1462#endif 1243#endif
1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1464 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1245 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1465#ifdef SELECTION_SCROLLING 1246#ifdef SELECTION_SCROLLING
1466 if (ev->xbutton.y < TermWin.int_bwidth 1247 if (ev.xbutton.y < TermWin.int_bwidth
1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1248 || 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 { 1249 {
1562 /* only report double clicks */ 1250 int dist;
1563 MEvent.clicks = 2;
1564 mouse_report (ev);
1565 1251
1566 /* don't report the release */ 1252 pending_scroll_selection=1;
1567 MEvent.clicks = 0; 1253
1568 MEvent.button = AnyButton; 1254 /* don't clobber the current delay if we are
1569 } 1255 * already in the middle of scrolling.
1570 }
1571 else
1572 { 1256 */
1573 /* different button, or time expired */ 1257 if (scroll_selection_delay<=0)
1574 MEvent.clicks = 1; 1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1575 MEvent.button = ev->button; 1259
1576 mouse_report (ev); 1260 /* save the event params so we can highlight
1577 } 1261 * 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 { 1262 */
1589 case Button1: 1263 selection_save_x=ev.xbutton.x;
1590 /* allow shift+left click to extend selection */ 1264 selection_save_y=ev.xbutton.y;
1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267
1268 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth)
1592 { 1270 {
1593 if (MEvent.button == Button1 && clickintime) 1271 scroll_selection_dir = UP;
1594 selection_rotate (ev->x, ev->y); 1272 dist = TermWin.int_bwidth - ev.xbutton.y;
1595 else
1596 selection_extend (ev->x, ev->y, 1);
1597 } 1273 }
1598 else 1274 else
1599 { 1275 {
1600 if (MEvent.button == Button1 && clickintime) 1276 scroll_selection_dir = DN;
1601 MEvent.clicks++; 1277 dist = ev.xbutton.y -
1602 else 1278 (TermWin.int_bwidth + TermWin.height);
1603 MEvent.clicks = 1;
1604
1605 selection_click (MEvent.clicks, ev->x, ev->y);
1606 } 1279 }
1280 scroll_selection_lines= (Pixel2Height (dist)/
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1282 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES);
1284 }
1285 else
1286 {
1287 /* we are within the text window, so we
1288 * shouldn't be scrolling
1289 */
1290 pending_scroll_selection = 0;
1291 }
1292#endif
1293#ifdef MOUSE_THRESHOLD
1607 1294
1295 }
1296#endif
1297
1298 }
1299 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1303 MotionNotify, &ev)) ;
1304 XQueryPointer (display->display, scrollBar.win,
1305 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y),
1308 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0;
1313 scrollbar_show (1);
1314 }
1315 break;
1316 }
1317}
1318
1319void
1320rxvt_term::rootwin_cb (XEvent &ev)
1321{
1322 SET_R (this);
1323 SET_LOCALE (locale);
1324
1325 switch (ev.type)
1326 {
1327 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /*
1338 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on.
1340 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return;
1346 }
1347
1348 /* FALLTHROUGH */
1349 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ())
1351 if (am_transparent)
1352 want_full_refresh = 1;
1353 break;
1354#endif
1355 }
1356}
1357
1358void
1359rxvt_term::button_press (XButtonEvent &ev)
1360{
1361 int reportmode = 0, clickintime;
1362
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1366 /*
1367 * VT window processing of button press
1368 */
1369 if (ev.window == TermWin.vt)
1370 {
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1372 if (reportmode)
1373 {
1374 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime)
1379 {
1380 /* same button, within alloted time */
1381 MEvent.clicks++;
1382 if (MEvent.clicks > 1)
1383 {
1384 /* only report double clicks */
1385 MEvent.clicks = 2;
1386 mouse_report (ev);
1387
1388 /* don't report the release */
1389 MEvent.clicks = 0;
1390 MEvent.button = AnyButton;
1391 }
1392 }
1393 else
1394 {
1395 /* different button, or time expired */
1396 MEvent.clicks = 1;
1397 MEvent.button = ev.button;
1398 mouse_report (ev);
1399 }
1400#else
1401 MEvent.button = ev.button;
1402 mouse_report (ev);
1403#endif /* MOUSE_REPORT_DOUBLECLICK */
1404
1405 }
1406 else
1407 {
1408 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0;
1410 switch (ev.button)
1411 {
1412 case Button1:
1413 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1415 {
1416 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y);
1418 else
1419 selection_extend (ev.x, ev.y, 1);
1420 }
1421 else
1422 {
1423 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++;
1425 else
1426 MEvent.clicks = 1;
1427
1428 selection_click (MEvent.clicks, ev.x, ev.y);
1429 }
1430
1608 MEvent.button = Button1; 1431 MEvent.button = Button1;
1432 break;
1433
1434 case Button3:
1435 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y);
1437 else
1438 selection_extend (ev.x, ev.y, 1);
1439 MEvent.button = Button3;
1440 break;
1441 }
1442 }
1443 MEvent.time = ev.time;
1444 return;
1445 }
1446
1447 /*
1448 * Scrollbar window processing of button press
1449 */
1450 if (isScrollbarWindow (ev.window))
1451 {
1452 scrollBar.setIdle ();
1453 /*
1454 * Rxvt-style scrollbar:
1455 * move up if mouse is above slider
1456 * move dn if mouse is below slider
1457 *
1458 * XTerm-style scrollbar:
1459 * Move display proportional to pointer location
1460 * pointer near top -> scroll one line
1461 * pointer near bot -> scroll full page
1462 */
1463#ifndef NO_SCROLLBAR_REPORT
1464 if (reportmode)
1465 {
1466 /*
1467 * Mouse report disabled scrollbar:
1468 * arrow buttons - send up/down
1469 * click on scrollbar - send pageup/down
1470 */
1471 if ((scrollBar.style == R_SB_NEXT
1472 && scrollbarnext_upButton (ev.y))
1473 || (scrollBar.style == R_SB_RXVT
1474 && scrollbarrxvt_upButton (ev.y)))
1475 tt_printf ("\033[A");
1476 else if ((scrollBar.style == R_SB_NEXT
1477 && scrollbarnext_dnButton (ev.y))
1478 || (scrollBar.style == R_SB_RXVT
1479 && scrollbarrxvt_dnButton (ev.y)))
1480 tt_printf ("\033[B");
1481 else
1482 switch (ev.button)
1483 {
1484 case Button2:
1485 tt_printf ("\014");
1486 break;
1487 case Button1:
1488 tt_printf ("\033[6~");
1489 break;
1490 case Button3:
1491 tt_printf ("\033[5~");
1492 break;
1493 }
1494 }
1495 else
1496#endif /* NO_SCROLLBAR_REPORT */
1497
1498 {
1499 char upordown = 0;
1500
1501 if (scrollBar.style == R_SB_NEXT)
1502 {
1503 if (scrollbarnext_upButton (ev.y))
1504 upordown = -1; /* up */
1505 else if (scrollbarnext_dnButton (ev.y))
1506 upordown = 1; /* down */
1507 }
1508 else if (scrollBar.style == R_SB_RXVT)
1509 {
1510 if (scrollbarrxvt_upButton (ev.y))
1511 upordown = -1; /* up */
1512 else if (scrollbarrxvt_dnButton (ev.y))
1513 upordown = 1; /* down */
1514 }
1515 if (upordown)
1516 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1519#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 {
1522 if (upordown < 0)
1523 scrollBar.setUp ();
1524 else
1525 scrollBar.setDn ();
1526 }
1527 }
1528 else
1529 switch (ev.button)
1530 {
1531 case Button2:
1532 switch (scrollbar_align)
1533 {
1534 case R_SB_ALIGN_TOP:
1535 csrO = 0;
1609 break; 1536 break;
1610 1537 case R_SB_ALIGN_CENTRE:
1611 case Button3: 1538 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; 1539 break;
1540 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top;
1542 break;
1543 }
1544 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO,
1548 scrollbar_size ());
1549 scrollBar.setMotion ();
1550 break;
1551
1552 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1554 csrO = ev.y - scrollBar.top;
1555 /* FALLTHROUGH */
1556
1557 case Button3:
1558 if (scrollBar.style != R_SB_XTERM)
1559 {
1560 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1);
1563# else
1564 scr_page (UP, TermWin.nrow / 4);
1565# endif
1566 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1);
1569# else
1570 scr_page (DN, TermWin.nrow / 4);
1571# endif
1572 else
1573 scrollBar.setMotion ();
1574 }
1575 else
1576 {
1577 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow
1579 * scrollbar_position (ev.y)
1580 / scrollbar_size ()));
1581 }
1582 break;
1583 }
1618 } 1584 }
1619 }
1620 MEvent.time = ev->time;
1621 return; 1585 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 } 1586 }
1687 if (upordown) { 1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594}
1595
1596void
1597rxvt_term::button_release (XButtonEvent &ev)
1598{
1599 int reportmode = 0;
1600
1601 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1604
1605 if (scrollbar_isUpDn ())
1606 {
1607 scrollBar.setIdle ();
1608 scrollbar_show (0);
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1610 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 1611#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 1612
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 } 1613 }
1776#ifdef SELECTION_SCROLLING 1614#ifdef SELECTION_SCROLLING
1777 pending_scroll_selection=0; 1615 pending_scroll_selection=0;
1778#endif 1616#endif
1779 if (ev->window == TermWin.vt) 1617 if (ev.window == TermWin.vt)
1780 { 1618 {
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) 1619 if (reportmode)
1788 { 1620 {
1789 /* mouse report from vt window */ 1621 /* mouse report from vt window */
1790 /* don't report release of wheel "buttons" */ 1622 /* don't report release of wheel "buttons" */
1791 if (ev->button >= 4) 1623 if (ev.button >= 4)
1792 return; 1624 return;
1793#ifdef MOUSE_REPORT_DOUBLECLICK 1625#ifdef MOUSE_REPORT_DOUBLECLICK
1794 /* only report the release of 'slow' single clicks */ 1626 /* only report the release of 'slow' single clicks */
1795 if (MEvent.button != AnyButton 1627 if (MEvent.button != AnyButton
1796 && (ev->button != MEvent.button 1628 && (ev.button != MEvent.button
1797 || (ev->time - MEvent.time 1629 || (ev.time - MEvent.time
1798 > MULTICLICK_TIME / 2))) 1630 > MULTICLICK_TIME / 2)))
1799 { 1631 {
1800 MEvent.clicks = 0; 1632 MEvent.clicks = 0;
1801 MEvent.button = AnyButton; 1633 MEvent.button = AnyButton;
1802 mouse_report (ev); 1634 mouse_report (ev);
1803 } 1635 }
1804#else /* MOUSE_REPORT_DOUBLECLICK */ 1636#else /* MOUSE_REPORT_DOUBLECLICK */
1805 MEvent.button = AnyButton; 1637 MEvent.button = AnyButton;
1806 mouse_report (ev); 1638 mouse_report (ev);
1807#endif /* MOUSE_REPORT_DOUBLECLICK */ 1639#endif /* MOUSE_REPORT_DOUBLECLICK */
1808 return; 1640 return;
1809 } 1641 }
1810 /* 1642 /*
1811 * dumb hack to compensate for the failure of click-and-drag 1643 * dumb hack to compensate for the failure of click-and-drag
1812 * when overriding mouse reporting 1644 * when overriding mouse reporting
1813 */ 1645 */
1814 if (PrivateModes & PrivMode_mouse_report 1646 if (PrivateModes & PrivMode_mouse_report
1815 && bypass_keystate 1647 && bypass_keystate
1816 && ev->button == Button1 && MEvent.clicks <= 1) 1648 && ev.button == Button1 && MEvent.clicks <= 1)
1817 selection_extend (ev->x, ev->y, 0); 1649 selection_extend (ev.x, ev.y, 0);
1818 1650
1819 switch (ev->button) { 1651 switch (ev.button)
1652 {
1820 case Button1: 1653 case Button1:
1821 case Button3: 1654 case Button3:
1822 selection_make (ev->time); 1655 selection_make (ev.time);
1823 break; 1656 break;
1824 case Button2: 1657 case Button2:
1825 selection_request (ev->time, ev->x, ev->y); 1658 selection_request (ev.time, ev.x, ev.y);
1826 break; 1659 break;
1827#ifdef MOUSE_WHEEL 1660#ifdef MOUSE_WHEEL
1828 case Button4: 1661 case Button4:
1829 case Button5: 1662 case Button5:
1830 { 1663 {
1831 int i; 1664 int i;
1832 page_dirn v; 1665 page_dirn v;
1833 1666
1834 v = (ev->button == Button4) ? UP : DN; 1667 v = (ev.button == Button4) ? UP : DN;
1835 if (ev->state & ShiftMask) 1668 if (ev.state & ShiftMask)
1836 i = 1; 1669 i = 1;
1837 else if ((Options & Opt_mouseWheelScrollPage)) 1670 else if ((Options & Opt_mouseWheelScrollPage))
1838 i = TermWin.nrow - 1; 1671 i = TermWin.nrow - 1;
1839 else 1672 else
1840 i = 5; 1673 i = 5;
1841# ifdef MOUSE_SLIP_WHEELING 1674# ifdef MOUSE_SLIP_WHEELING
1842 if (ev->state & ControlMask) 1675 if (ev.state & ControlMask)
1843 { 1676 {
1844 mouse_slip_wheel_speed += (v ? -1 : 1); 1677 mouse_slip_wheel_speed += (v ? -1 : 1);
1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1846 } 1679 }
1847# endif 1680# endif
1848# ifdef JUMP_MOUSE_WHEEL 1681# ifdef JUMP_MOUSE_WHEEL
1849 scr_page (v, i); 1682 scr_page (v, i);
1850 scr_refresh (SMOOTH_REFRESH); 1683 scr_refresh (SMOOTH_REFRESH);
1851 scrollbar_show (1); 1684 scrollbar_show (1);
1852# else 1685# else
1853 while (i--) 1686 while (i--)
1854 { 1687 {
1855 scr_page (v, 1); 1688 scr_page (v, 1);
1856 scr_refresh (SMOOTH_REFRESH); 1689 scr_refresh (SMOOTH_REFRESH);
1857 scrollbar_show (1); 1690 scrollbar_show (1);
1858 } 1691 }
1859# endif 1692# endif
1860 } 1693
1861 break; 1694 }
1695 break;
1862#endif 1696#endif
1863 } 1697
1864 }
1865 } 1698 }
1699 }
1866#ifdef MENUBAR 1700#ifdef MENUBAR
1867 else if (isMenuBarWindow(ev->window)) 1701 else if (isMenuBarWindow (ev.window))
1868 menubar_control (ev); 1702 menubar_control (ev);
1869#endif 1703#endif
1870} 1704}
1871 1705
1872 1706
1873#ifdef TRANSPARENT 1707#ifdef TRANSPARENT
… …
1876 * Do transparency updates if required 1710 * Do transparency updates if required
1877 */ 1711 */
1878int 1712int
1879rxvt_term::check_our_parents () 1713rxvt_term::check_our_parents ()
1880{ 1714{
1881 int i, pchanged, aformat, have_pixmap, rootdepth; 1715 int i, pchanged, aformat, have_pixmap, rootdepth;
1882 unsigned long nitems, bytes_after; 1716 unsigned long nitems, bytes_after;
1883 Atom atype; 1717 Atom atype;
1884 unsigned char *prop = NULL; 1718 unsigned char *prop = NULL;
1885 Window root, oldp, *list; 1719 Window root, oldp, *list;
1886 Pixmap rootpixmap = None; 1720 Pixmap rootpixmap = None;
1887 XWindowAttributes wattr, wrootattr; 1721 XWindowAttributes wattr, wrootattr;
1888 1722
1889 pchanged = 0; 1723 pchanged = 0;
1890 1724
1891 if (!(Options & Opt_transparent)) 1725 if (! (Options & Opt_transparent))
1892 return pchanged; /* Don't try any more */ 1726 return pchanged; /* Don't try any more */
1893 1727
1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1728 XGetWindowAttributes (display->display, display->root, &wrootattr);
1895 rootdepth = wrootattr.depth; 1729 rootdepth = wrootattr.depth;
1896 1730
1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1898 if (rootdepth != wattr.depth) { 1732 if (rootdepth != wattr.depth)
1733 {
1899 if (am_transparent) { 1734 if (am_transparent)
1735 {
1900 pchanged = 1; 1736 pchanged = 1;
1901 XSetWindowBackground(Xdisplay, TermWin.vt, 1737 XSetWindowBackground (display->display, TermWin.vt,
1902 PixColors[Color_bg]); 1738 PixColors[Color_bg]);
1903 am_transparent = am_pixmap_trans = 0; 1739 am_transparent = am_pixmap_trans = 0;
1904 } 1740 }
1905 return pchanged; /* Don't try any more */ 1741 return pchanged; /* Don't try any more */
1906 } 1742 }
1907 1743
1908/* Get all X ops out of the queue so that our information is up-to-date. */ 1744 /* Get all X ops out of the queue so that our information is up-to-date. */
1909 XSync(Xdisplay, False); 1745 XSync (display->display, False);
1910 1746
1747 /*
1748 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that.
1751 */
1752 i = (xa[XA_XROOTPMAPID] != 0
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success));
1756 if (!i || prop == NULL)
1757 have_pixmap = 0;
1758 else
1759 {
1760 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop);
1762 XFree (prop);
1763 }
1764 if (have_pixmap)
1765 {
1766 /*
1767 * Copy display->root pixmap transparency
1768 */
1769 int sx, sy, nx, ny;
1770 unsigned int nw, nh;
1771 Window cr;
1772 XImage *image;
1773 GC gc;
1774 XGCValues gcvalue;
1775
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height;
1780 nx = ny = 0;
1781
1782 if (sx < 0)
1783 {
1784 nw += sx;
1785 nx = -sx;
1786 sx = 0;
1787 }
1788
1789 if (sy < 0)
1790 {
1791 nh += sy;
1792 ny = -sy;
1793 sy = 0;
1794 }
1795
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1800 ZPixmap);
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */
1803 allowedxerror = 0;
1804 if (image == NULL)
1805 {
1806 if (am_transparent && am_pixmap_trans)
1807 {
1808 pchanged = 1;
1809 if (TermWin.pixmap != None)
1810 {
1811 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None;
1813 }
1814 }
1815 am_pixmap_trans = 0;
1816 }
1817 else
1818 {
1819 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap);
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height,
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height);
1829 XFreeGC (display->display, gc);
1830 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1832 TermWin.pixmap);
1833 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1;
1835 am_transparent = am_pixmap_trans = 1;
1836 }
1837 }
1838
1839 if (!am_pixmap_trans)
1840 {
1841 unsigned int n;
1842 /*
1843 * InheritPixmap transparency
1844 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1847 i++)
1848 {
1849 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n);
1852 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
1854 if (TermWin.parent[i] == display->root)
1855 {
1856 if (oldp != None)
1857 pchanged = 1;
1858 break;
1859 }
1860 if (oldp != TermWin.parent[i])
1861 pchanged = 1;
1862 }
1863
1864 n = 0;
1865
1866 if (pchanged)
1867 {
1868 for (; n < (unsigned int)i; n++)
1869 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break;
1876 }
1877 }
1878 }
1879
1880 if (n > (int) (sizeof (TermWin.parent)
1881 / sizeof (TermWin.parent[0])))
1882 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0],
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */
1890 }
1891 else
1892 {
1893 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1);
1903# endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
1907 ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1909 ParentRelative);
1910 am_transparent = 1;
1911 }
1912
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None;
1915 }
1916 return pchanged;
1917}
1918#endif
1919
1920/*}}} */
1921
1922bool
1923rxvt_term::cmd_parse ()
1924{
1925 bool flag = false;
1926 unicode_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here
1928
1929 for (;;)
1930 {
1931 if (ch == NOCHAR)
1932 {
1933 seq_begin = cmdbuf_ptr;
1934 ch = next_char ();
1935 }
1936
1937 if (ch == NOCHAR) // TODO: improve
1938 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 {
1942 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false;
1945 int nlines = 0;
1946 unicode_t *str = buf;
1947
1948 *str++ = ch;
1949
1950 for (;;)
1951 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
1956 break;
1957
1958 *str++ = ch;
1959
1960 if (ch == '\n')
1961 {
1962 nlines++;
1963 refresh_count++;
1964
1965 if (! (Options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
1967 {
1968 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR;
1971 break;
1972 }
1973
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1)
1976 {
1977 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0;
1979 str = buf;
1980 }
1981 }
1982
1983 if (str >= buf + UBUFSIZ)
1984 {
1985 ch = NOCHAR;
1986 break;
1987 }
1988 }
1989
1990 scr_add_lines (buf, nlines, str - buf);
1991
1992 /*
1993 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */
2001 if (refreshnow)
2002 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type);
2007 }
2008
2009 }
2010 else
2011 {
2012 try
2013 {
2014 process_nonprinting (ch);
2015 }
2016 catch (const class out_of_input &o)
2017 {
2018 // we ran out of input, retry later
2019 cmdbuf_ptr = seq_begin;
2020 break;
2021 }
2022
2023 ch = NOCHAR;
2024 }
2025 }
2026
2027 return flag;
2028}
2029
2030// read the next character
2031unicode_t
2032rxvt_term::next_char ()
2033{
2034 while (cmdbuf_ptr < cmdbuf_endp)
2035 {
2036 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++;
2039
2040 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042
2043 if (len == (size_t)-2)
2044 {
2045 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp;
2047 break;
2048 }
2049
2050 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052
2053 // assume wchar == unicode
2054 cmdbuf_ptr += len;
2055 return wc;
2056 }
2057
2058 return NOCHAR;
2059}
2060
2061/* rxvt_cmd_getc () - Return next input character */
1911/* 2062/*
1912 * Make the frame window set by the window manager have 2063 * Return the next input character after first passing any keyboard input
1913 * the root background. Some window managers put multiple nested frame 2064 * to the command.
1914 * windows for each client, so we have to take care about that.
1915 */ 2065 */
1916 i = (xa[XA_XROOTPMAPID] != 0 2066unicode_t
1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 2067rxvt_term::cmd_getc ()
1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2068{
1919 &nitems, &bytes_after, &prop) == Success)); 2069 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 2070
1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2071 if (c == NOCHAR)
1939 0, 0, &sx, &sy, &cr); 2072 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 2073
2037 rqt.tv_sec = 1; 2074 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} 2075}
2056#endif
2057
2058/*}}} */
2059 2076
2060/*{{{ print pipe */ 2077/*{{{ print pipe */
2061/*----------------------------------------------------------------------*/ 2078/*----------------------------------------------------------------------*/
2062#ifdef PRINTPIPE 2079#ifdef PRINTPIPE
2063FILE * 2080FILE *
2064rxvt_term::popen_printer () 2081rxvt_term::popen_printer ()
2065{ 2082{
2066 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2083 FILE *stream = popen (rs[Rs_print_pipe], "w");
2067 2084
2068 if (stream == NULL) 2085 if (stream == NULL)
2069 rxvt_print_error("can't open printer pipe"); 2086 rxvt_warn ("can't open printer pipe, not printing.\n");
2087
2070 return stream; 2088 return stream;
2071} 2089}
2072 2090
2073int 2091int
2074rxvt_term::pclose_printer (FILE *stream) 2092rxvt_term::pclose_printer (FILE *stream)
2075{ 2093{
2076 fflush (stream); 2094 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); 2095 return pclose (stream);
2083# endif
2084} 2096}
2085 2097
2086/* 2098/*
2087 * simulate attached vt100 printer 2099 * simulate attached vt100 printer
2088 */ 2100 */
2089void 2101void
2090rxvt_term::process_print_pipe () 2102rxvt_term::process_print_pipe ()
2091{ 2103{
2092 int done; 2104 int done;
2093 FILE *fd; 2105 FILE *fd;
2094 2106
2095 if ((fd = popen_printer ()) == NULL) 2107 if ((fd = popen_printer ()) == NULL)
2096 return; 2108 return;
2097 2109
2098/* 2110 /*
2099 * Send all input to the printer until either ESC[4i or ESC[?4i 2111 * Send all input to the printer until either ESC[4i or ESC[?4i
2100 * is received. 2112 * is received.
2101 */ 2113 */
2102 for (done = 0; !done;) { 2114 for (done = 0; !done;)
2115 {
2103 unsigned char buf[8]; 2116 unsigned char buf[8];
2104 unsigned char ch; 2117 unicode_t ch;
2105 unsigned int i, len; 2118 unsigned int i, len;
2106 2119
2107 if ((ch = cmd_getc ()) != C0_ESC) { 2120 if ((ch = cmd_getc ()) != C0_ESC)
2121 {
2108 if (putc(ch, fd) == EOF) 2122 if (putc (ch, fd) == EOF)
2109 break; /* done = 1 */ 2123 break; /* done = 1 */
2110 } else { 2124 }
2125 else
2126 {
2111 len = 0; 2127 len = 0;
2112 buf[len++] = ch; 2128 buf[len++] = ch;
2113 2129
2114 if ((buf[len++] = cmd_getc ()) == '[') { 2130 if ((buf[len++] = cmd_getc ()) == '[')
2131 {
2115 if ((ch = cmd_getc ()) == '?') { 2132 if ((ch = cmd_getc ()) == '?')
2116 buf[len++] = '?'; 2133 {
2117 ch = cmd_getc (); 2134 buf[len++] = '?';
2118 } 2135 ch = cmd_getc ();
2136 }
2119 if ((buf[len++] = ch) == '4') { 2137 if ((buf[len++] = ch) == '4')
2138 {
2120 if ((buf[len++] = cmd_getc ()) == 'i') 2139 if ((buf[len++] = cmd_getc ()) == 'i')
2121 break; /* done = 1 */ 2140 break; /* done = 1 */
2122 } 2141 }
2142 }
2143
2144 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF)
2146 {
2147 done = 1;
2148 break;
2149 }
2150 }
2123 } 2151 }
2124 for (i = 0; i < len; i++) 2152
2125 if (putc(buf[i], fd) == EOF) {
2126 done = 1;
2127 break;
2128 }
2129 }
2130 }
2131 pclose_printer (fd); 2153 pclose_printer (fd);
2132} 2154}
2133#endif /* PRINTPIPE */ 2155#endif /* PRINTPIPE */
2134/*}}} */ 2156/*}}} */
2135 2157
2136/* *INDENT-OFF* */ 2158/* *INDENT-OFF* */
2137enum { 2159enum {
2138 C1_40 = 0x40, 2160 C1_40 = 0x40,
2139 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2161 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, 2162 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, 2163 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 2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2143}; 2165};
2144/* *INDENT-ON* */ 2166/* *INDENT-ON* */
2145 2167
2146/*{{{ process non-printing single characters */ 2168/*{{{ process non-printing single characters */
2147void 2169void
2148rxvt_term::process_nonprinting (unsigned char ch) 2170rxvt_term::process_nonprinting (unicode_t ch)
2149{ 2171{
2150 switch (ch) { 2172 switch (ch)
2173 {
2174 case C0_ESC:
2175 process_escape_seq ();
2176 break;
2151 case C0_ENQ: /* terminal Status */ 2177 case C0_ENQ: /* terminal Status */
2152 if (rs[Rs_answerbackstring]) 2178 if (rs[Rs_answerbackstring])
2153 tt_write( 2179 tt_write (
2154 (const unsigned char *)rs[Rs_answerbackstring], 2180 (const unsigned char *)rs[Rs_answerbackstring],
2155 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2156 else 2182 else
2157 tt_write((unsigned char *)VT100_ANS, 2183 tt_write ((unsigned char *)VT100_ANS,
2158 (unsigned int)STRLEN(VT100_ANS)); 2184 (unsigned int)STRLEN (VT100_ANS));
2159 break; 2185 break;
2160 case C0_BEL: /* bell */ 2186 case C0_BEL: /* bell */
2161 scr_bell (); 2187 scr_bell ();
2162 break; 2188 break;
2163 case C0_BS: /* backspace */ 2189 case C0_BS: /* backspace */
2164 scr_backspace (); 2190 scr_backspace ();
2165 break; 2191 break;
2166 case C0_HT: /* tab */ 2192 case C0_HT: /* tab */
2167 scr_tab (1); 2193 scr_tab (1);
2168 break; 2194 break;
2169 case C0_CR: /* carriage return */ 2195 case C0_CR: /* carriage return */
2170 scr_gotorc (0, 0, R_RELATIVE); 2196 scr_gotorc (0, 0, R_RELATIVE);
2171 break; 2197 break;
2172 case C0_VT: /* vertical tab, form feed */ 2198 case C0_VT: /* vertical tab, form feed */
2173 case C0_FF: 2199 case C0_FF:
2174 case C0_LF: /* line feed */ 2200 case C0_LF: /* line feed */
2175 scr_index (UP); 2201 scr_index (UP);
2176 break; 2202 break;
2177 case C0_SO: /* shift out - acs */ 2203 case C0_SO: /* shift out - acs */
2178 scr_charset_choose (1); 2204 scr_charset_choose (1);
2179 break; 2205 break;
2180 case C0_SI: /* shift in - acs */ 2206 case C0_SI: /* shift in - acs */
2181 scr_charset_choose (0); 2207 scr_charset_choose (0);
2182 break; 2208 break;
2209
2210 // 8-bit controls
2211 case 0x90: /* DCS */
2212 process_dcs_seq ();
2213 break;
2214 case 0x9b: /* CSI */
2215 process_csi_seq ();
2216 break;
2217 case 0x9d: /* CSI */
2218 process_osc_seq ();
2219 break;
2183 } 2220 }
2184} 2221}
2185/*}}} */ 2222/*}}} */
2186 2223
2187 2224
2188/*{{{ process VT52 escape sequences */ 2225/*{{{ process VT52 escape sequences */
2189void 2226void
2190rxvt_term::process_escape_vt52 (unsigned char ch) 2227rxvt_term::process_escape_vt52 (unicode_t ch)
2191{ 2228{
2192 int row, col; 2229 int row, col;
2230
2231 switch (ch)
2193 2232 {
2194 switch (ch) {
2195 case 'A': /* cursor up */ 2233 case 'A': /* cursor up */
2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2234 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2197 break; 2235 break;
2198 case 'B': /* cursor down */ 2236 case 'B': /* cursor down */
2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2237 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2200 break; 2238 break;
2201 case 'C': /* cursor right */ 2239 case 'C': /* cursor right */
2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2240 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2203 break; 2241 break;
2204 case 'D': /* cursor left */ 2242 case 'D': /* cursor left */
2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2243 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2206 break; 2244 break;
2207 case 'H': /* cursor home */ 2245 case 'H': /* cursor home */
2208 scr_gotorc (0, 0, 0); 2246 scr_gotorc (0, 0, 0);
2209 break; 2247 break;
2210 case 'I': /* cursor up and scroll down if needed */ 2248 case 'I': /* cursor up and scroll down if needed */
2211 scr_index (DN); 2249 scr_index (DN);
2212 break; 2250 break;
2213 case 'J': /* erase to end of screen */ 2251 case 'J': /* erase to end of screen */
2214 scr_erase_screen (0); 2252 scr_erase_screen (0);
2215 break; 2253 break;
2216 case 'K': /* erase to end of line */ 2254 case 'K': /* erase to end of line */
2217 scr_erase_line (0); 2255 scr_erase_line (0);
2218 break; 2256 break;
2219 case 'Y': /* move to specified row and col */ 2257 case 'Y': /* move to specified row and col */
2220 /* full command is 'ESC Y row col' where row and col 2258 /* full command is 'ESC Y row col' where row and col
2221 * are encoded by adding 32 and sending the ascii 2259 * are encoded by adding 32 and sending the ascii
2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2260 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2223 * etc. */ 2261 * etc. */
2224 row = cmd_getc () - ' '; 2262 row = cmd_getc () - ' ';
2225 col = cmd_getc () - ' '; 2263 col = cmd_getc () - ' ';
2226 scr_gotorc (row, col, 0); 2264 scr_gotorc (row, col, 0);
2227 break; 2265 break;
2228 case 'Z': /* identify the terminal type */ 2266 case 'Z': /* identify the terminal type */
2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2267 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2230 break; 2268 break;
2231 case '<': /* turn off VT52 mode */ 2269 case '<': /* turn off VT52 mode */
2232 PrivMode(0, PrivMode_vt52); 2270 PrivMode (0, PrivMode_vt52);
2233 break; 2271 break;
2234 case 'F': /* use special graphics character set */ 2272 case 'F': /* use special graphics character set */
2235 case 'G': /* use regular character set */ 2273 case 'G': /* use regular character set */
2236 /* unimplemented */ 2274 /* unimplemented */
2237 break; 2275 break;
2238 case '=': /* use alternate keypad mode */ 2276 case '=': /* use alternate keypad mode */
2239 case '>': /* use regular keypad mode */ 2277 case '>': /* use regular keypad mode */
2240 /* unimplemented */ 2278 /* unimplemented */
2241 break; 2279 break;
2242 } 2280 }
2243} 2281}
2244/*}}} */ 2282/*}}} */
2245 2283
2246 2284
2247/*{{{ process escape sequences */ 2285/*{{{ process escape sequences */
2248void 2286void
2249rxvt_term::process_escape_seq () 2287rxvt_term::process_escape_seq ()
2250{ 2288{
2251 unsigned char ch = cmd_getc (); 2289 unicode_t ch = cmd_getc ();
2252 2290
2253 if (PrivateModes & PrivMode_vt52) { 2291 if (PrivateModes & PrivMode_vt52)
2254 process_escape_vt52 (ch);
2255 return;
2256 }
2257 2292 {
2293 process_escape_vt52 (ch);
2294 return;
2295 }
2296
2258 switch (ch) { 2297 switch (ch)
2298 {
2259 /* case 1: do_tek_mode (); break; */ 2299 /* case 1: do_tek_mode (); break; */
2260 case '#': 2300 case '#':
2261 if (cmd_getc () == '8') 2301 if (cmd_getc () == '8')
2262 scr_E (); 2302 scr_E ();
2263 break; 2303 break;
2264 case '(': 2304 case '(':
2265 scr_charset_set (0, (unsigned int)cmd_getc ()); 2305 scr_charset_set (0, (unsigned int)cmd_getc ());
2266 break; 2306 break;
2267 case ')': 2307 case ')':
2268 scr_charset_set (1, (unsigned int)cmd_getc ()); 2308 scr_charset_set (1, (unsigned int)cmd_getc ());
2269 break; 2309 break;
2270 case '*': 2310 case '*':
2271 scr_charset_set (2, (unsigned int)cmd_getc ()); 2311 scr_charset_set (2, (unsigned int)cmd_getc ());
2272 break; 2312 break;
2273 case '+': 2313 case '+':
2274 scr_charset_set (3, (unsigned int)cmd_getc ()); 2314 scr_charset_set (3, (unsigned int)cmd_getc ());
2275 break; 2315 break;
2276#ifdef MULTICHAR_SET
2277 case '$':
2278 scr_charset_set (-2, (unsigned int)cmd_getc ());
2279 break;
2280#endif
2281#ifndef NO_FRILLS 2316#ifndef NO_FRILLS
2282 case '6': 2317 case '6':
2283 scr_backindex (); 2318 scr_backindex ();
2284 break; 2319 break;
2285#endif 2320#endif
2286 case '7': 2321 case '7':
2287 scr_cursor (SAVE); 2322 scr_cursor (SAVE);
2288 break; 2323 break;
2289 case '8': 2324 case '8':
2290 scr_cursor (RESTORE); 2325 scr_cursor (RESTORE);
2291 break; 2326 break;
2292#ifndef NO_FRILLS 2327#ifndef NO_FRILLS
2293 case '9': 2328 case '9':
2294 scr_forwardindex (); 2329 scr_forwardindex ();
2295 break; 2330 break;
2296#endif 2331#endif
2297 case '=': 2332 case '=':
2298 case '>': 2333 case '>':
2299 PrivMode((ch == '='), PrivMode_aplKP); 2334 PrivMode ((ch == '='), PrivMode_aplKP);
2300 break; 2335 break;
2301 2336
2302 case C1_40: 2337 case C1_40:
2303 cmd_getc (); 2338 cmd_getc ();
2304 break; 2339 break;
2305 case C1_44: 2340 case C1_44:
2306 scr_index (UP); 2341 scr_index (UP);
2307 break; 2342 break;
2308 2343
2309 /* 8.3.87: NEXT LINE */ 2344 /* 8.3.87: NEXT LINE */
2310 case C1_NEL: /* ESC E */ 2345 case C1_NEL: /* ESC E */
2311 { 2346 {
2312 uint32_t nlcr[] = { '\n', '\r' }; 2347 unicode_t nlcr[] = { L'\n', L'\r' };
2313 scr_add_lines (nlcr, 1, 2); 2348 scr_add_lines (nlcr, 1, 2);
2314 } 2349 }
2315 break; 2350 break;
2316 2351
2317 /* kidnapped escape sequence: Should be 8.3.48 */ 2352 /* kidnapped escape sequence: Should be 8.3.48 */
2318 case C1_ESA: /* ESC G */ 2353 case C1_ESA: /* ESC G */
2319 process_graphics (); 2354 process_graphics ();
2320 break; 2355 break;
2321 2356
2322 /* 8.3.63: CHARACTER TABULATION SET */ 2357 /* 8.3.63: CHARACTER TABULATION SET */
2323 case C1_HTS: /* ESC H */ 2358 case C1_HTS: /* ESC H */
2324 scr_set_tab (1); 2359 scr_set_tab (1);
2325 break; 2360 break;
2326 2361
2327 /* 8.3.105: REVERSE LINE FEED */ 2362 /* 8.3.105: REVERSE LINE FEED */
2328 case C1_RI: /* ESC M */ 2363 case C1_RI: /* ESC M */
2329 scr_index (DN); 2364 scr_index (DN);
2330 break; 2365 break;
2331 2366
2332 /* 8.3.142: SINGLE-SHIFT TWO */ 2367 /* 8.3.142: SINGLE-SHIFT TWO */
2333 /*case C1_SS2: scr_single_shift (2); break; */ 2368 /*case C1_SS2: scr_single_shift (2); break; */
2334 2369
2335 /* 8.3.143: SINGLE-SHIFT THREE */ 2370 /* 8.3.143: SINGLE-SHIFT THREE */
2336 /*case C1_SS3: scr_single_shift (3); break; */ 2371 /*case C1_SS3: scr_single_shift (3); break; */
2337 2372
2338 /* 8.3.27: DEVICE CONTROL STRING */ 2373 /* 8.3.27: DEVICE CONTROL STRING */
2339 case C1_DCS: /* ESC P */ 2374 case C1_DCS: /* ESC P */
2340 process_dcs_seq (); 2375 process_dcs_seq ();
2341 break; 2376 break;
2342 2377
2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2344 case C1_SCI: /* ESC Z */ 2379 case C1_SCI: /* ESC Z */
2345 tt_write((const unsigned char *)ESCZ_ANSWER, 2380 tt_write ((const unsigned char *)ESCZ_ANSWER,
2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2347 break; /* steal obsolete ESC [ c */ 2382 break; /* steal obsolete ESC [ c */
2348 2383
2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2350 case C1_CSI: /* ESC [ */ 2385 case C1_CSI: /* ESC [ */
2351 process_csi_seq (); 2386 process_csi_seq ();
2352 break; 2387 break;
2353 2388
2354 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2389 /* 8.3.90: OPERATING SYSTEM COMMAND */
2355 case C1_OSC: /* ESC ] */ 2390 case C1_OSC: /* ESC ] */
2356 process_osc_seq (); 2391 process_osc_seq ();
2357 break; 2392 break;
2358 2393
2359 /* 8.3.106: RESET TO INITIAL STATE */ 2394 /* 8.3.106: RESET TO INITIAL STATE */
2360 case 'c': 2395 case 'c':
2361 scr_poweron (); 2396 scr_poweron ();
2362 scrollbar_show (1); 2397 scrollbar_show (1);
2363 break; 2398 break;
2364 2399
2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2366 case 'n': 2401 case 'n':
2367 scr_charset_choose (2); 2402 scr_charset_choose (2);
2368 break; 2403 break;
2369 2404
2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2405 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2371 case 'o': 2406 case 'o':
2372 scr_charset_choose (3); 2407 scr_charset_choose (3);
2373 break; 2408 break;
2374 } 2409 }
2375} 2410}
2376/*}}} */ 2411/*}}} */
2377 2412
2378/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2379/* *INDENT-OFF* */ 2414/* *INDENT-OFF* */
2380enum { 2415enum {
2381 CSI_ICH = 0x40, 2416 CSI_ICH = 0x40,
2382 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2417 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 , 2418 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, 2419 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, 2420 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, 2421 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, 2422 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 , 2423 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 2424 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2390}; 2425};
2391 2426
2392#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2427#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2393 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2428 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2394 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2429 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2395#define get_byte_array_bit(array, bit) \ 2430#define get_byte_array_bit(array, bit) \
2396 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2431 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2397 2432
2398const unsigned char csi_defaults[] = { 2433const unsigned char csi_defaults[] =
2434 {
2399 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2435 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, */ 2436 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, */ 2437 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, [, \, ], ^, _, */ 2438 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, */ 2439 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, */ 2440 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, */ 2441 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, {, |, }, ~, */ 2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2407}; 2443 };
2408/* *INDENT-ON* */ 2444/* *INDENT-ON* */
2409 2445
2410void 2446void
2411rxvt_term::process_csi_seq () 2447rxvt_term::process_csi_seq ()
2412{ 2448{
2413 unsigned char ch, priv, i; 2449 unicode_t ch, priv, i;
2414 unsigned int nargs, p; 2450 unsigned int nargs, p;
2415 int n, ndef; 2451 int n, ndef;
2416 int arg[ESC_ARGS]; 2452 int arg[ESC_ARGS];
2417 2453
2418 for (nargs = ESC_ARGS; nargs > 0;) 2454 for (nargs = ESC_ARGS; nargs > 0;)
2419 arg[--nargs] = 0; 2455 arg[--nargs] = 0;
2420 2456
2421 priv = 0; 2457 priv = 0;
2458 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?')
2460 { /* '<' '=' '>' '?' */
2461 priv = ch;
2422 ch = cmd_getc (); 2462 ch = cmd_getc ();
2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2424 priv = ch;
2425 ch = cmd_getc ();
2426 } 2463 }
2464
2427/* read any numerical arguments */ 2465 /* read any numerical arguments */
2428 for (n = -1; ch < CSI_ICH; ) { 2466 for (n = -1; ch < CSI_ICH; )
2467 {
2429 if (isdigit(ch)) { 2468 if (isdigit (ch))
2469 {
2430 if (n < 0) 2470 if (n < 0)
2431 n = ch - '0'; 2471 n = ch - '0';
2432 else 2472 else
2433 n = n * 10 + ch - '0'; 2473 n = n * 10 + ch - '0';
2474 }
2434 } else if (ch == ';') { 2475 else if (ch == ';')
2476 {
2435 if (nargs < ESC_ARGS) 2477 if (nargs < ESC_ARGS)
2436 arg[nargs++] = n; 2478 arg[nargs++] = n;
2437 n = -1; 2479 n = -1;
2438 } else if (ch == '\b') { 2480 }
2439 scr_backspace (); 2481 else if (IS_CONTROL (ch))
2440 } else if (ch == C0_ESC) { 2482 process_nonprinting (ch);
2441 process_escape_seq (); 2483
2484 ch = cmd_getc ();
2485 }
2486
2487 if (ch > CSI_7F)
2442 return; 2488 return;
2443 } else if (ch < ' ') {
2444 process_nonprinting (ch);
2445 }
2446 ch = cmd_getc ();
2447 }
2448 2489
2449 if (ch > CSI_7F)
2450 return;
2451
2452 if (nargs < ESC_ARGS) 2490 if (nargs < ESC_ARGS)
2453 arg[nargs++] = n; 2491 arg[nargs++] = n;
2454 2492
2455 i = ch - CSI_ICH; 2493 i = ch - CSI_ICH;
2456 ndef = get_byte_array_bit(csi_defaults, i); 2494 ndef = get_byte_array_bit (csi_defaults, i);
2457 for (p = 0; p < nargs; p++) 2495 for (p = 0; p < nargs; p++)
2458 if (arg[p] == -1) 2496 if (arg[p] == -1)
2459 arg[p] = ndef; 2497 arg[p] = ndef;
2460 2498
2461#ifdef DEBUG_CMD 2499#ifdef DEBUG_CMD
2462 fprintf(stderr, "CSI "); 2500 fprintf (stderr, "CSI ");
2463 for (p = 0; p < nargs; p++) 2501 for (p = 0; p < nargs; p++)
2464 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2502 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2465 fprintf(stderr, "%c\n", ch); 2503 fprintf (stderr, "%c\n", ch);
2466#endif 2504#endif
2467 2505
2468/* 2506 /*
2469 * private mode handling 2507 * private mode handling
2470 */ 2508 */
2471 if (priv) { 2509 if (priv)
2472 switch (priv) { 2510 {
2473 case '>': 2511 switch (priv)
2512 {
2513 case '>':
2474 if (ch == CSI_DA) /* secondary device attributes */ 2514 if (ch == CSI_DA) /* secondary device attributes */
2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2476 break; 2516 break;
2477 case '?': 2517 case '?':
2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2479 process_terminal_mode (ch, priv, nargs, arg); 2519 process_terminal_mode (ch, priv, nargs, arg);
2480 break; 2520 break;
2481 } 2521 }
2482 return; 2522 return;
2483 } 2523 }
2484 2524
2485 switch (ch) { 2525 switch (ch)
2486/* 2526 {
2527 /*
2487 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2528 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2488 */ 2529 */
2489#ifdef PRINTPIPE 2530#ifdef PRINTPIPE
2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2531 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2491 switch (arg[0]) { 2532 switch (arg[0])
2533 {
2492 case 0: /* initiate transfer to primary aux device */ 2534 case 0: /* initiate transfer to primary aux device */
2493 scr_printscreen (0); 2535 scr_printscreen (0);
2494 break; 2536 break;
2495 case 5: /* start relay to primary aux device */ 2537 case 5: /* start relay to primary aux device */
2496 process_print_pipe (); 2538 process_print_pipe ();
2539 break;
2540 }
2497 break; 2541 break;
2498 }
2499 break;
2500#endif 2542#endif
2501 2543
2502 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2544 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2545 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2504 arg[0] = -arg[0]; 2546 arg[0] = -arg[0];
2505 /* FALLTHROUGH */ 2547 /* FALLTHROUGH */
2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2548 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2549 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2508 scr_gotorc (arg[0], 0, RELATIVE); 2550 scr_gotorc (arg[0], 0, RELATIVE);
2509 break; 2551 break;
2510 2552
2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2553 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2554 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2513#ifdef ISO6429 2555#ifdef ISO6429
2514 arg[0] = -arg[0]; 2556 arg[0] = -arg[0];
2515#else /* emulate common DEC VTs */ 2557#else /* emulate common DEC VTs */
2516 arg[0] = arg[0] ? -arg[0] : -1; 2558 arg[0] = arg[0] ? -arg[0] : -1;
2517#endif 2559#endif
2518 /* FALLTHROUGH */ 2560 /* FALLTHROUGH */
2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2561 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2562 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2521#ifdef ISO6429 2563#ifdef ISO6429
2522 scr_gotorc (0, arg[0], RELATIVE); 2564 scr_gotorc (0, arg[0], RELATIVE);
2523#else /* emulate common DEC VTs */ 2565#else /* emulate common DEC VTs */
2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2566 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2525#endif 2567#endif
2526 break; 2568 break;
2527 2569
2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2570 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2529 arg[0] = -arg[0]; 2571 arg[0] = -arg[0];
2530 /* FALLTHROUGH */ 2572 /* FALLTHROUGH */
2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2573 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2532 scr_gotorc (arg[0], 0, R_RELATIVE); 2574 scr_gotorc (arg[0], 0, R_RELATIVE);
2533 break; 2575 break;
2534 2576
2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2577 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2578 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2579 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2538 break; 2580 break;
2539 2581
2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2582 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2583 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2542 break; 2584 break;
2543 2585
2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2586 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2545 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2587 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); 2588 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2547 break; 2589 break;
2548 2590
2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2591 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2550 arg[0] = -arg[0]; 2592 arg[0] = -arg[0];
2551 /* FALLTHROUGH */ 2593 /* FALLTHROUGH */
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2594 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 scr_tab (arg[0]); 2595 scr_tab (arg[0]);
2554 break; 2596 break;
2555 2597
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2598 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 scr_erase_screen (arg[0]); 2599 scr_erase_screen (arg[0]);
2558 break; 2600 break;
2559 2601
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2602 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 scr_erase_line (arg[0]); 2603 scr_erase_line (arg[0]);
2562 break; 2604 break;
2563 2605
2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2606 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2565 scr_insdel_chars (arg[0], INSERT); 2607 scr_insdel_chars (arg[0], INSERT);
2566 break; 2608 break;
2567 2609
2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2610 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2569 scr_insdel_lines (arg[0], INSERT); 2611 scr_insdel_lines (arg[0], INSERT);
2570 break; 2612 break;
2571 2613
2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2614 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2573 scr_insdel_lines (arg[0], DELETE); 2615 scr_insdel_lines (arg[0], DELETE);
2574 break; 2616 break;
2575 2617
2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2618 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2577 scr_insdel_chars (arg[0], ERASE); 2619 scr_insdel_chars (arg[0], ERASE);
2578 break; 2620 break;
2579 2621
2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2622 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2581 scr_insdel_chars (arg[0], DELETE); 2623 scr_insdel_chars (arg[0], DELETE);
2582 break; 2624 break;
2583 2625
2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2585 arg[0] = -arg[0]; 2627 arg[0] = -arg[0];
2586 /* FALLTHROUGH */ 2628 /* FALLTHROUGH */
2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2589 break; 2631 break;
2590 2632
2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2592 tt_write((const unsigned char *)VT100_ANS, 2634 tt_write ((const unsigned char *)VT100_ANS,
2593 (unsigned int)(sizeof(VT100_ANS) - 1)); 2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2594 break; 2636 break;
2595 2637
2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2597 process_sgr_mode (nargs, arg); 2639 process_sgr_mode (nargs, arg);
2598 break; 2640 break;
2599 2641
2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2642 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2601 switch (arg[0]) { 2643 switch (arg[0])
2644 {
2602 case 5: /* DSR requested */ 2645 case 5: /* DSR requested */
2603 tt_printf("\033[0n"); 2646 tt_printf ("\033[0n");
2604 break; 2647 break;
2605 case 6: /* CPR requested */ 2648 case 6: /* CPR requested */
2606 scr_report_position (); 2649 scr_report_position ();
2607 break; 2650 break;
2608#if defined (ENABLE_DISPLAY_ANSWER) 2651#if defined (ENABLE_DISPLAY_ANSWER)
2609 case 7: /* unofficial extension */ 2652 case 7: /* unofficial extension */
2610 tt_printf("%-.250s\n", rs[Rs_display_name]); 2653 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2611 break; 2654 break;
2612#endif 2655#endif
2613 case 8: /* unofficial extension */ 2656 case 8: /* unofficial extension */
2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break;
2659 }
2615 break; 2660 break;
2616 }
2617 break;
2618 2661
2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2620 switch (arg[0]) { 2663 switch (arg[0])
2664 {
2621 case 0: /* char tab stop cleared at active position */ 2665 case 0: /* char tab stop cleared at active position */
2622 scr_set_tab (0); 2666 scr_set_tab (0);
2623 break; 2667 break;
2624 /* case 1: */ /* line tab stop cleared in active line */ 2668 /* case 1: */ /* line tab stop cleared in active line */
2625 /* case 2: */ /* char tab stops cleared in active line */ 2669 /* case 2: */ /* char tab stops cleared in active line */
2626 case 3: /* all char tab stops are cleared */ 2670 case 3: /* all char tab stops are cleared */
2627 /* case 4: */ /* all line tab stops are cleared */ 2671 /* case 4: */ /* all line tab stops are cleared */
2628 case 5: /* all tab stops are cleared */ 2672 case 5: /* all tab stops are cleared */
2629 scr_set_tab (-1); 2673 scr_set_tab (-1);
2674 break;
2675 }
2630 break; 2676 break;
2631 }
2632 break;
2633 2677
2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2678 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2635 switch (arg[0]) { 2679 switch (arg[0])
2680 {
2636 case 0: /* char tab stop set at active position */ 2681 case 0: /* char tab stop set at active position */
2637 scr_set_tab (1); 2682 scr_set_tab (1);
2638 break; /* = ESC H */ 2683 break; /* = ESC H */
2639 /* case 1: */ /* line tab stop set at active line */ 2684 /* case 1: */ /* line tab stop set at active line */
2640 case 2: /* char tab stop cleared at active position */ 2685 case 2: /* char tab stop cleared at active position */
2641 scr_set_tab (0); 2686 scr_set_tab (0);
2642 break; /* = ESC [ 0 g */ 2687 break; /* = ESC [ 0 g */
2643 /* case 3: */ /* line tab stop cleared at active line */ 2688 /* case 3: */ /* line tab stop cleared at active line */
2644 /* case 4: */ /* char tab stops cleared at active line */ 2689 /* case 4: */ /* char tab stops cleared at active line */
2645 case 5: /* all char tab stops are cleared */ 2690 case 5: /* all char tab stops are cleared */
2646 scr_set_tab (-1); 2691 scr_set_tab (-1);
2647 break; /* = ESC [ 3 g */ 2692 break; /* = ESC [ 3 g */
2648 /* case 6: */ /* all line tab stops are cleared */ 2693 /* case 6: */ /* all line tab stops are cleared */
2649 } 2694 }
2650 break; 2695 break;
2651 2696
2652 case CSI_RM: /* 8.3.107: RESET MODE */ 2697 case CSI_RM: /* 8.3.107: RESET MODE */
2653 if (arg[0] == 4) 2698 if (arg[0] == 4)
2654 scr_insert_mode (0); 2699 scr_insert_mode (0);
2655 break; 2700 break;
2656 2701
2657 case CSI_SM: /* 8.3.126: SET MODE */ 2702 case CSI_SM: /* 8.3.126: SET MODE */
2658 if (arg[0] == 4) 2703 if (arg[0] == 4)
2659 scr_insert_mode (1); 2704 scr_insert_mode (1);
2660 break; 2705 break;
2661 2706
2662/* 2707 /*
2663 * PRIVATE USE beyond this point. All CSI_7? sequences here 2708 * PRIVATE USE beyond this point. All CSI_7? sequences here
2664 */ 2709 */
2665 case CSI_72: /* DECSTBM: set top and bottom margins */ 2710 case CSI_72: /* DECSTBM: set top and bottom margins */
2666 if (nargs == 1) 2711 if (nargs == 1)
2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2712 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2668 else if (nargs == 0 || arg[0] >= arg[1]) 2713 else if (nargs == 0 || arg[0] >= arg[1])
2669 scr_scroll_region (0, MAX_ROWS - 1); 2714 scr_scroll_region (0, MAX_ROWS - 1);
2670 else 2715 else
2671 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2716 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2672 break; 2717 break;
2673 2718
2674 case CSI_73: 2719 case CSI_73:
2675 scr_cursor (SAVE); 2720 scr_cursor (SAVE);
2676 break; 2721 break;
2677 case CSI_75: 2722 case CSI_75:
2678 scr_cursor (RESTORE); 2723 scr_cursor (RESTORE);
2679 break; 2724 break;
2680 2725
2681#ifndef NO_FRILLS 2726#ifndef NO_FRILLS
2682 case CSI_74: 2727 case CSI_74:
2683 process_window_ops (arg, nargs); 2728 process_window_ops (arg, nargs);
2684 break; 2729 break;
2685#endif 2730#endif
2686 2731
2687 case CSI_78: /* DECREQTPARM */ 2732 case CSI_78: /* DECREQTPARM */
2688 if (arg[0] == 0 || arg[0] == 1) 2733 if (arg[0] == 0 || arg[0] == 1)
2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2734 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2690 /* FALLTHROUGH */ 2735 break;
2691 2736
2692 default: 2737 default:
2693 break; 2738 break;
2694 } 2739 }
2695} 2740}
2696/*}}} */ 2741/*}}} */
2697 2742
2698#ifndef NO_FRILLS 2743#ifndef NO_FRILLS
2699/* ARGSUSED */ 2744/* ARGSUSED */
2700void 2745void
2701rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2746rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2702{ 2747{
2703 int x, y; 2748 int x, y;
2704#if 0
2705 char *s;
2706#endif
2707 XWindowAttributes wattr; 2749 XWindowAttributes wattr;
2708 Window wdummy; 2750 Window wdummy;
2709 2751
2710 if (nargs == 0) 2752 if (nargs == 0)
2711 return; 2753 return;
2754
2712 switch (args[0]) { 2755 switch (args[0])
2756 {
2713 /* 2757 /*
2714 * commands 2758 * commands
2715 */ 2759 */
2716 case 1: /* deiconify window */ 2760 case 1: /* deiconify window */
2717 XMapWindow(Xdisplay, TermWin.parent[0]); 2761 XMapWindow (display->display, TermWin.parent[0]);
2718 break; 2762 break;
2719 case 2: /* iconify window */ 2763 case 2: /* iconify window */
2720 XIconifyWindow(Xdisplay, TermWin.parent[0], 2764 XIconifyWindow (display->display, TermWin.parent[0],
2721 DefaultScreen(Xdisplay)); 2765 DefaultScreen (display->display));
2722 break; 2766 break;
2723 case 3: /* set position (pixels) */ 2767 case 3: /* set position (pixels) */
2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2725 break; 2769 break;
2726 case 4: /* set size (pixels) */ 2770 case 4: /* set size (pixels) */
2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2728 break; 2772 break;
2729 case 5: /* raise window */ 2773 case 5: /* raise window */
2730 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2774 XRaiseWindow (display->display, TermWin.parent[0]);
2731 break; 2775 break;
2732 case 6: /* lower window */ 2776 case 6: /* lower window */
2733 XLowerWindow(Xdisplay, TermWin.parent[0]); 2777 XLowerWindow (display->display, TermWin.parent[0]);
2734 break; 2778 break;
2735 case 7: /* refresh window */ 2779 case 7: /* refresh window */
2736 scr_touch (true); 2780 scr_touch (true);
2737 break; 2781 break;
2738 case 8: /* set size (chars) */ 2782 case 8: /* set size (chars) */
2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2740 (unsigned int)(args[1] * TermWin.fheight)); 2784 (unsigned int) (args[1] * TermWin.fheight));
2741 break; 2785 break;
2786
2787 //case 9: NYI, TODO, restore maximized window or maximize window
2742 default: 2788 default:
2743 if (args[0] >= 24) /* set height (chars) */ 2789 if (args[0] >= 24) /* set height (chars) */
2744 set_widthheight ((unsigned int)TermWin.width, 2790 set_widthheight ((unsigned int)TermWin.width,
2745 (unsigned int)(args[1] * TermWin.fheight)); 2791 (unsigned int) (args[1] * TermWin.fheight));
2746 break; 2792 break;
2793
2794
2747 /* 2795 /*
2748 * reports - some output format copied from XTerm 2796 * reports - some output format copied from XTerm
2749 */ 2797 */
2750 case 11: /* report window state */ 2798 case 11: /* report window state */
2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2753 break; 2801 break;
2754 case 13: /* report window position */ 2802 case 13: /* report window position */
2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2757 -wattr.border_width, -wattr.border_width, 2805 -wattr.border_width, -wattr.border_width,
2758 &x, &y, &wdummy); 2806 &x, &y, &wdummy);
2759 tt_printf("\033[3;%d;%dt", x, y); 2807 tt_printf ("\033[3;%d;%dt", x, y);
2760 break; 2808 break;
2761 case 14: /* report window size (pixels) */ 2809 case 14: /* report window size (pixels) */
2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2764 break; 2812 break;
2813 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break;
2765 case 18: /* report window size (chars) */ 2816 case 19: /* report window size (chars) */
2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2767 break; 2818 break;
2768#if 0 /* XXX: currently disabled due to security concerns */ 2819#if 0 /* XXX: currently disabled due to security concerns */
2769 case 20: /* report icon label */ 2820 case 20: /* report icon label */
2770 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2821 XGetIconName (display->display, TermWin.parent[0], &s);
2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2772 break; 2823 break;
2773 case 21: /* report window title */ 2824 case 21: /* report window title */
2774 XFetchName(Xdisplay, TermWin.parent[0], &s); 2825 XFetchName (display->display, TermWin.parent[0], &s);
2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2776 break; 2827 break;
2777#endif 2828#endif
2778 } 2829 }
2779} 2830}
2780#endif 2831#endif
2781 2832
2782/*----------------------------------------------------------------------*/ 2833/*----------------------------------------------------------------------*/
2783/* 2834/*
2784 * get input up until STRING TERMINATOR (or BEL) 2835 * get input up until STRING TERMINATOR (or BEL)
2785 * ends_how is terminator used. returned input must be free()d 2836 * ends_how is terminator used. returned input must be free ()d
2786 */ 2837 */
2787unsigned char * 2838unsigned char *
2788rxvt_term::get_to_st (unsigned char *ends_how) 2839rxvt_term::get_to_st (unicode_t &ends_how)
2789{ 2840{
2790 int seen_esc = 0; /* seen escape? */ 2841 int seen_esc = 0; /* seen escape? */
2791 unsigned int n = 0; 2842 unsigned int n = 0;
2792 unsigned char *s; 2843 unsigned char *s;
2844 unicode_t ch;
2793 unsigned char ch, string[STRING_MAX]; 2845 unsigned char string[STRING_MAX];
2794 2846
2795 for (; (ch = cmd_getc ());) { 2847 while ((ch = cmd_getc ()))
2848 {
2796 if (ch == C0_BEL 2849 if (ch == C0_BEL
2797 || ch == CHAR_ST 2850 || ch == CHAR_ST
2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2799 break; 2852 break;
2853
2800 if (ch == C0_ESC) { 2854 if (ch == C0_ESC)
2855 {
2801 seen_esc = 1; 2856 seen_esc = 1;
2802 continue; 2857 continue;
2858 }
2803 } else if (ch == '\t') 2859 else if (ch == '\t')
2804 ch = ' '; /* translate '\t' to space */ 2860 ch = ' '; /* translate '\t' to space */
2805 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2806 return NULL; /* other control character - exit */ 2862 return NULL; /* other control character - exit */
2863
2807 if (n < sizeof(string) - 1) 2864 if (n < sizeof (string) - 1)
2808 string[n++] = ch; 2865 string[n++] = ch;
2866
2809 seen_esc = 0; 2867 seen_esc = 0;
2810 } 2868 }
2869
2811 string[n++] = '\0'; 2870 string[n++] = '\0';
2871
2812 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2813 return NULL; 2873 return NULL;
2874
2814 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2875 ends_how = (ch == 0x5c ? C0_ESC : ch);
2815 STRNCPY(s, string, n); 2876 STRNCPY (s, string, n);
2816 return s; 2877 return s;
2817} 2878}
2818 2879
2819/*----------------------------------------------------------------------*/ 2880/*----------------------------------------------------------------------*/
2820/* 2881/*
2821 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2822 */ 2883 */
2823void 2884void
2824rxvt_term::process_dcs_seq () 2885rxvt_term::process_dcs_seq ()
2825{ 2886{
2826 unsigned char eh, *s; 2887 unsigned char *s;
2827/* 2888 unicode_t eh;
2889
2890 /*
2828 * Not handled yet 2891 * Not handled yet
2829 */ 2892 */
2830 s = get_to_st (&eh); 2893 s = get_to_st (eh);
2831 if (s) 2894 if (s)
2832 free(s); 2895 free (s);
2896
2833 return; 2897 return;
2834} 2898}
2835 2899
2836/*----------------------------------------------------------------------*/ 2900/*----------------------------------------------------------------------*/
2837/* 2901/*
2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2902 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2839 */ 2903 */
2840void 2904void
2841rxvt_term::process_osc_seq () 2905rxvt_term::process_osc_seq ()
2842{ 2906{
2843 unsigned char ch, eh, *s; 2907 unicode_t ch, eh;
2844 int arg; 2908 int arg;
2845 2909
2846 ch = cmd_getc (); 2910 ch = cmd_getc ();
2847 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2911 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2848 arg = arg * 10 + (ch - '0'); 2912 arg = arg * 10 + (ch - '0');
2849 2913
2850 if (ch == ';') { 2914 if (ch == ';')
2851 s = get_to_st (&eh); 2915 {
2852 if (s) { 2916 unsigned char *s = get_to_st (eh);
2853 /* 2917
2918 if (s)
2919 {
2920 /*
2854 * rxvt_menubar_dispatch() violates the constness of the string, 2921 * rxvt_menubar_dispatch () violates the constness of the string,
2855 * so do it here 2922 * so do it here
2856 */ 2923 */
2857 if (arg == XTerm_Menu) 2924 if (arg == XTerm_Menu)
2858#if 0 /* XXX: currently disabled due to security concerns */ 2925#if 0 /* XXX: currently disabled due to security concerns */
2859 menubar_dispatch ((char *)s); 2926 menubar_dispatch ((char *)s);
2860#else 2927#else
2861 (void)0; 2928 (void)0;
2862#endif 2929#endif
2863 else 2930 else
2864 xterm_seq (arg, (char *)s, eh); 2931 xterm_seq (arg, (char *)s, eh);
2932
2865 free(s); 2933 free (s);
2866 } 2934 }
2867 } 2935 }
2868} 2936}
2869/* 2937/*
2870 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2871 * 0 = change iconName/title 2939 * 0 = change iconName/title
… …
2884 * 10 = menu (may change in future) 2952 * 10 = menu (may change in future)
2885 * 20 = bg pixmap 2953 * 20 = bg pixmap
2886 * 39 = change default fg color 2954 * 39 = change default fg color
2887 * 49 = change default bg color 2955 * 49 = change default bg color
2888 * 55 = dump scrollback buffer and all of screen 2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2889 */ 2959 */
2890void 2960void
2891rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2892{ 2962{
2893 int changed = 0; 2963 int changed = 0;
2894 int color; 2964 int color;
2895 char *buf, *name; 2965 char *buf, *name;
2896 2966
2897 assert(str != NULL); 2967 assert (str != NULL);
2898 switch (op) { 2968 switch (op)
2969 {
2899 case XTerm_name: 2970 case XTerm_name:
2900 set_title (str); 2971 set_title (str);
2901 /* FALLTHROUGH */ 2972 /* FALLTHROUGH */
2902 case XTerm_iconName: 2973 case XTerm_iconName:
2903 set_iconName (str); 2974 set_icon_name (str);
2904 break; 2975 break;
2905 case XTerm_title: 2976 case XTerm_title:
2906 set_title (str); 2977 set_title (str);
2907 break; 2978 break;
2908 case XTerm_Color: 2979 case XTerm_Color:
2909 for (buf = (char *)str; buf && *buf;) { 2980 for (buf = (char *)str; buf && *buf;)
2981 {
2910 if ((name = STRCHR(buf, ';')) == NULL) 2982 if ((name = STRCHR (buf, ';')) == NULL)
2911 break; 2983 break;
2984
2912 *name++ = '\0'; 2985 *name++ = '\0';
2913 color = atoi(buf); 2986 color = atoi (buf);
2987
2914 if (color < 0 || color >= TOTAL_COLORS) 2988 if (color < 0 || color >= TOTAL_COLORS)
2915 break; 2989 break;
2990
2916 if ((buf = STRCHR(name, ';')) != NULL) 2991 if ((buf = STRCHR (name, ';')) != NULL)
2917 *buf++ = '\0'; 2992 *buf++ = '\0';
2993
2918 set_window_color (color + minCOLOR, name); 2994 set_window_color (color + minCOLOR, name);
2919 } 2995 }
2920 break; 2996 break;
2921#ifndef NO_CURSORCOLOR 2997#ifndef NO_CURSORCOLOR
2922 case XTerm_Color_cursor: 2998 case XTerm_Color_cursor:
2923 set_window_color (Color_cursor, str); 2999 set_window_color (Color_cursor, str);
2924 break; 3000 break;
2925#endif 3001#endif
2926 case XTerm_Color_pointer: 3002 case XTerm_Color_pointer:
2927 set_window_color (Color_pointer, str); 3003 set_window_color (Color_pointer, str);
2928 break; 3004 break;
2929#ifndef NO_BOLD_UNDERLINE_REVERSE 3005#ifndef NO_BOLD_UNDERLINE_REVERSE
2930 case XTerm_Color_BD: 3006 case XTerm_Color_BD:
2931 set_window_color (Color_BD, str); 3007 set_window_color (Color_BD, str);
2932 break; 3008 break;
2933 case XTerm_Color_UL: 3009 case XTerm_Color_UL:
2934 set_window_color (Color_UL, str); 3010 set_window_color (Color_UL, str);
2935 break; 3011 break;
2936 case XTerm_Color_RV: 3012 case XTerm_Color_RV:
2937 set_window_color (Color_RV, str); 3013 set_window_color (Color_RV, str);
2938 break; 3014 break;
2939#endif 3015#endif
2940 3016
2941 case XTerm_Menu: 3017 case XTerm_Menu:
2942 /* 3018 /*
2943 * rxvt_menubar_dispatch() violates the constness of the string, 3019 * rxvt_menubar_dispatch () violates the constness of the string,
2944 * so DON'T do it here 3020 * so DON'T do it here
2945 */ 3021 */
2946 break; 3022 break;
2947 case XTerm_Pixmap: 3023 case XTerm_Pixmap:
2948 if (*str != ';') { 3024 if (*str != ';')
3025 {
2949#if XPM_BACKGROUND 3026#if XPM_BACKGROUND
2950 scale_pixmap (""); /* reset to default scaling */ 3027 scale_pixmap (""); /* reset to default scaling */
2951 set_bgPixmap (str); /* change pixmap */ 3028 set_bgPixmap (str); /* change pixmap */
2952#endif 3029#endif
2953 scr_touch (true); 3030 scr_touch (true);
2954 } 3031 }
2955 while ((str = STRCHR(str, ';')) != NULL) { 3032 while ((str = STRCHR (str, ';')) != NULL)
2956 str++; 3033 {
3034 str++;
2957#if XPM_BACKGROUND 3035#if XPM_BACKGROUND
2958 changed += scale_pixmap (str); 3036 changed += scale_pixmap (str);
2959#endif 3037#endif
2960 } 3038
2961 if (changed) { 3039 }
3040 if (changed)
3041 {
2962#ifdef XPM_BACKGROUND 3042#ifdef XPM_BACKGROUND
2963 resize_pixmap (); 3043 resize_pixmap ();
2964#endif 3044#endif
2965 scr_touch (true); 3045 scr_touch (true);
2966 } 3046 }
2967 break; 3047 break;
2968 3048
2969 case XTerm_restoreFG: 3049 case XTerm_restoreFG:
2970 set_window_color (Color_fg, str); 3050 set_window_color (Color_fg, str);
2971 break; 3051 break;
2972 case XTerm_restoreBG: 3052 case XTerm_restoreBG:
2973 set_window_color (Color_bg, str); 3053 set_window_color (Color_bg, str);
2974 break; 3054 break;
2975 case XTerm_logfile: 3055 case XTerm_logfile:
2976 break; 3056 // TODO, when secure mode?
3057 break;
2977 case XTerm_font: 3058 case XTerm_font:
2978 change_font (0, str); 3059 change_font (str);
2979 break; 3060 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif
2980#if 0 3080#if 0
2981 case XTerm_dumpscreen: /* no error notices */ 3081 case XTerm_dumpscreen: /* no error notices */
2982 { 3082 {
2983 int fd; 3083 int fd;
2984 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2985 scr_dump (fd); 3085 {
2986 close(fd); 3086 scr_dump (fd);
2987 } 3087 close (fd);
2988 } 3088 }
2989 break; 3089 }
3090 break;
2990#endif 3091#endif
2991 } 3092 }
2992} 3093}
2993/*----------------------------------------------------------------------*/ 3094/*----------------------------------------------------------------------*/
2994 3095
… …
3003 * so no need for fancy checking 3104 * so no need for fancy checking
3004 */ 3105 */
3005int 3106int
3006rxvt_term::privcases (int mode, unsigned long bit) 3107rxvt_term::privcases (int mode, unsigned long bit)
3007{ 3108{
3008 int state; 3109 int state;
3009 3110
3010 if (mode == 's') { 3111 if (mode == 's')
3112 {
3011 SavedModes |= (PrivateModes & bit); 3113 SavedModes |= (PrivateModes & bit);
3012 return -1; 3114 return -1;
3013 } else { 3115 }
3116 else
3117 {
3014 if (mode == 'r') 3118 if (mode == 'r')
3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3016 else 3120 else
3017 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3018 PrivMode(state, bit); 3122 PrivMode (state, bit);
3019 } 3123 }
3124
3020 return state; 3125 return state;
3021} 3126}
3022 3127
3023/* we're not using priv _yet_ */ 3128/* we're not using priv _yet_ */
3024void 3129void
3025rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3026{ 3131{
3027 unsigned int i, j; 3132 unsigned int i, j;
3028 int state; 3133 int state;
3134
3029 static const struct { 3135 static const struct
3136 {
3030 const int argval; 3137 const int argval;
3031 const unsigned long bit; 3138 const unsigned long bit;
3139 }
3140
3032 } argtopriv[] = { 3141 argtopriv[] = {
3033 { 1, PrivMode_aplCUR }, 3142 { 1, PrivMode_aplCUR },
3034 { 2, PrivMode_vt52 }, 3143 { 2, PrivMode_vt52 },
3035 { 3, PrivMode_132 }, 3144 { 3, PrivMode_132 },
3036 { 4, PrivMode_smoothScroll }, 3145 { 4, PrivMode_smoothScroll },
3037 { 5, PrivMode_rVideo }, 3146 { 5, PrivMode_rVideo },
3038 { 6, PrivMode_relOrigin }, 3147 { 6, PrivMode_relOrigin },
3039 { 7, PrivMode_Autowrap }, 3148 { 7, PrivMode_Autowrap },
3040 { 9, PrivMode_MouseX10 }, 3149 { 9, PrivMode_MouseX10 },
3041#ifdef menuBar_esc 3150#ifdef menuBar_esc
3042 { menuBar_esc, PrivMode_menuBar }, 3151 { menuBar_esc, PrivMode_menuBar },
3043#endif 3152#endif
3044#ifdef scrollBar_esc 3153#ifdef scrollBar_esc
3045 { scrollBar_esc, PrivMode_scrollBar }, 3154 { scrollBar_esc, PrivMode_scrollBar },
3046#endif 3155#endif
3156 // 18, 19 printing-related
3047 { 25, PrivMode_VisibleCursor }, 3157 { 25, PrivMode_VisibleCursor },
3048 { 35, PrivMode_ShiftKeys }, 3158 // 30 show scrollbar rxvt. extension
3049 { 40, PrivMode_132OK }, 3159 { 35, PrivMode_ShiftKeys }, // rxvt extension
3050 { 47, PrivMode_Screen }, 3160 { 40, PrivMode_132OK },
3051 { 66, PrivMode_aplKP }, 3161 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI
3163 // 46 start logging
3164 { 47, PrivMode_Screen },
3165 { 66, PrivMode_aplKP },
3052#ifndef NO_BACKSPACE_KEY 3166#ifndef NO_BACKSPACE_KEY
3053 { 67, PrivMode_BackSpace }, 3167 { 67, PrivMode_BackSpace },
3054#endif 3168#endif
3055 { 1000, PrivMode_MouseX11 }, 3169 { 1000, PrivMode_MouseX11 },
3056 { 1010, PrivMode_TtyOutputInh }, 3170 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3057 { 1011, PrivMode_Keypress }, 3171 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3058 { 1047, PrivMode_Screen }, 3172 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3173 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3174 { 1011, PrivMode_Keypress }, // rxvt extension
3175 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3060 }; 3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 };
3061 3183
3062 if (nargs == 0) 3184 if (nargs == 0)
3063 return; 3185 return;
3064 3186
3065/* make lo/hi boolean */ 3187 /* make lo/hi boolean */
3066 if (mode == 'l') 3188 if (mode == 'l')
3067 mode = 0; /* reset */ 3189 mode = 0; /* reset */
3068 else if (mode == 'h') 3190 else if (mode == 'h')
3069 mode = 1; /* set */ 3191 mode = 1; /* set */
3070 3192
3071 for (i = 0; i < nargs; i++) { 3193 for (i = 0; i < nargs; i++)
3194 {
3072 state = -1; 3195 state = -1;
3073 3196
3074 /* basic handling */ 3197 /* basic handling */
3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3198 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3076 if (argtopriv[j].argval == arg[i]) { 3199 if (argtopriv[j].argval == arg[i])
3200 {
3077 state = privcases (mode, argtopriv[j].bit); 3201 state = privcases (mode, argtopriv[j].bit);
3078 break; 3202 break;
3079 } 3203 }
3080 3204
3081 /* extra handling for values with state unkept */ 3205 /* extra handling for values with state unkept */
3082 if (state == -1)
3083 switch (arg[i]) { 3206 switch (arg[i])
3207 {
3084 case 1048: /* alternative cursor save */ 3208 case 1048: /* alternative cursor save */
3085 if (mode == 0) 3209 case 1049:
3210 if (mode == 0)
3086 scr_cursor (RESTORE); 3211 scr_cursor (RESTORE);
3087 else if (mode == 1) 3212 else if (mode == 1)
3088 scr_cursor (SAVE); 3213 scr_cursor (SAVE);
3089 /* FALLTHROUGH */ 3214 /* FALLTHROUGH */
3090 default: 3215 }
3091 continue; /* for(;i;) */
3092 }
3093 3216
3217 if (state >= 0)
3094 /* extra handling for values with valid 0 or 1 state */ 3218 /* extra handling for values with valid 0 or 1 state */
3095 switch (arg[i]) { 3219 switch (arg[i])
3220 {
3096 /* case 1: - application cursor keys */ 3221 /* case 1: - application cursor keys */
3097 case 2: /* VT52 mode */ 3222 case 2: /* VT52 mode */
3098 /* oddball mode. should be set regardless of set/reset 3223 /* oddball mode. should be set regardless of set/reset
3099 * parameter. Return from VT52 mode with an ESC < from 3224 * parameter. Return from VT52 mode with an ESC < from
3100 * within VT52 mode 3225 * within VT52 mode
3101 */ 3226 */
3102 PrivMode(1, PrivMode_vt52); 3227 PrivMode (1, PrivMode_vt52);
3103 break; 3228 break;
3104 case 3: /* 80/132 */ 3229 case 3: /* 80/132 */
3105 if (PrivateModes & PrivMode_132OK) 3230 if (PrivateModes & PrivMode_132OK)
3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3107 (unsigned int)TermWin.height); 3232 break;
3108 break;
3109 case 4: /* smooth scrolling */ 3233 case 4: /* smooth scrolling */
3110 if (state) 3234 if (state)
3111 Options &= ~Opt_jumpScroll; 3235 Options &= ~Opt_jumpScroll;
3112 else 3236 else
3113 Options |= Opt_jumpScroll; 3237 Options |= Opt_jumpScroll;
3114 break; 3238 break;
3115 case 5: /* reverse video */ 3239 case 5: /* reverse video */
3116 scr_rvideo_mode (state); 3240 scr_rvideo_mode (state);
3117 break; 3241 break;
3118 case 6: /* relative/absolute origins */ 3242 case 6: /* relative/absolute origins */
3119 scr_relative_origin (state); 3243 scr_relative_origin (state);
3120 break; 3244 break;
3121 case 7: /* autowrap */ 3245 case 7: /* autowrap */
3122 scr_autowrap (state); 3246 scr_autowrap (state);
3123 break; 3247 break;
3124 /* case 8: - auto repeat, can't do on a per window basis */ 3248 /* case 8: - auto repeat, can't do on a per window basis */
3125 case 9: /* X10 mouse reporting */ 3249 case 9: /* X10 mouse reporting */
3126 if (state) /* orthogonal */ 3250 if (state) /* orthogonal */
3127 PrivateModes &= ~(PrivMode_MouseX11); 3251 PrivateModes &= ~PrivMode_MouseX11;
3128 break; 3252 break;
3129#ifdef menuBar_esc 3253#ifdef menuBar_esc
3130 case menuBar_esc: 3254 case menuBar_esc:
3131#ifdef MENUBAR 3255#ifdef MENUBAR
3132 map_menuBar (state); 3256 map_menuBar (state);
3133#endif 3257#endif
3134 break; 3258 break;
3135#endif 3259#endif
3136#ifdef scrollBar_esc 3260#ifdef scrollBar_esc
3137 case scrollBar_esc: 3261 case scrollBar_esc:
3138 if (scrollbar_mapping (state)) { 3262 if (scrollbar_mapping (state))
3139 resize_all_windows (0, 0, 0); 3263 {
3264 resize_all_windows (0, 0, 0);
3140 scr_touch (true); 3265 scr_touch (true);
3141 } 3266 }
3142 break; 3267 break;
3143#endif 3268#endif
3144 case 25: /* visible/invisible cursor */ 3269 case 25: /* visible/invisible cursor */
3145 scr_cursor_visible (state); 3270 scr_cursor_visible (state);
3146 break; 3271 break;
3147 /* case 35: - shift keys */ 3272 /* case 35: - shift keys */
3148 /* case 40: - 80 <--> 132 mode */ 3273 /* case 40: - 80 <--> 132 mode */
3149 case 47: /* secondary screen */ 3274 case 47: /* secondary screen */
3150 scr_change_screen (state); 3275 scr_change_screen (state);
3151 break; 3276 break;
3152 /* case 66: - application key pad */ 3277 /* case 66: - application key pad */
3153 /* case 67: - backspace key */ 3278 /* case 67: - backspace key */
3154 case 1000: /* X11 mouse reporting */ 3279 case 1000: /* X11 mouse reporting */
3155 if (state) /* orthogonal */ 3280 if (state) /* orthogonal */
3156 PrivateModes &= ~(PrivMode_MouseX10); 3281 PrivateModes &= ~PrivMode_MouseX10;
3157 break; 3282 break;
3158#if 0 3283#if 0
3159 case 1001: 3284 case 1001:
3160 break; /* X11 mouse highlighting */ 3285 break; /* X11 mouse highlighting */
3161#endif 3286#endif
3162 case 1010: /* scroll to bottom on TTY output inhibit */ 3287 case 1010: /* scroll to bottom on TTY output inhibit */
3163 if (state) 3288 if (state)
3164 Options &= ~Opt_scrollTtyOutput; 3289 Options &= ~Opt_scrollTtyOutput;
3165 else 3290 else
3166 Options |= Opt_scrollTtyOutput; 3291 Options |= Opt_scrollTtyOutput;
3167 break; 3292 break;
3168 case 1011: /* scroll to bottom on key press */ 3293 case 1011: /* scroll to bottom on key press */
3169 if (state) 3294 if (state)
3170 Options |= Opt_scrollTtyKeypress; 3295 Options |= Opt_scrollTtyKeypress;
3171 else 3296 else
3172 Options &= ~Opt_scrollTtyKeypress; 3297 Options &= ~Opt_scrollTtyKeypress;
3173 break; 3298 break;
3174 case 1047: /* secondary screen w/ clearing */ 3299 case 1047: /* secondary screen w/ clearing */
3175 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3176 if (current_screen != PRIMARY) 3301 if (current_screen != PRIMARY)
3177 scr_erase_screen (2); 3302 scr_erase_screen (2);
3303
3178 scr_change_screen (state); 3304 scr_change_screen (state);
3179 /* FALLTHROUGH */ 3305 /* FALLTHROUGH */
3180 default: 3306 default:
3181 break; 3307 break;
3182 } 3308 }
3183 } 3309 }
3184} 3310}
3185/*}}} */ 3311/*}}} */
3186 3312
3187/*{{{ process sgr sequences */ 3313/*{{{ process sgr sequences */
3188void 3314void
3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3315rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3190{ 3316{
3191 unsigned int i; 3317 unsigned int i;
3192 short rendset; 3318 short rendset;
3193 int rendstyle; 3319 int rendstyle;
3194 3320
3195 if (nargs == 0) { 3321 if (nargs == 0)
3322 {
3196 scr_rendition (0, ~RS_None); 3323 scr_rendition (0, ~RS_None);
3197 return; 3324 return;
3198 } 3325 }
3326
3199 for (i = 0; i < nargs; i++) { 3327 for (i = 0; i < nargs; i++)
3328 {
3200 rendset = -1; 3329 rendset = -1;
3201 switch (arg[i]) { 3330 switch (arg[i])
3202 case 0: 3331 {
3332 case 0:
3203 rendset = 0, rendstyle = ~RS_None; 3333 rendset = 0, rendstyle = ~RS_None;
3204 break; 3334 break;
3205 case 1: 3335 case 1:
3206 rendset = 1, rendstyle = RS_Bold; 3336 rendset = 1, rendstyle = RS_Bold;
3207 break; 3337 break;
3208 case 4: 3338 case 4:
3209 rendset = 1, rendstyle = RS_Uline; 3339 rendset = 1, rendstyle = RS_Uline;
3210 break; 3340 break;
3211 case 5: 3341 case 5:
3212 rendset = 1, rendstyle = RS_Blink; 3342 rendset = 1, rendstyle = RS_Blink;
3213 break; 3343 break;
3214 case 7: 3344 case 7:
3215 rendset = 1, rendstyle = RS_RVid; 3345 rendset = 1, rendstyle = RS_RVid;
3216 break; 3346 break;
3217 case 22: 3347 case 8:
3348 // invisible. NYI
3349 break;
3350 case 22:
3218 rendset = 0, rendstyle = RS_Bold; 3351 rendset = 0, rendstyle = RS_Bold;
3219 break; 3352 break;
3220 case 24: 3353 case 24:
3221 rendset = 0, rendstyle = RS_Uline; 3354 rendset = 0, rendstyle = RS_Uline;
3222 break; 3355 break;
3223 case 25: 3356 case 25:
3224 rendset = 0, rendstyle = RS_Blink; 3357 rendset = 0, rendstyle = RS_Blink;
3225 break; 3358 break;
3226 case 27: 3359 case 27:
3227 rendset = 0, rendstyle = RS_RVid; 3360 rendset = 0, rendstyle = RS_RVid;
3228 break; 3361 break;
3229 } 3362 case 28:
3363 // visible. NYI
3364 break;
3365 }
3366
3230 if (rendset != -1) { 3367 if (rendset != -1)
3368 {
3231 scr_rendition (rendset, rendstyle); 3369 scr_rendition (rendset, rendstyle);
3232 continue; /* for(;i;) */ 3370 continue; /* for (;i;) */
3233 } 3371 }
3234 3372
3235 switch (arg[i]) { 3373 switch (arg[i])
3236 case 30: 3374 {
3375 case 30:
3237 case 31: /* set fg color */ 3376 case 31: /* set fg color */
3238 case 32: 3377 case 32:
3239 case 33: 3378 case 33:
3240 case 34: 3379 case 34:
3241 case 35: 3380 case 35:
3242 case 36: 3381 case 36:
3243 case 37: 3382 case 37:
3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3245 Color_fg); 3384 break;
3246 break;
3247#ifdef TTY_256COLOR 3385#ifdef TTY_256COLOR
3248 case 38: 3386 case 38:
3249 if (nargs > i + 2 && arg[i + 1] == 5) { 3387 if (nargs > i + 2 && arg[i + 1] == 5)
3388 {
3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3251 Color_fg); 3390 i += 2;
3252 i += 2; 3391 }
3253 } 3392 break;
3254 break;
3255#endif 3393#endif
3256 case 39: /* default fg */ 3394 case 39: /* default fg */
3257 scr_color (Color_fg, Color_fg); 3395 scr_color (Color_fg, Color_fg);
3258 break; 3396 break;
3259 3397
3260 case 40: 3398 case 40:
3261 case 41: /* set bg color */ 3399 case 41: /* set bg color */
3262 case 42: 3400 case 42:
3263 case 43: 3401 case 43:
3264 case 44: 3402 case 44:
3265 case 45: 3403 case 45:
3266 case 46: 3404 case 46:
3267 case 47: 3405 case 47:
3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3269 Color_bg); 3407 break;
3270 break;
3271#ifdef TTY_256COLOR 3408#ifdef TTY_256COLOR
3272 case 48: 3409 case 48:
3273 if (nargs > i + 2 && arg[i + 1] == 5) { 3410 if (nargs > i + 2 && arg[i + 1] == 5)
3411 {
3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3275 Color_bg); 3413 i += 2;
3276 i += 2; 3414 }
3277 } 3415 break;
3278 break;
3279#endif 3416#endif
3280 case 49: /* default bg */ 3417 case 49: /* default bg */
3281 scr_color (Color_bg, Color_bg); 3418 scr_color (Color_bg, Color_bg);
3282 break; 3419 break;
3283 3420
3284#ifndef NO_BRIGHTCOLOR 3421#ifndef NO_BRIGHTCOLOR
3285 case 90: 3422 case 90:
3286 case 91: /* set bright fg color */ 3423 case 91: /* set bright fg color */
3287 case 92: 3424 case 92:
3288 case 93: 3425 case 93:
3289 case 94: 3426 case 94:
3290 case 95: 3427 case 95:
3291 case 96: 3428 case 96:
3292 case 97: 3429 case 97:
3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3294 Color_fg); 3431 Color_fg);
3295 break; 3432 break;
3296 case 100: 3433 case 100:
3297 case 101: /* set bright bg color */ 3434 case 101: /* set bright bg color */
3298 case 102: 3435 case 102:
3299 case 103: 3436 case 103:
3300 case 104: 3437 case 104:
3301 case 105: 3438 case 105:
3302 case 106: 3439 case 106:
3303 case 107: 3440 case 107:
3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3305 Color_bg); 3442 Color_bg);
3306 break; 3443 break;
3307#endif 3444#endif
3308 } 3445
3446 }
3309 } 3447 }
3310} 3448}
3311/*}}} */ 3449/*}}} */
3312 3450
3313/*{{{ process Rob Nation's own graphics mode sequences */ 3451/*{{{ process Rob Nation's own graphics mode sequences */
3314void 3452void
3315rxvt_term::process_graphics () 3453rxvt_term::process_graphics ()
3316{ 3454{
3317 unsigned char ch, cmd = cmd_getc (); 3455 unicode_t ch, cmd = cmd_getc ();
3318 3456
3319#ifndef RXVT_GRAPHICS 3457 if (cmd == 'Q')
3320 if (cmd == 'Q') { /* query graphics */ 3458 { /* query graphics */
3321 tt_printf("\033G0\n"); /* no graphics */ 3459 tt_printf ("\033G0\n"); /* no graphics */
3322 return; 3460 return;
3323 } 3461 }
3324/* swallow other graphics sequences until terminating ':' */ 3462 /* swallow other graphics sequences until terminating ':' */
3325 do 3463 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 (); 3464 ch = cmd_getc ();
3344 3465 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} 3466}
3370/*}}} */ 3467/*}}} */
3371 3468
3372/* ------------------------------------------------------------------------- */ 3469/* ------------------------------------------------------------------------- */
3373 3470
3374/* 3471/*
3375 * Send printf() formatted output to the command. 3472 * Send printf () formatted output to the command.
3376 * Only use for small amounts of data. 3473 * Only use for small amounts of data.
3377 */ 3474 */
3378void 3475void
3379rxvt_term::tt_printf (const char *fmt,...) 3476rxvt_term::tt_printf (const char *fmt,...)
3380{ 3477{

Diff Legend

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