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.24 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.57 by pcg, Tue Feb 24 16:25:44 2004 UTC

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

Diff Legend

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