ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.7 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.53 by pcg, Sun Mar 14 17:33:07 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.7 2003/11/26 10:42:34 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>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (uint32_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
47void * 125void *
48rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
49{ 127{
50 void *p = malloc (s); 128 void *p = malloc (s);
51 129
… …
58{ 136{
59 free (p); 137 free (p);
60} 138}
61 139
62rxvt_term::rxvt_term () 140rxvt_term::rxvt_term ()
141 :
142 rootwin_ev (this, &rxvt_term::rootwin_cb),
143 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 144 vt_ev (this, &rxvt_term::x_cb),
145#ifdef HAVE_SCROLLBARS
146 scrollbar_ev (this, &rxvt_term::x_cb),
147#endif
148#ifdef MENUBAR
149 menubar_ev (this, &rxvt_term::x_cb),
150#endif
64#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
153#endif
154#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 156#endif
67#ifdef POINTER_BLANK 157#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 159#endif
160#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb) 161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 check_ev (this, &rxvt_term::check_cb),
164 destroy_ev (this, &rxvt_term::destroy_cb),
165 pty_ev (this, &rxvt_term::pty_cb),
166 incr_ev (this, &rxvt_term::incr_cb)
71{ 167{
72 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
73} 169}
74 170
75rxvt_term::~rxvt_term () 171rxvt_term::~rxvt_term ()
76{ 172{
173 if (cmd_fd >= 0)
174 close (cmd_fd);
175
176#ifndef NO_SETOWNER_TTYDEV
177 privileged_ttydev (RESTORE);
178#endif
179#ifdef UTMP_SUPPORT
180 privileged_utmp (RESTORE);
181#endif
182
183 delete TermWin.fontset;
184
185 if (display)
186 {
187#if defined(MENUBAR) && (MENUBAR_MAX > 1)
188 delete menuBar.drawable;
189 //if (menuBar.win)
190 // XDestroyWindow (display->display, menuBar.win);
191#endif
192 delete TermWin.drawable;
193 // destroy all windows
194 if (TermWin.parent[0])
195 XDestroyWindow (display->display, TermWin.parent[0]);
196 }
197
198 // TODO: free pixcolours, colours should become part of rxvt_display
199
77 delete PixColors; 200 delete PixColors;
201
202 displays.put (display);
203
204 scr_release ();
205
206 free (env_windowid);
207 free (env_display);
208 free (env_term);
209 free (env_colorfgbg);
210 free (locale);
211 free (codeset);
212
213 delete envv;
214 delete argv;
215}
216
217void
218rxvt_term::destroy ()
219{
220 if (display)
221 {
222 rootwin_ev.stop (display);
223 termwin_ev.stop (display);
224 vt_ev.stop (display);
225#ifdef USE_XIM
226 im_destroy ();
227 im_ev.stop (display);
228#endif
229#ifdef HAVE_SCROLLBARS
230 scrollbar_ev.stop (display);
231#endif
232#ifdef MENUBAR
233 menubar_ev.stop (display);
234#endif
235 }
236
237 check_ev.stop ();
238 pty_ev.stop ();
239#ifdef CURSOR_BLINK
240 cursor_blink_ev.stop ();
241#endif
242#ifdef TEXT_BLINK
243 text_blink_ev.stop ();
244#endif
245#ifdef POINTER_BLANK
246 pointer_ev.stop ();
247#endif
248
249 destroy_ev.start (0);
250}
251
252void
253rxvt_term::destroy_cb (time_watcher &w)
254{
255 SET_R (this);
256
257 delete this;
78} 258}
79 259
80/*----------------------------------------------------------------------*/ 260/*----------------------------------------------------------------------*/
81/* rxvt_init() */ 261/* rxvt_init () */
82/* LIBPROTO */ 262/* LIBPROTO */
83rxvt_t 263rxvt_t
84rxvt_init(int argc, const char *const *argv) 264rxvt_init (int argc, const char *const *argv)
85{ 265{
86 SET_R(new rxvt_term); 266 SET_R (new rxvt_term);
87 dR;
88 267
89 if (!R->init_vars () || !R->init (argc, argv)) 268 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
90 { 269 {
91 delete R; 270 delete GET_R;
92 return NULL; 271 SET_R (0);
93 } 272 }
94 273
95 return R; 274 return GET_R;
275}
276
277static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
278
279void
280rxvt_init_signals ()
281{
282 /* install exit handler for cleanup */
283#if 0
284#ifdef HAVE_ATEXIT
285 atexit (rxvt_clean_exit);
286#else
287#endif
288#endif
289
290 struct sigaction sa;
291
292 sigfillset (&sa.sa_mask);
293 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
294 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
295 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
296 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
297 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
298 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
299 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
300
301 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
302 /* signal (SIGURG, SIG_DFL); */
303
304 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
305 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
96} 306}
97 307
98bool 308bool
99rxvt_term::init (int argc, const char *const *argv) 309rxvt_term::init (int argc, const char *const *argv)
100{ 310{
101 dR;//TODO (scrollbar, setidle)
102
103 /* 311 /*
104 * Save and then give up any super-user privileges 312 * Save and then give up any super-user privileges
105 * If we need privileges in any area then we must specifically request it. 313 * If we need privileges in any area then we must specifically request it.
106 * We should only need to be root in these cases: 314 * We should only need to be root in these cases:
107 * 1. write utmp entries on some systems 315 * 1. write utmp entries on some systems
108 * 2. chown tty on some systems 316 * 2. chown tty on some systems
109 */ 317 */
110 rxvt_privileges (this, SAVE); 318 privileges (SAVE);
111 rxvt_privileges (this, IGNORE); 319 privileges (IGNORE);
112 320
113 rxvt_init_secondary (this); 321 init_secondary ();
114 322
115 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 323 const char **cmd_argv = init_resources (argc, argv);
116 324
325 set_locale ("");
326
117#if (MENUBAR_MAX) 327#if MENUBAR_MAX
118 rxvt_menubar_read (this, rs[Rs_menu]); 328 menubar_read (rs[Rs_menu]);
119#endif 329#endif
120#ifdef HAVE_SCROLLBARS 330#ifdef HAVE_SCROLLBARS
121 if (Options & Opt_scrollBar) 331 if (Options & Opt_scrollBar)
122 scrollbar_setIdle (); /* set existence for size calculations */ 332 scrollBar.setIdle (); /* set existence for size calculations */
123#endif 333#endif
124 334
125 rxvt_Create_Windows (this, argc, argv); 335 create_windows (argc, argv);
126 336
127 rxvt_init_xlocale (this); 337 init_xlocale ();
128 338
129 rxvt_scr_reset (this); /* initialize screen */ 339 scr_reset (); /* initialize screen */
130#ifdef RXVT_GRAPHICS
131 rxvt_Gr_reset (this); /* reset graphics */
132#endif
133 340
134#if 0 341#if 0
135#ifdef DEBUG_X
136 XSynchronize(Xdisplay, True); 342 XSynchronize (display->display, True);
137 XSetErrorHandler((XErrorHandler) abort);
138#else
139 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
140#endif
141#endif 343#endif
142 344
143#ifdef HAVE_SCROLLBARS 345#ifdef HAVE_SCROLLBARS
144 if (Options & Opt_scrollBar) 346 if (Options & Opt_scrollBar)
145 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 347 resize_scrollbar (); /* create and map scrollbar */
146#endif 348#endif
147#if (MENUBAR_MAX) 349#if (MENUBAR_MAX)
148 if (menubar_visible(r)) 350 if (menubar_visible ())
149 XMapWindow (Xdisplay, menuBar.win); 351 XMapWindow (display->display, menuBar.win);
150#endif 352#endif
151#ifdef TRANSPARENT 353#ifdef TRANSPARENT
152 if (Options & Opt_transparent) 354 if (Options & Opt_transparent)
153 { 355 {
154 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 356 XSelectInput (display->display, display->root, PropertyChangeMask);
155 rxvt_check_our_parents (this); 357 check_our_parents ();
156 } 358 }
157#endif 359#endif
360
361 rootwin_ev.start (display, display->root);
362
158 XMapWindow (Xdisplay, TermWin.vt); 363 XMapWindow (display->display, TermWin.vt);
159 XMapWindow (Xdisplay, TermWin.parent[0]); 364 XMapWindow (display->display, TermWin.parent[0]);
160 365
161 rxvt_init_env (this);
162 rxvt_init_command (this, cmd_argv); 366 init_command (cmd_argv);
163 367
164 x_ev.start (Xfd, EVENT_READ);
165 pty_ev.start (cmd_fd, EVENT_READ); 368 pty_ev.start (cmd_fd, EVENT_READ);
166 369
167 flush (); 370 check_ev.start ();
168 371
169 return true; 372 return true;
170} 373}
171 374
172/* ------------------------------------------------------------------------- * 375/* ------------------------------------------------------------------------- *
… …
176 * Catch a SIGCHLD signal and exit if the direct child has died 379 * Catch a SIGCHLD signal and exit if the direct child has died
177 */ 380 */
178/* ARGSUSED */ 381/* ARGSUSED */
179/* EXTPROTO */ 382/* EXTPROTO */
180RETSIGTYPE 383RETSIGTYPE
181rxvt_Child_signal(int sig __attribute__ ((unused))) 384rxvt_Child_signal (int sig __attribute__ ((unused)))
182{ 385{
183 dR;
184 int pid, save_errno = errno; 386 int pid, save_errno = errno;
185
186 do {
187 errno = 0;
188 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 387 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
189 388 ;
190 if (pid == R->cmd_pid)
191 exit(EXIT_SUCCESS);
192
193 errno = save_errno; 389 errno = save_errno;
194 signal(SIGCHLD, rxvt_Child_signal); 390
391#if 0
392 if (pid == cmd_pid)
393 exit (EXIT_SUCCESS);
394#endif
195} 395}
196 396
197/* 397/*
198 * Catch a fatal signal and tidy up before quitting 398 * Catch a fatal signal and tidy up before quitting
199 */ 399 */
200/* EXTPROTO */ 400/* EXTPROTO */
201RETSIGTYPE 401RETSIGTYPE
202rxvt_Exit_signal(int sig) 402rxvt_Exit_signal (int sig)
203{ 403{
204 signal(sig, SIG_DFL); 404 signal (sig, SIG_DFL);
205#ifdef DEBUG_CMD 405#ifdef DEBUG_CMD
206 rxvt_print_error("signal %d", sig); 406 rxvt_print_error ("signal %d", sig);
207#endif 407#endif
208 rxvt_clean_exit(); 408 rxvt_clean_exit ();
209 kill(getpid(), sig); 409 kill (getpid (), sig);
210} 410}
211 411
212/* ARGSUSED */
213/* INTPROTO */ 412/* INTPROTO */
214int 413int
215rxvt_xerror_handler(const Display * display 414rxvt_xerror_handler (Display *display, XErrorEvent *event)
216 __attribute__ ((unused)), const XErrorEvent * event)
217{ 415{
218 dR;
219
220 if (R->allowedxerror == -1) { 416 if (GET_R->allowedxerror == -1)
221 R->allowedxerror = event->error_code; 417 GET_R->allowedxerror = event->error_code;
222 return 0; /* ignored anyway */ 418 else
223 } 419 {
224 rxvt_print_error("XError: Request: %d . %d, Error: %d", 420 old_xerror_handler (display, event);
225 event->request_code, event->minor_code, 421 GET_R->destroy ();
226 event->error_code); 422 }
227/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 423
228 exit(EXIT_FAILURE); 424 return 0;
229/* NOTREACHED */
230} 425}
231 426
232/*----------------------------------------------------------------------*/ 427/*----------------------------------------------------------------------*/
233/* 428/*
234 * Exit gracefully, clearing the utmp entry and restoring tty attributes 429 * Exit gracefully, clearing the utmp entry and restoring tty attributes
235 * TODO: if debugging, this should free up any known resources if we can 430 * TODO: if debugging, this should free up any known resources if we can
236 */ 431 */
237/* EXTPROTO */ 432/* EXTPROTO */
238void 433void
239rxvt_clean_exit(void) 434rxvt_clean_exit ()
240{ 435{
241 dR; 436 // TODO: rxvtd should clean up all ressources
242 437 if (GET_R)
243#ifdef DEBUG_SCREEN 438 GET_R->destroy ();
244 rxvt_scr_release(aR);
245#endif
246#ifndef NO_SETOWNER_TTYDEV
247 rxvt_privileged_ttydev(aR_ RESTORE);
248#endif
249#ifdef UTMP_SUPPORT
250 rxvt_privileged_utmp(aR_ RESTORE);
251#endif
252#ifdef USE_XIM
253 if (R->Input_Context != NULL) {
254 XDestroyIC(R->Input_Context);
255 R->Input_Context = NULL;
256 }
257#endif
258} 439}
259 440
260/* ------------------------------------------------------------------------- * 441/* ------------------------------------------------------------------------- *
261 * MEMORY ALLOCATION WRAPPERS * 442 * MEMORY ALLOCATION WRAPPERS *
262 * ------------------------------------------------------------------------- */ 443 * ------------------------------------------------------------------------- */
263/* EXTPROTO */ 444/* EXTPROTO */
264void * 445void *
265rxvt_malloc(size_t size) 446rxvt_malloc (size_t size)
266{ 447{
267 void *p; 448 void *p;
268 449
269 p = malloc(size); 450 p = malloc (size);
270 if (p) 451 if (p)
271 return p; 452 return p;
272 453
273 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 454 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
274 rxvt_clean_exit(); 455 rxvt_clean_exit ();
275 exit(EXIT_FAILURE); 456 exit (EXIT_FAILURE);
276/* NOTREACHED */ 457 /* NOTREACHED */
277} 458}
278 459
279/* EXTPROTO */ 460/* EXTPROTO */
280void * 461void *
281rxvt_calloc(size_t number, size_t size) 462rxvt_calloc (size_t number, size_t size)
282{ 463{
283 void *p; 464 void *p;
284 465
285 p = calloc(number, size); 466 p = calloc (number, size);
286 if (p) 467 if (p)
287 return p; 468 return p;
288 469
289 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 470 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
290 rxvt_clean_exit(); 471 rxvt_clean_exit ();
291 exit(EXIT_FAILURE); 472 exit (EXIT_FAILURE);
292/* NOTREACHED */ 473 /* NOTREACHED */
293} 474}
294 475
295/* EXTPROTO */ 476/* EXTPROTO */
296void * 477void *
297rxvt_realloc(void *ptr, size_t size) 478rxvt_realloc (void *ptr, size_t size)
298{ 479{
299 void *p; 480 void *p;
300 481
301 if (ptr) 482 if (ptr)
302 p = realloc(ptr, size); 483 p = realloc (ptr, size);
303 else 484 else
304 p = malloc(size); 485 p = malloc (size);
305 if (p) 486 if (p)
306 return p; 487 return p;
307 488
308 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 489 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
309 rxvt_clean_exit(); 490 rxvt_clean_exit ();
310 exit(EXIT_FAILURE); 491 exit (EXIT_FAILURE);
311/* NOTREACHED */ 492 /* NOTREACHED */
312} 493}
313 494
314/* ------------------------------------------------------------------------- * 495/* ------------------------------------------------------------------------- *
315 * PRIVILEGED OPERATIONS * 496 * PRIVILEGED OPERATIONS *
316 * ------------------------------------------------------------------------- */ 497 * ------------------------------------------------------------------------- */
317/* take care of suid/sgid super-user (root) privileges */ 498/* take care of suid/sgid super-user (root) privileges */
318/* INTPROTO */
319void 499void
320rxvt_privileges(pR_ int mode) 500rxvt_term::privileges (int mode)
321{ 501{
322#if ! defined(__CYGWIN32__) 502#if ! defined(__CYGWIN32__)
323# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 503# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
324/* setreuid() is the poor man's setuid(), seteuid() */ 504 /* setreuid () is the poor man's setuid (), seteuid () */
325# define seteuid(a) setreuid(-1, (a)) 505# define seteuid(a) setreuid(-1, (a))
326# define setegid(a) setregid(-1, (a)) 506# define setegid(a) setregid(-1, (a))
327# define HAVE_SETEUID 507# define HAVE_SETEUID
328# endif 508# endif
329# ifdef HAVE_SETEUID 509# ifdef HAVE_SETEUID
330 switch (mode) { 510 switch (mode)
511 {
331 case IGNORE: 512 case IGNORE:
332 /* 513 /*
333 * change effective uid/gid - not real uid/gid - so we can switch 514 * change effective uid/gid - not real uid/gid - so we can switch
334 * back to root later, as required 515 * back to root later, as required
335 */ 516 */
336 seteuid(getuid()); 517 seteuid (getuid ());
337 setegid(getgid()); 518 setegid (getgid ());
338 break; 519 break;
339 case SAVE: 520 case SAVE:
340 R->euid = geteuid(); 521 euid = geteuid ();
341 R->egid = getegid(); 522 egid = getegid ();
342 break; 523 break;
343 case RESTORE: 524 case RESTORE:
344 seteuid(R->euid); 525 seteuid (euid);
345 setegid(R->egid); 526 setegid (egid);
346 break; 527 break;
347 } 528 }
348# else 529# else
349 switch (mode) { 530 switch (mode)
531 {
350 case IGNORE: 532 case IGNORE:
351 setuid(getuid()); 533 setuid (getuid ());
352 setgid(getgid()); 534 setgid (getgid ());
353 /* FALLTHROUGH */ 535 /* FALLTHROUGH */
354 case SAVE: 536 case SAVE:
355 /* FALLTHROUGH */ 537 /* FALLTHROUGH */
356 case RESTORE: 538 case RESTORE:
357 break; 539 break;
358 } 540 }
359# endif 541# endif
360#endif 542#endif
361} 543}
362 544
363#ifdef UTMP_SUPPORT 545#ifdef UTMP_SUPPORT
364/* EXTPROTO */
365void 546void
366rxvt_privileged_utmp(pR_ char action) 547rxvt_term::privileged_utmp (char action)
367{ 548{
368 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 549 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
369 action, R->next_utmp_action, getpid())); 550 action, next_utmp_action, getpid ()));
370 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 551 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
371 || (R->Options & Opt_utmpInhibit) 552 || (Options & Opt_utmpInhibit)
372 || R->ttydev == NULL || *R->ttydev == '\0') 553 || ttydev == NULL || *ttydev == '\0')
373 return; 554 return;
374 555
375 rxvt_privileges(aR_ RESTORE); 556 privileges (RESTORE);
376 if (action == SAVE) { 557 if (action == SAVE)
558 {
377 R->next_utmp_action = RESTORE; 559 next_utmp_action = RESTORE;
378 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 560 makeutent (ttydev, rs[Rs_display_name]);
561 }
562 else
379 } else { /* action == RESTORE */ 563 { /* action == RESTORE */
380 R->next_utmp_action = IGNORE; 564 next_utmp_action = IGNORE;
381 rxvt_cleanutent(aR); 565 cleanutent ();
382 } 566 }
383 rxvt_privileges(aR_ IGNORE); 567 privileges (IGNORE);
384} 568}
385#endif 569#endif
386 570
387#ifndef NO_SETOWNER_TTYDEV 571#ifndef NO_SETOWNER_TTYDEV
388/* EXTPROTO */
389void 572void
390rxvt_privileged_ttydev(pR_ char action) 573rxvt_term::privileged_ttydev (char action)
391{ 574{
392 D_MAIN((stderr, 575 D_MAIN ((stderr,
393 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 576 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
394 action, R->next_tty_action, getpid())); 577 action, next_tty_action, getpid ()));
395 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 578 if (next_tty_action != action || (action != SAVE && action != RESTORE)
396 || R->ttydev == NULL || *R->ttydev == '\0') 579 || ttydev == NULL || *ttydev == '\0')
397 return; 580 return;
398 581
399 rxvt_privileges(aR_ RESTORE); 582 privileges (RESTORE);
400 583
401 if (action == SAVE) { 584 if (action == SAVE)
585 {
402 R->next_tty_action = RESTORE; 586 next_tty_action = RESTORE;
403# ifndef RESET_TTY_TO_COMMON_DEFAULTS 587# ifndef RESET_TTY_TO_COMMON_DEFAULTS
404/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 588 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
405 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 589 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
406 R->next_tty_action = IGNORE; 590 next_tty_action = IGNORE;
407 else 591 else
408# endif 592# endif
593
409 { 594 {
410 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 595 chown (ttydev, getuid (), ttygid); /* fail silently */
411 chmod(R->ttydev, R->ttymode); 596 chmod (ttydev, ttymode);
412# ifdef HAVE_REVOKE 597# ifdef HAVE_REVOKE
413 revoke(R->ttydev); 598 revoke (ttydev);
414# endif 599# endif
600
415 } 601 }
602 }
603 else
416 } else { /* action == RESTORE */ 604 { /* action == RESTORE */
417 R->next_tty_action = IGNORE; 605 next_tty_action = IGNORE;
418# ifndef RESET_TTY_TO_COMMON_DEFAULTS 606# ifndef RESET_TTY_TO_COMMON_DEFAULTS
419 chmod(R->ttydev, R->ttyfd_stat.st_mode); 607 chmod (ttydev, ttyfd_stat.st_mode);
420 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 608 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
421# else 609# else
422 chmod(R->ttydev, 610 chmod (ttydev,
423 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 611 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
424 chown(R->ttydev, 0, 0); 612 chown (ttydev, 0, 0);
425# endif 613# endif
426 }
427 614
615 }
616
428 rxvt_privileges(aR_ IGNORE); 617 privileges (IGNORE);
429 618
430# ifndef RESET_TTY_TO_COMMON_DEFAULTS 619# ifndef RESET_TTY_TO_COMMON_DEFAULTS
431 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 620 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
432 action == RESTORE ? "Restoring" : (action == 621 action == RESTORE ? "Restoring" : (action ==
433 SAVE ? "Saving" : 622 SAVE ? "Saving" :
434 "UNKNOWN ERROR for"), R->ttydev, 623 "UNKNOWN ERROR for"), ttydev,
435 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 624 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
436 R->ttyfd_stat.st_gid)); 625 ttyfd_stat.st_gid));
437# endif 626# endif
438} 627}
439#endif 628#endif
440 629
441/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
442/* 631/*
443 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
444 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
445 */ 634 */
446/* EXTPROTO */
447void 635void
448rxvt_window_calc(pR_ unsigned int width, unsigned int height) 636rxvt_term::window_calc (unsigned int width, unsigned int height)
449{ 637{
450 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
451 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, mb_h, flags;
452 unsigned int w, h; 640 unsigned int w, h;
453 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
454 642
455 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 643 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
456 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 644 TermWin.ncol, TermWin.nrow, szHint.width,
457 R->szHint.height)); 645 szHint.height));
458 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
459 R->szHint.win_gravity = NorthWestGravity; 647 szHint.win_gravity = NorthWestGravity;
460/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
461 649
462 recalc_x = recalc_y = 0; 650 recalc_x = recalc_y = 0;
463 flags = 0; 651 flags = 0;
464 if (!R->parsed_geometry) { 652 if (!parsed_geometry)
653 {
465 R->parsed_geometry = 1; 654 parsed_geometry = 1;
466 if (R->rs[Rs_geometry]) 655 if (rs[Rs_geometry])
467 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
468 if (flags & WidthValue) { 657 if (flags & WidthValue)
658 {
469 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 659 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
470 R->szHint.flags |= USSize; 660 szHint.flags |= USSize;
471 } 661 }
472 if (flags & HeightValue) { 662 if (flags & HeightValue)
663 {
473 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 664 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
474 R->szHint.flags |= USSize; 665 szHint.flags |= USSize;
475 } 666 }
476 if (flags & XValue) { 667 if (flags & XValue)
668 {
477 R->szHint.x = x; 669 szHint.x = x;
478 R->szHint.flags |= USPosition; 670 szHint.flags |= USPosition;
479 if (flags & XNegative) { 671 if (flags & XNegative)
672 {
480 recalc_x = 1; 673 recalc_x = 1;
481 R->szHint.win_gravity = NorthEastGravity; 674 szHint.win_gravity = NorthEastGravity;
482 } 675 }
483 } 676 }
484 if (flags & YValue) { 677 if (flags & YValue)
678 {
485 R->szHint.y = y; 679 szHint.y = y;
486 R->szHint.flags |= USPosition; 680 szHint.flags |= USPosition;
487 if (flags & YNegative) { 681 if (flags & YNegative)
682 {
488 recalc_y = 1; 683 recalc_y = 1;
489 if (R->szHint.win_gravity == NorthEastGravity) 684 if (szHint.win_gravity == NorthEastGravity)
490 R->szHint.win_gravity = SouthEastGravity; 685 szHint.win_gravity = SouthEastGravity;
491 else 686 else
492 R->szHint.win_gravity = SouthWestGravity; 687 szHint.win_gravity = SouthWestGravity;
493 } 688 }
494 } 689 }
495 } 690 }
691
496/* TODO: BOUNDS */ 692 /* TODO: BOUNDS */
497 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 693 TermWin.width = TermWin.ncol * TermWin.fwidth;
498 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 694 TermWin.height = TermWin.nrow * TermWin.fheight;
499 max_width = MAX_COLS * R->TermWin.fwidth; 695 max_width = MAX_COLS * TermWin.fwidth;
500 max_height = MAX_ROWS * R->TermWin.fheight; 696 max_height = MAX_ROWS * TermWin.fheight;
501 697
502 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 698 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
503 699
504 sb_w = mb_h = 0; 700 sb_w = mb_h = 0;
505 R->window_vt_x = R->window_vt_y = 0; 701 window_vt_x = window_vt_y = 0;
506 if (scrollbar_visible(R)) { 702 if (scrollbar_visible ())
703 {
507 sb_w = scrollbar_TotalWidth(); 704 sb_w = scrollbar_TotalWidth ();
508 R->szHint.base_width += sb_w; 705 szHint.base_width += sb_w;
509 if (!(R->Options & Opt_scrollBar_right)) 706 if (! (Options & Opt_scrollBar_right))
510 R->window_vt_x = sb_w; 707 window_vt_x = sb_w;
511 } 708 }
512 if (menubar_visible(R)) { 709 if (menubar_visible ())
710 {
513 mb_h = menuBar_TotalHeight(); 711 mb_h = menuBar_TotalHeight ();
514 R->szHint.base_height += mb_h; 712 szHint.base_height += mb_h;
515 R->window_vt_y = mb_h; 713 window_vt_y = mb_h;
516 } 714 }
517 R->szHint.width_inc = R->TermWin.fwidth; 715 szHint.width_inc = TermWin.fwidth;
518 R->szHint.height_inc = R->TermWin.fheight; 716 szHint.height_inc = TermWin.fheight;
519 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 717 szHint.min_width = szHint.base_width + szHint.width_inc;
520 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 718 szHint.min_height = szHint.base_height + szHint.height_inc;
521 719
522 if (width && width - R->szHint.base_width < max_width) { 720 if (width && width - szHint.base_width < max_width)
721 {
523 R->szHint.width = width; 722 szHint.width = width;
524 R->TermWin.width = width - R->szHint.base_width; 723 TermWin.width = width - szHint.base_width;
525 } else { 724 }
725 else
726 {
526 MIN_IT(R->TermWin.width, max_width); 727 MIN_IT (TermWin.width, max_width);
527 R->szHint.width = R->szHint.base_width + R->TermWin.width; 728 szHint.width = szHint.base_width + TermWin.width;
528 } 729 }
529 if (height && height - R->szHint.base_height < max_height) { 730 if (height && height - szHint.base_height < max_height)
731 {
530 R->szHint.height = height; 732 szHint.height = height;
531 R->TermWin.height = height - R->szHint.base_height; 733 TermWin.height = height - szHint.base_height;
532 } else { 734 }
735 else
736 {
533 MIN_IT(R->TermWin.height, max_height); 737 MIN_IT (TermWin.height, max_height);
534 R->szHint.height = R->szHint.base_height + R->TermWin.height; 738 szHint.height = szHint.base_height + TermWin.height;
535 } 739 }
536 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 740 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
537 R->window_sb_x = R->szHint.width - sb_w; 741 window_sb_x = szHint.width - sb_w;
538 742
539 if (recalc_x) 743 if (recalc_x)
540 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 744 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
541 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 745 - szHint.width - 2 * TermWin.ext_bwidth);
542 if (recalc_y) 746 if (recalc_y)
543 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 747 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
544 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 748 - szHint.height - 2 * TermWin.ext_bwidth);
545 749
546 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 750 TermWin.ncol = TermWin.width / TermWin.fwidth;
547 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 751 TermWin.nrow = TermWin.height / TermWin.fheight;
548 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 752 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
549 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 753 TermWin.ncol, TermWin.nrow, szHint.width,
550 R->szHint.height)); 754 szHint.height));
551 return; 755 return;
552} 756}
553 757
554/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
555/* 759/*
556 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
557 * Called after a window size change. 761 * Called after a window size change.
558 */ 762 */
559/* EXTPROTO */
560void 763void
561rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 764rxvt_term::tt_winch ()
562{ 765{
563 struct winsize ws; 766 struct winsize ws;
564 767
565 if (fd < 0) 768 if (cmd_fd < 0)
566 return; 769 return;
770
567 ws.ws_col = col; 771 ws.ws_col = TermWin.ncol;
568 ws.ws_row = row; 772 ws.ws_row = TermWin.nrow;
569 ws.ws_xpixel = ws.ws_ypixel = 0; 773 ws.ws_xpixel = ws.ws_ypixel = 0;
570#ifndef DEBUG_SIZE 774#ifndef DEBUG_SIZE
571 (void)ioctl(fd, TIOCSWINSZ, &ws); 775 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
572#else 776#else
573 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 777 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
574 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 778 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
575 }
576# ifdef SIGWINCH 779# ifdef SIGWINCH
577 else if (pid) /* force through to the command */ 780 else if (cmd_pid) /* force through to the command */
578 kill(pid, SIGWINCH); 781 kill (cmd_pid, SIGWINCH);
579# endif 782# endif
580#endif 783#endif
581} 784}
582 785
583/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
584/* rxvt_change_font() - Switch to a new font */ 787/* rxvt_change_font () - Switch to a new font */
585/* 788/*
586 * init = 1 - initialize 789 * init = 1 - initialize
587 * 790 *
588 * fontname == FONT_UP - switch to bigger font 791 * fontname == FONT_UP - switch to bigger font
589 * fontname == FONT_DN - switch to smaller font 792 * fontname == FONT_DN - switch to smaller font
590 */ 793 */
591/* EXTPROTO */ 794bool
592void
593rxvt_change_font(pR_ int init, const char *fontname) 795rxvt_term::change_font (const char *fontname)
594{ 796{
595} 797 if (fontname == FONT_UP)
798 {
799 // TODO
800 }
801 else if (fontname == FONT_DN)
802 {
803 // TODO
804 }
805 else
806 {
807 rxvt_fontset *fs = new rxvt_fontset (this);
596 808
597/* INTPROTO */ 809 if (fs && fs->populate (fontname ? fontname : "fixed"))
598void 810 {
811 delete TermWin.fontset;
812 TermWin.fontset = fs;
813 TermWin.fwidth = fs->base_font ()->width;
814 TermWin.fheight = fs->base_font ()->height;
815 TermWin.fbase = fs->base_font ()->ascent;
816
817 if (TermWin.parent[0])
818 {
819 resize_all_windows (0, 0, 0);
820 scr_remap_chars ();
821 scr_touch (true);
822 }
823
824 return true;
825 }
826 }
827
828 return false;
829}
830
831bool
599rxvt_font_up_down(pR_ int n, int direction) 832rxvt_term::font_up_down (int n, int direction)
600{ 833{
834 return false;
601} 835}
602 836
603/*----------------------------------------------------------------------*/ 837/*----------------------------------------------------------------------*/
604/*----------------------------------------------------------------------*/ 838/*----------------------------------------------------------------------*/
605/* xterm sequences - title, iconName, color (exptl) */ 839/* xterm sequences - title, iconName, color (exptl) */
606/* EXTPROTO */
607void 840void
608rxvt_set_title(pR_ const char *str) 841rxvt_term::set_title (const char *str)
609{ 842{
610#ifndef SMART_WINDOW_TITLE 843#ifndef SMART_WINDOW_TITLE
611 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 844 XStoreName (display->display, TermWin.parent[0], str);
612#else 845#else
613 char *name; 846 char *name;
614 847
615 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 848 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
616 name = NULL; 849 name = NULL;
617 if (name == NULL || STRCMP(name, str)) 850 if (name == NULL || STRCMP (name, str))
618 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 851 XStoreName (display->display, TermWin.parent[0], str);
619 if (name) 852 if (name)
620 XFree(name); 853 XFree (name);
621#endif 854#endif
622} 855}
623 856
624/* EXTPROTO */
625void 857void
626rxvt_set_iconName(pR_ const char *str) 858rxvt_term::set_iconName (const char *str)
627{ 859{
628#ifndef SMART_WINDOW_TITLE 860#ifndef SMART_WINDOW_TITLE
629 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 861 XSetIconName (display->display, TermWin.parent[0], str);
630#else 862#else
631 char *name; 863 char *name;
632 864
633 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 865 if (XGetIconName (display->display, TermWin.parent[0], &name))
634 name = NULL; 866 name = NULL;
635 if (name == NULL || STRCMP(name, str)) 867 if (name == NULL || STRCMP (name, str))
636 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 868 XSetIconName (display->display, TermWin.parent[0], str);
637 if (name) 869 if (name)
638 XFree(name); 870 XFree (name);
639#endif 871#endif
640} 872}
641 873
642#ifdef XTERM_COLOR_CHANGE 874#ifdef XTERM_COLOR_CHANGE
643/* EXTPROTO */
644void 875void
645rxvt_set_window_color(pR_ int idx, const char *color) 876rxvt_term::set_window_color (int idx, const char *color)
646{ 877{
647 rxvt_color xcol; 878 rxvt_color xcol;
648 int i; 879 int i;
649 880
650 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
651 return; 882 return;
652 883
653/* handle color aliases */ 884 /* handle color aliases */
654 if (isdigit(*color)) { 885 if (isdigit (*color))
886 {
655 i = atoi(color); 887 i = atoi (color);
888 if (i >= 8 && i <= 15)
656 if (i >= 8 && i <= 15) { /* bright colors */ 889 { /* bright colors */
657 i -= 8; 890 i -= 8;
658# ifndef NO_BRIGHTCOLOR 891# ifndef NO_BRIGHTCOLOR
659 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 892 PixColors[idx] = PixColors[minBrightCOLOR + i];
660 SET_PIXCOLOR(R, idx); 893 SET_PIXCOLOR (idx);
661 goto Done; 894 goto Done;
662# endif 895# endif
896
663 } 897 }
664 if (i >= 0 && i <= 7) { /* normal colors */ 898 if (i >= 0 && i <= 7)
899 { /* normal colors */
665 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 900 PixColors[idx] = PixColors[minCOLOR + i];
666 SET_PIXCOLOR(R, idx); 901 SET_PIXCOLOR (idx);
667 goto Done; 902 goto Done;
668 } 903 }
669 } 904 }
670 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 905 if (!rXParseAllocColor (& xcol, color))
671 return; 906 return;
672/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 907 /* XStoreColor (display->display, XCMAP, XColor*); */
673 908
674/* 909 /*
675 * FIXME: should free colors here, but no idea how to do it so instead, 910 * FIXME: should free colors here, but no idea how to do it so instead,
676 * so just keep gobbling up the colormap 911 * so just keep gobbling up the colormap
677 */ 912 */
678# if 0 913# if 0
679 for (i = Color_Black; i <= Color_White; i++) 914 for (i = Color_Black; i <= Color_White; i++)
680 if (R->PixColors[idx] == R->PixColors[i]) 915 if (PixColors[idx] == PixColors[i])
681 break; 916 break;
682 if (i > Color_White) { 917 if (i > Color_White)
918 {
683 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 919 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
684 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 920 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
685 DisplayPlanes(R->Xdisplay, Xscreen)); 921 DisplayPlanes (display->display, display->screen));
686 } 922 }
687# endif 923# endif
688 924
689 R->PixColors[idx] = xcol; 925 PixColors[idx] = xcol;
690 SET_PIXCOLOR(R, idx); 926 SET_PIXCOLOR (idx);
691 927
692/* XSetWindowAttributes attr; */ 928 /* XSetWindowAttributes attr; */
693/* Cursor cursor; */ 929 /* Cursor cursor; */
694 Done: 930Done:
695 if (idx == Color_bg && !(R->Options & Opt_transparent)) 931 if (idx == Color_bg && ! (Options & Opt_transparent))
696 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 932 XSetWindowBackground (display->display, TermWin.vt,
697 R->PixColors[Color_bg]); 933 PixColors[Color_bg]);
698 934
699/* handle Color_BD, scrollbar background, etc. */ 935 /* handle Color_BD, scrollbar background, etc. */
700 936
701 rxvt_set_colorfgbg(aR); 937 set_colorfgbg ();
702 rxvt_recolour_cursor(aR); 938 recolour_cursor ();
703/* the only reasonable way to enforce a clean update */ 939 /* the only reasonable way to enforce a clean update */
704 rxvt_scr_poweron(aR); 940 scr_poweron ();
705} 941}
706 942
707#else 943#else
708# define rxvt_set_window_color(aR_ idx,color) ((void)0) 944# define set_window_color (idx,color) ((void)0)
709#endif /* XTERM_COLOR_CHANGE */ 945#endif /* XTERM_COLOR_CHANGE */
710 946
711/* EXTPROTO */
712void 947void
713rxvt_recolour_cursor(pR) 948rxvt_term::recolour_cursor ()
714{ 949{
715 rxvt_color xcol[2];
716
717#if TODO 950#if TODO
951 rxvt_color xcol[2];
952
718 xcol[0] = R->PixColors[Color_pointer]; 953 xcol[0] = PixColors[Color_pointer];
719 xcol[1] = R->PixColors[Color_bg]; 954 xcol[1] = PixColors[Color_bg];
720 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 955 XQueryColors (display->display, XCMAP, xcol, 2);
721 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 956 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
722#endif 957#endif
723} 958}
724 959
725/*----------------------------------------------------------------------*/ 960/*----------------------------------------------------------------------*/
726/* 961/*
727 * find if fg/bg matches any of the normal (low-intensity) colors 962 * find if fg/bg matches any of the normal (low-intensity) colors
728 */ 963 */
729/* INTPROTO */
730void 964void
731rxvt_set_colorfgbg(pR) 965rxvt_term::set_colorfgbg ()
732{ 966{
733 unsigned int i; 967 unsigned int i;
734 const char *xpmb = "\0"; 968 const char *xpmb = "\0";
735 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 969 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
736 970
737 R->env_colorfgbg = 971 env_colorfgbg =
738 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 972 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
739 STRCPY(fstr, "default"); 973 STRCPY (fstr, "default");
740 STRCPY(bstr, "default"); 974 STRCPY (bstr, "default");
741 for (i = Color_Black; i <= Color_White; i++) 975 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[Color_fg] == R->PixColors[i]) { 976 if (PixColors[Color_fg] == PixColors[i])
977 {
743 sprintf(fstr, "%d", (i - Color_Black)); 978 sprintf (fstr, "%d", (i - Color_Black));
744 break; 979 break;
745 } 980 }
746 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
747 if (R->PixColors[Color_bg] == R->PixColors[i]) { 982 if (PixColors[Color_bg] == PixColors[i])
983 {
748 sprintf(bstr, "%d", (i - Color_Black)); 984 sprintf (bstr, "%d", (i - Color_Black));
749#ifdef XPM_BACKGROUND 985#ifdef XPM_BACKGROUND
750 xpmb = "default;"; 986 xpmb = "default;";
751#endif 987#endif
752 break; 988 break;
753 } 989 }
990
754 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 991 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
755 putenv(R->env_colorfgbg);
756 992
757#ifndef NO_BRIGHTCOLOR 993#ifndef NO_BRIGHTCOLOR
758 R->colorfgbg = DEFAULT_RSTYLE; 994 colorfgbg = DEFAULT_RSTYLE;
759 for (i = minCOLOR; i <= maxCOLOR; i++) { 995 for (i = minCOLOR; i <= maxCOLOR; i++)
996 {
760 if (R->PixColors[Color_fg] == R->PixColors[i]) 997 if (PixColors[Color_fg] == PixColors[i])
761 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 998 colorfgbg = SET_FGCOLOR (colorfgbg, i);
762 if (R->PixColors[Color_bg] == R->PixColors[i]) 999 if (PixColors[Color_bg] == PixColors[i])
763 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 1000 colorfgbg = SET_BGCOLOR (colorfgbg, i);
764 } 1001 }
765#endif 1002#endif
766} 1003}
767 1004
768/*----------------------------------------------------------------------*/ 1005/*----------------------------------------------------------------------*/
769/* 1006/*
770 * Colour determination for low colour displays, routine from 1007 * Colour determination for low colour displays, routine from
771 * Hans de Goede <hans@highrise.nl> 1008 * Hans de Goede <hans@highrise.nl>
772 */ 1009 */
773 1010
774/* EXTPROTO */
775int 1011int
776rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
777{ 1013{
778 screen_in_out->set(aR_ colour);
779
780 if (!screen_in_out->set(aR_ colour)) { 1014 if (!screen_in_out->set (display, colour))
1015 {
781 rxvt_print_error("can't allocate colour: %s", colour); 1016 rxvt_print_error ("can't allocate colour: %s", colour);
782 return false; 1017 return false;
783 } 1018 }
784 1019
785 return true; 1020 return true;
786} 1021}
787 1022
788/* -------------------------------------------------------------------- * 1023/* -------------------------------------------------------------------- *
789 * - WINDOW RESIZING - * 1024 * - WINDOW RESIZING - *
790 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
791/* EXTPROTO */
792void 1026void
793rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1027rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
794 int ignoreparent)
795{ 1028{
796 int fix_screen; 1029 int fix_screen;
797 1030
798#ifdef SMART_RESIZE 1031#ifdef SMART_RESIZE
799 int old_width = R->szHint.width, old_height = R->szHint.height; 1032 int old_width = szHint.width, old_height = szHint.height;
800#endif 1033#endif
801 1034
802 rxvt_window_calc(aR_ width, height); 1035 window_calc (width, height);
803 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1036 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
804 if (!ignoreparent) { 1037 if (!ignoreparent)
1038 {
805#ifdef SMART_RESIZE 1039#ifdef SMART_RESIZE
806/* 1040 /*
807 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1041 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
808 * reposition window on resize depending on placement on screen 1042 * reposition window on resize depending on placement on screen
809 */ 1043 */
810 int x, y, x1, y1; 1044 int x, y, x1, y1;
811 int dx, dy; 1045 int dx, dy;
812 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1046 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
813 Window unused_cr; 1047 Window unused_cr;
814 1048
815 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1049 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
816 0, 0, &x, &y, &unused_cr); 1050 0, 0, &x, &y, &unused_cr);
817 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1051 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
818 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1052 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
819 /* 1053 /*
820 * if Xroot isn't the parent window, a WM will probably have offset 1054 * if display->root isn't the parent window, a WM will probably have offset
821 * our position for handles and decorations. Counter it 1055 * our position for handles and decorations. Counter it
822 */ 1056 */
823 if (x1 != x || y1 != y) { 1057 if (x1 != x || y1 != y)
1058 {
824 x -= x1; 1059 x -= x1;
825 y -= y1; 1060 y -= y1;
826 } 1061 }
827 1062
828 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1063 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
829 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1064 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
830 dx = old_width - R->szHint.width; 1065 dx = old_width - szHint.width;
831 dy = old_height - R->szHint.height; 1066 dy = old_height - szHint.height;
832 1067
833 /* Check position of the center of the window */ 1068 /* Check position of the center of the window */
834 if (x < x1) /* left half */ 1069 if (x < x1) /* left half */
835 dx = 0; 1070 dx = 0;
836 else if (x == x1) /* exact center */ 1071 else if (x == x1) /* exact center */
837 dx /= 2; 1072 dx /= 2;
838 if (y < y1) /* top half */ 1073 if (y < y1) /* top half */
839 dy = 0; 1074 dy = 0;
840 else if (y == y1) /* exact center */ 1075 else if (y == y1) /* exact center */
841 dy /= 2; 1076 dy /= 2;
842 1077
843 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1078 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
844 R->szHint.width, R->szHint.height); 1079 szHint.width, szHint.height);
845#else 1080#else
846 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1081 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
847 R->szHint.height); 1082 szHint.height);
848#endif 1083#endif
849 }
850 1084
1085 }
1086
851 fix_screen = (R->TermWin.ncol != R->prev_ncol 1087 fix_screen = (TermWin.ncol != prev_ncol
852 || R->TermWin.nrow != R->prev_nrow); 1088 || TermWin.nrow != prev_nrow);
1089
853 if (fix_screen || width != R->old_width || height != R->old_height) { 1090 if (fix_screen || width != old_width || height != old_height)
1091 {
854 if (scrollbar_visible(R)) { 1092 if (scrollbar_visible ())
1093 {
855 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1094 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
856 0, scrollbar_TotalWidth(), R->szHint.height); 1095 0, scrollbar_TotalWidth (), szHint.height);
857 rxvt_Resize_scrollBar(aR); 1096 resize_scrollbar ();
858 } 1097 }
1098
859 if (menubar_visible(R)) 1099 if (menubar_visible ())
860 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1100 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
861 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1101 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1102
862 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1103 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
863 R->window_vt_y, TermWin_TotalWidth(), 1104 window_vt_y, TermWin_TotalWidth (),
864 TermWin_TotalHeight()); 1105 TermWin_TotalHeight ());
865#ifdef RXVT_GRAPHICS 1106 scr_clear (height != old_height);
866 if (R->old_height)
867 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
868 R->old_height - R->szHint.base_height);
869#endif
870 rxvt_scr_clear(aR);
871#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
872 rxvt_resize_pixmap(aR); 1108 resize_pixmap ();
873#endif 1109#endif
874 }
875 1110
1111 }
1112
876 if (fix_screen || R->old_height == 0) { 1113 if (fix_screen || old_height == 0)
1114 {
877 int curr_screen = -1; 1115 int curr_screen = -1;
878 uint16_t old_ncol = R->prev_ncol; 1116 int old_ncol = prev_ncol;
879 1117
880 /* scr_reset only works on the primary screen */ 1118 /* scr_reset only works on the primary screen */
881 if (R->old_height) /* this is not the first time through */ 1119 if (old_height) /* this is not the first time through */
1120 {
1121 unsigned int ncol = TermWin.ncol;
1122 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
882 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1123 curr_screen = scr_change_screen (PRIMARY);
883 rxvt_scr_reset(aR); 1124 TermWin.ncol = ncol;
884 if (curr_screen >= 0) { /* this is not the first time through */
885 rxvt_scr_change_screen(aR_ curr_screen);
886 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
887 } 1125 }
888 }
889 1126
1127 scr_reset ();
1128
1129 if (curr_screen >= 0) /* this is not the first time through */
1130 {
1131 scr_change_screen (curr_screen);
1132 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1133 }
1134 }
1135
890 R->old_width = R->szHint.width; 1136 old_width = szHint.width;
891 R->old_height = R->szHint.height; 1137 old_height = szHint.height;
892 1138
893#ifdef USE_XIM 1139#ifdef USE_XIM
894 rxvt_IMSetStatusPosition(aR); 1140 IMSetStatusPosition ();
895#endif 1141#endif
896} 1142}
897 1143
898/* 1144/*
899 * Set the width/height of the vt window in characters. Units are pixels. 1145 * Set the width/height of the vt window in characters. Units are pixels.
900 * good for toggling 80/132 columns 1146 * good for toggling 80/132 columns
901 */ 1147 */
902/* EXTPROTO */
903void 1148void
904rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1149rxvt_term::set_widthheight (unsigned int width, unsigned int height)
905{ 1150{
906 XWindowAttributes wattr; 1151 XWindowAttributes wattr;
907 1152
908 if (width == 0 || height == 0) { 1153 if (width == 0 || height == 0)
1154 {
909 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1155 XGetWindowAttributes (display->display, display->root, &wattr);
910 if (width == 0) 1156 if (width == 0)
911 width = wattr.width - R->szHint.base_width; 1157 width = wattr.width - szHint.base_width;
912 if (height == 0) 1158 if (height == 0)
913 height = wattr.height - R->szHint.base_height; 1159 height = wattr.height - szHint.base_height;
914 } 1160 }
915 if (width != R->TermWin.width || height != R->TermWin.height) { 1161 if (width != TermWin.width || height != TermWin.height)
1162 {
916 width += R->szHint.base_width; 1163 width += szHint.base_width;
917 height += R->szHint.base_height; 1164 height += szHint.base_height;
918 rxvt_resize_all_windows(aR_ width, height, 0); 1165 resize_all_windows (width, height, 0);
919 } 1166 }
920} 1167}
921 1168
922/* -------------------------------------------------------------------- * 1169/* -------------------------------------------------------------------- *
923 * - X INPUT METHOD ROUTINES - * 1170 * - X INPUT METHOD ROUTINES - *
924 * -------------------------------------------------------------------- */ 1171 * -------------------------------------------------------------------- */
925#ifdef USE_XIM 1172#ifdef USE_XIM
926/* INTPROTO */ 1173
927void 1174void
928rxvt_setSize(pR_ XRectangle * size) 1175rxvt_term::im_set_size (XRectangle *size)
929{ 1176{
930 size->x = R->TermWin.int_bwidth; 1177 size->x = TermWin.int_bwidth;
931 size->y = R->TermWin.int_bwidth; 1178 size->y = TermWin.int_bwidth;
932 size->width = Width2Pixel(R->TermWin.ncol); 1179 size->width = Width2Pixel (TermWin.ncol);
933 size->height = Height2Pixel(R->TermWin.nrow); 1180 size->height = Height2Pixel (TermWin.nrow);
934} 1181}
935 1182
936/* INTPROTO */
937void 1183void
938rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1184rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
939{ 1185{
940 *fg = R->PixColors[Color_fg]; 1186 *fg = PixColors[Color_fg];
941 *bg = R->PixColors[Color_bg]; 1187 *bg = PixColors[Color_bg];
942} 1188}
943 1189
944/* Checking whether input method is running. */ 1190/* Checking whether input method is running. */
945/* INTPROTO */
946Bool 1191bool
947rxvt_IMisRunning(pR) 1192rxvt_term::IMisRunning ()
948{ 1193{
949 char *p; 1194 char *p;
950 Atom atom; 1195 Atom atom;
951 Window win; 1196 Window win;
952 char server[IMBUFSIZ]; 1197 char server[IMBUFSIZ];
953 1198
954/* get current locale modifier */ 1199 /* get current locale modifier */
955 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1200 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1201 {
956 STRCPY(server, "@server="); 1202 STRCPY (server, "@server=");
957 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1203 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
958 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1204 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
959 *p = '\0'; 1205 *p = '\0';
960 1206
961 atom = XInternAtom(R->Xdisplay, server, False); 1207 atom = XInternAtom (display->display, server, False);
962 win = XGetSelectionOwner(R->Xdisplay, atom); 1208 win = XGetSelectionOwner (display->display, atom);
963 if (win != None) 1209 if (win != None)
964 return True; 1210 return True;
965 } 1211 }
966 return False; 1212 return False;
967} 1213}
968 1214
969/* EXTPROTO */
970void 1215void
971rxvt_IMSendSpot(pR) 1216rxvt_term::IMSendSpot ()
972{ 1217{
973 XPoint spot; 1218 XPoint spot;
974 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
975 1220
976 if (R->Input_Context == NULL 1221 if (Input_Context == NULL
977 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1222 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
978 || !(R->event_type == KeyPress 1223 || ! (event_type == KeyPress
979 || R->event_type == Expose 1224 || event_type == Expose
980 || R->event_type == NoExpose 1225 || event_type == NoExpose
981 || R->event_type == SelectionNotify 1226 || event_type == SelectionNotify
982 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1227 || event_type == ButtonRelease || event_type == FocusIn)
983 || !rxvt_IMisRunning(aR)) 1228 || !IMisRunning ())
984 return; 1229 return;
985 1230
986 rxvt_setPosition(aR_ & spot); 1231 im_set_position (&spot);
987 1232
988 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1233 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
989 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1234 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
990 XFree(preedit_attr); 1235 XFree (preedit_attr);
991} 1236}
992 1237
993/* EXTPROTO */
994void 1238void
995rxvt_setTermFontSet(pR_ int idx)
996{
997 char *string;
998 long length;
999 int success = 0;
1000
1001 if (idx < 0 || idx >= MAX_NFONTS)
1002 return;
1003}
1004
1005/* INTPROTO */
1006void
1007rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1239rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1008 XRectangle * needed_rect) 1240 XRectangle * needed_rect)
1009{ 1241{
1010 int mbh, vtx = 0; 1242 int mbh, vtx = 0;
1011 1243
1012 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1244 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1013 vtx = scrollbar_TotalWidth(); 1245 vtx = scrollbar_TotalWidth ();
1246
1014 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1247 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1015 mbh -= R->TermWin.lineSpace; 1248 mbh -= TermWin.lineSpace;
1016 1249
1017 preedit_rect->x = needed_rect->width + vtx; 1250 preedit_rect->x = needed_rect->width + vtx;
1018 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1251 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1019 1252
1020 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1253 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1021 + vtx;
1022 preedit_rect->height = Height2Pixel(1); 1254 preedit_rect->height = Height2Pixel (1);
1023 1255
1024 status_rect->x = vtx; 1256 status_rect->x = vtx;
1025 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1257 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1026 1258
1027 status_rect->width = needed_rect->width ? needed_rect->width 1259 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1028 : Width2Pixel(R->TermWin.ncol + 1);
1029 status_rect->height = Height2Pixel(1); 1260 status_rect->height = Height2Pixel (1);
1030} 1261}
1031 1262
1032/* ARGSUSED */
1033/* INTPROTO */
1034void 1263void
1035rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1264rxvt_term::im_destroy ()
1036 __attribute__ ((unused)), XPointer call_data
1037 __attribute__ ((unused)))
1038{ 1265{
1039 dR; 1266 if (Input_Context)
1040 1267 {
1268 XDestroyIC (Input_Context);
1041 R->Input_Context = NULL; 1269 Input_Context = NULL;
1042/* To avoid Segmentation Fault in C locale: Solaris only? */ 1270 }
1043 if (STRCMP(R->locale, "C"))
1044 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1045 rxvt_IMInstantiateCallback, NULL);
1046}
1047 1271
1048/* 1272 if (input_method)
1049 * X manual pages and include files don't match on some systems:
1050 * some think this is an XIDProc and others an XIMProc so we can't
1051 * use the first argument - need to update this to be nice for
1052 * both types via some sort of configure detection
1053 */
1054/* ARGSUSED */
1055/* EXTPROTO */
1056void
1057rxvt_IMInstantiateCallback(Display * unused
1058 __attribute__ ((unused)), XPointer client_data
1059 __attribute__ ((unused)), XPointer call_data
1060 __attribute__ ((unused)))
1061{
1062 dR;
1063 int i, found, had_im;
1064 const char *p;
1065 char **s;
1066 char buf[IMBUFSIZ];
1067
1068 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1069 if (R->Input_Context)
1070 return;
1071
1072 found = had_im = 0;
1073 p = R->rs[Rs_inputMethod];
1074 if (p && *p) {
1075 had_im = 1;
1076 s = rxvt_splitcommastring(p);
1077 for (i = 0; s[i]; i++) {
1078 if (*s[i]) {
1079 STRCPY(buf, "@im=");
1080 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1081 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1082 && (rxvt_IM_get_IC(aR) == True)) {
1083 found = 1;
1084 break;
1085 }
1086 }
1087 }
1088 for (i = 0; s[i]; i++)
1089 free(s[i]);
1090 free(s);
1091 } 1273 {
1092 if (found) 1274 display->put_xim (input_method);
1093 return; 1275 input_method = 0;
1094
1095/* try with XMODIFIERS env. var. */
1096 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1097 rxvt_IM_get_IC(aR);
1098 return;
1099 } 1276 }
1100
1101/* try with no modifiers base IF the user didn't specify an IM */
1102 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1103 && rxvt_IM_get_IC(aR) == True)
1104 return;
1105} 1277}
1106 1278
1107/* 1279/*
1108 * Try to open a XIM with the current modifiers, then see if we can 1280 * Try to open a XIM with the current modifiers, then see if we can
1109 * open a suitable preedit type 1281 * open a suitable preedit type
1110 */ 1282 */
1111/* INTPROTO */
1112Bool 1283bool
1113rxvt_IM_get_IC(pR) 1284rxvt_term::IM_get_IC (const char *modifiers)
1114{ 1285{
1115 int i, j, found; 1286 int i, j, found;
1116 XIM xim; 1287 XIM xim;
1117 XPoint spot; 1288 XPoint spot;
1118 XRectangle rect, status_rect, needed_rect; 1289 XRectangle rect, status_rect, needed_rect;
1119 unsigned long fg, bg; 1290 unsigned long fg, bg;
1120 const char *p; 1291 const char *p;
1121 char **s; 1292 char **s;
1122 XIMStyles *xim_styles; 1293 XIMStyles *xim_styles;
1123 XVaNestedList preedit_attr, status_attr; 1294 XVaNestedList preedit_attr, status_attr;
1124 XIMCallback ximcallback;
1125 1295
1296 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1297 return false;
1298
1126 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1299 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1127 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1300 input_method = display->get_xim (locale, modifiers);
1128 if (xim == NULL) 1301 if (input_method == NULL)
1129 return False; 1302 return false;
1130 1303
1304 xim = input_method->xim;
1305
1131 xim_styles = NULL; 1306 xim_styles = NULL;
1132 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1307 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1133 || !xim_styles || !xim_styles->count_styles) { 1308 || !xim_styles || !xim_styles->count_styles)
1134 XCloseIM(xim); 1309 {
1310 display->put_xim (input_method);
1135 return False; 1311 return false;
1136 } 1312 }
1137 1313
1138 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1314 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1139 : "OverTheSpot,OffTheSpot,Root";
1140 s = rxvt_splitcommastring(p); 1315 s = rxvt_splitcommastring (p);
1141 for (i = found = 0; !found && s[i]; i++) { 1316 for (i = found = 0; !found && s[i]; i++)
1317 {
1142 if (!STRCMP(s[i], "OverTheSpot")) 1318 if (!STRCMP (s[i], "OverTheSpot"))
1143 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1319 input_style = (XIMPreeditPosition | XIMStatusNothing);
1144 else if (!STRCMP(s[i], "OffTheSpot")) 1320 else if (!STRCMP (s[i], "OffTheSpot"))
1145 R->input_style = (XIMPreeditArea | XIMStatusArea); 1321 input_style = (XIMPreeditArea | XIMStatusArea);
1146 else if (!STRCMP(s[i], "Root")) 1322 else if (!STRCMP (s[i], "Root"))
1147 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1323 input_style = (XIMPreeditNothing | XIMStatusNothing);
1148 1324
1149 for (j = 0; j < xim_styles->count_styles; j++) 1325 for (j = 0; j < xim_styles->count_styles; j++)
1150 if (R->input_style == xim_styles->supported_styles[j]) { 1326 if (input_style == xim_styles->supported_styles[j])
1327 {
1151 found = 1; 1328 found = 1;
1329 break;
1330 }
1331 }
1332
1333 for (i = 0; s[i]; i++)
1334 free (s[i]);
1335
1336 free (s);
1337 XFree (xim_styles);
1338
1339 if (!found)
1340 {
1341 display->put_xim (input_method);
1342 return false;
1343 }
1344
1345 preedit_attr = status_attr = NULL;
1346
1347 if (input_style & XIMPreeditPosition)
1348 {
1349 im_set_size (&rect);
1350 im_set_position (&spot);
1351 im_set_color (&fg, &bg);
1352
1353 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1354 XNSpotLocation, &spot,
1355 XNForeground, fg, XNBackground, bg,
1356 //XNFontSet, TermWin.fontset,
1357 NULL);
1358 }
1359 else if (input_style & XIMPreeditArea)
1360 {
1361 im_set_color (&fg, &bg);
1362
1363 /*
1364 * The necessary width of preedit area is unknown
1365 * until create input context.
1366 */
1367 needed_rect.width = 0;
1368
1369 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1370
1371 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1372 XNForeground, fg, XNBackground, bg,
1373 //XNFontSet, TermWin.fontset,
1374 NULL);
1375 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1376 XNForeground, fg, XNBackground, bg,
1377 //XNFontSet, TermWin.fontset,
1378 NULL);
1379 }
1380
1381 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1382 XNClientWindow, TermWin.parent[0],
1383 XNFocusWindow, TermWin.parent[0],
1384 preedit_attr ? XNPreeditAttributes : NULL,
1385 preedit_attr,
1386 status_attr ? XNStatusAttributes : NULL,
1387 status_attr, NULL);
1388 if (preedit_attr) XFree (preedit_attr);
1389 if (status_attr) XFree (status_attr);
1390
1391 if (Input_Context == NULL)
1392 {
1393 rxvt_print_error ("failed to create input context");
1394 display->put_xim (input_method);
1395 return false;
1396 }
1397
1398 if (input_style & XIMPreeditArea)
1399 IMSetStatusPosition ();
1400
1401 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1402 return true;
1403}
1404
1405void
1406rxvt_term::im_cb ()
1407{
1408 int i, found, had_im;
1409 const char *p;
1410 char **s;
1411 char buf[IMBUFSIZ];
1412
1413 im_destroy ();
1414
1415 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1416 if (Input_Context)
1417 return;
1418
1419#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1420 if (rs[Rs_imLocale])
1421 SET_LOCALE (rs[Rs_imLocale]);
1422#endif
1423
1424 p = rs[Rs_inputMethod];
1425 if (p && *p)
1426 {
1427 bool found = false;
1428
1429 s = rxvt_splitcommastring (p);
1430 for (i = 0; s[i]; i++)
1431 {
1432 if (*s[i])
1433 {
1434 STRCPY (buf, "@im=");
1435 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1436 if (IM_get_IC (buf))
1437 {
1438 found = true;
1152 break; 1439 break;
1440 }
1153 } 1441 }
1154 } 1442 }
1155 for (i = 0; s[i]; i++) 1443 for (i = 0; s[i]; i++)
1156 free(s[i]); 1444 free (s[i]);
1157 free(s); 1445 free (s);
1158 XFree(xim_styles);
1159 1446
1160 if (!found) { 1447 if (found)
1161 XCloseIM(xim); 1448 goto done;
1162 return False;
1163 } 1449 }
1164 1450
1165 ximcallback.callback = rxvt_IMDestroyCallback; 1451 /* try with XMODIFIERS env. var. */
1452 if (IM_get_IC (""))
1453 goto done;
1166 1454
1167/* XXX: not sure why we need this (as well as IC one below) */ 1455 /* try with no modifiers base IF the user didn't specify an IM */
1168 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1456 if (IM_get_IC ("@im=none"))
1457 goto done;
1169 1458
1170 preedit_attr = status_attr = NULL; 1459done:
1171 1460#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1172 if (R->input_style & XIMPreeditPosition) { 1461 if (rs[Rs_imLocale])
1173 rxvt_setSize(aR_ & rect); 1462 SET_LOCALE (locale);
1174 rxvt_setPosition(aR_ & spot); 1463#endif
1175 rxvt_setColor(aR_ & fg, &bg);
1176
1177 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1178 XNSpotLocation, &spot,
1179 XNForeground, fg, XNBackground, bg,
1180 //XNFontSet, R->TermWin.fontset,
1181 NULL);
1182 } else if (R->input_style & XIMPreeditArea) {
1183 rxvt_setColor(aR_ & fg, &bg);
1184
1185 /*
1186 * The necessary width of preedit area is unknown
1187 * until create input context.
1188 */
1189 needed_rect.width = 0;
1190
1191 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1192
1193 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1194 XNForeground, fg, XNBackground, bg,
1195 //XNFontSet, R->TermWin.fontset,
1196 NULL);
1197 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1198 XNForeground, fg, XNBackground, bg,
1199 //XNFontSet, R->TermWin.fontset,
1200 NULL);
1201 }
1202 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1203 XNClientWindow, R->TermWin.parent[0],
1204 XNFocusWindow, R->TermWin.parent[0],
1205 XNDestroyCallback, &ximcallback,
1206 preedit_attr ? XNPreeditAttributes : NULL,
1207 preedit_attr,
1208 status_attr ? XNStatusAttributes : NULL,
1209 status_attr, NULL);
1210 if (preedit_attr)
1211 XFree(preedit_attr);
1212 if (status_attr)
1213 XFree(status_attr);
1214 if (R->Input_Context == NULL) {
1215 rxvt_print_error("failed to create input context");
1216 XCloseIM(xim);
1217 return False;
1218 }
1219 if (R->input_style & XIMPreeditArea)
1220 rxvt_IMSetStatusPosition(aR);
1221 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1222 return True;
1223} 1464}
1224 1465
1225/* EXTPROTO */
1226void 1466void
1227rxvt_IMSetStatusPosition(pR) 1467rxvt_term::IMSetStatusPosition ()
1228{ 1468{
1229 XRectangle preedit_rect, status_rect, *needed_rect; 1469 XRectangle preedit_rect, status_rect, *needed_rect;
1230 XVaNestedList preedit_attr, status_attr; 1470 XVaNestedList preedit_attr, status_attr;
1231 1471
1232 if (R->Input_Context == NULL 1472 if (Input_Context == NULL
1233 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1473 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1234 || !rxvt_IMisRunning(aR)) 1474 || !IMisRunning ())
1235 return; 1475 return;
1236 1476
1237/* Getting the necessary width of preedit area */ 1477 /* Getting the necessary width of preedit area */
1238 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1478 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1239 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1479 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1240 XFree(status_attr); 1480 XFree (status_attr);
1241 1481
1242 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1482 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1243 1483
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1484 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1245 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1485 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1246 1486
1247 XSetICValues(R->Input_Context, 1487 XSetICValues (Input_Context,
1248 XNPreeditAttributes, preedit_attr, 1488 XNPreeditAttributes, preedit_attr,
1249 XNStatusAttributes, status_attr, NULL); 1489 XNStatusAttributes, status_attr, NULL);
1250 1490
1251 XFree(preedit_attr); 1491 XFree (preedit_attr);
1252 XFree(status_attr); 1492 XFree (status_attr);
1253} 1493}
1254#endif /* USE_XIM */ 1494#endif /* USE_XIM */
1255 1495
1256/*----------------------------------------------------------------------*/ 1496/*----------------------------------------------------------------------*/
1257rxvt_t rxvt_current_term; 1497rxvt_t rxvt_current_term;

Diff Legend

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