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.20 by pcg, Thu Dec 18 07:31:18 2003 UTC vs.
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

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