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.56 by pcg, Tue Feb 24 00:02:44 2004 UTC

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

Diff Legend

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