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.34 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC

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

Diff Legend

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