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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC

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

Diff Legend

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