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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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