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

Diff Legend

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