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

Diff Legend

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