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.13 by pcg, Fri Dec 5 04:27:20 2003 UTC vs.
Revision 1.55 by pcg, Sun Feb 22 20:08:18 2004 UTC

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

Diff Legend

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