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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.48 by pcg, Wed Mar 3 04:07:52 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines