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.35 by pcg, Fri Feb 20 23:01:45 2004 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 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
61class rxvt_composite_vec rxvt_composite;
62
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2)
64{
65 compose_char *cc;
66
67 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line.
69 cc = (*this)[c1];
70 while (cc)
71 {
72 if (cc->c2 == c2) return c1;
73 cc = (*this)[cc->c1];
74 }
75
76 // check to see wether this combination already exists otherwise
77 for (cc = v.end (); cc-- > v.begin (); )
78 {
79 if (cc->c1 == c1 && cc->c2 == c2)
80 return COMPOSE_LO + (cc - v.begin ());
81 }
82
83 // allocate a new combination
84 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
85 {
86 static int seen;
87
88 if (!seen++)
89 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
90
91 return REPLACEMENT_CHAR;
92 }
93
94 v.push_back (compose_char (c1, c2));
95
96 return v.size () - 1 + COMPOSE_LO;
97}
98
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r)
100{
101 compose_char *cc = (*this)[c];
102
103 if (!cc)
104 {
105 if (r) *r = c;
106 return 1;
107 }
108
109 int len = expand (cc->c1, r);
110
111 if (r) r += len;
112
113 if (cc->c2 != NOCHAR)
114 {
115 len++;
116 if (r) *r++ = cc->c2;
117 }
118
119 return len;
120
121}
122
123extern struct rxvt_composite_vec rxvt_composite;
60void * 124void *
61rxvt_term::operator new (size_t s) 125rxvt_term::operator new (size_t s)
62{ 126{
63 void *p = malloc (s); 127 void *p = malloc (s);
64 128
… …
79 vt_ev (this, &rxvt_term::x_cb), 143 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 144#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 145 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 146#endif
83#ifdef MENUBAR 147#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 148 menubar_ev (this, &rxvt_term::x_cb),
85#endif 149#endif
86#ifdef CURSOR_BLINK 150#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 152#endif
89#ifdef TEXT_BLINK 153#ifdef TEXT_BLINK
… …
116#endif 180#endif
117 181
118 delete TermWin.fontset; 182 delete TermWin.fontset;
119 183
120 if (display) 184 if (display)
185 {
186#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable;
188 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win);
190#endif
191 delete TermWin.drawable;
192 // destroy all windows
121 if (TermWin.parent[0]) 193 if (TermWin.parent[0])
122 XDestroyWindow (display->display, TermWin.parent[0]); 194 XDestroyWindow (display->display, TermWin.parent[0]);
195 }
123 196
124 // TODO: free pixcolours, colours should become part of rxvt_display 197 // TODO: free pixcolours, colours should become part of rxvt_display
125 198
126 delete PixColors; 199 delete PixColors;
127 200
… …
248 321
249 const char **cmd_argv = init_resources (argc, argv); 322 const char **cmd_argv = init_resources (argc, argv);
250 323
251 set_locale (""); 324 set_locale ("");
252 325
253#if (MENUBAR_MAX) 326#if MENUBAR_MAX
254 menubar_read (rs[Rs_menu]); 327 menubar_read (rs[Rs_menu]);
255#endif 328#endif
256#ifdef HAVE_SCROLLBARS 329#ifdef HAVE_SCROLLBARS
257 if (Options & Opt_scrollBar) 330 if (Options & Opt_scrollBar)
258 scrollBar.setIdle (); /* set existence for size calculations */ 331 scrollBar.setIdle (); /* set existence for size calculations */
… …
261 create_windows (argc, argv); 334 create_windows (argc, argv);
262 335
263 init_xlocale (); 336 init_xlocale ();
264 337
265 scr_reset (); /* initialize screen */ 338 scr_reset (); /* initialize screen */
266#ifdef RXVT_GRAPHICS
267 Gr_reset (); /* reset graphics */
268#endif
269 339
270#if 1 340#if 0
271 XSynchronize (display->display, True); 341 XSynchronize (display->display, True);
272#endif 342#endif
273 343
274#ifdef HAVE_SCROLLBARS 344#ifdef HAVE_SCROLLBARS
275 if (Options & Opt_scrollBar) 345 if (Options & Opt_scrollBar)
276 resize_scrollbar (); /* create and map scrollbar */ 346 resize_scrollbar (); /* create and map scrollbar */
277#endif 347#endif
278#if (MENUBAR_MAX) 348#if (MENUBAR_MAX)
279 if (menubar_visible (r)) 349 if (menubar_visible ())
280 XMapWindow (display->display, menuBar.win); 350 XMapWindow (display->display, menuBar.win);
281#endif 351#endif
282#ifdef TRANSPARENT 352#ifdef TRANSPARENT
283 if (Options & Opt_transparent) 353 if (Options & Opt_transparent)
284 { 354 {
… …
378 448
379 p = malloc (size); 449 p = malloc (size);
380 if (p) 450 if (p)
381 return p; 451 return p;
382 452
383 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 453 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
384 rxvt_clean_exit (); 454 rxvt_clean_exit ();
385 exit (EXIT_FAILURE); 455 exit (EXIT_FAILURE);
386 /* NOTREACHED */ 456 /* NOTREACHED */
387} 457}
388 458
… …
394 464
395 p = calloc (number, size); 465 p = calloc (number, size);
396 if (p) 466 if (p)
397 return p; 467 return p;
398 468
399 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 469 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
400 rxvt_clean_exit (); 470 rxvt_clean_exit ();
401 exit (EXIT_FAILURE); 471 exit (EXIT_FAILURE);
402 /* NOTREACHED */ 472 /* NOTREACHED */
403} 473}
404 474
… …
413 else 483 else
414 p = malloc (size); 484 p = malloc (size);
415 if (p) 485 if (p)
416 return p; 486 return p;
417 487
418 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 488 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
419 rxvt_clean_exit (); 489 rxvt_clean_exit ();
420 exit (EXIT_FAILURE); 490 exit (EXIT_FAILURE);
421 /* NOTREACHED */ 491 /* NOTREACHED */
422} 492}
423 493
… …
717 * init = 1 - initialize 787 * init = 1 - initialize
718 * 788 *
719 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
720 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
721 */ 791 */
722void 792bool
723rxvt_term::change_font (int init, const char *fontname) 793rxvt_term::change_font (const char *fontname)
724{} 794{
795 if (fontname == FONT_UP)
796 {
797 // TODO
798 }
799 else if (fontname == FONT_DN)
800 {
801 // TODO
802 }
803 else
804 {
805 rxvt_fontset *fs = new rxvt_fontset (this);
725 806
726void 807 if (fs && fs->populate (fontname ? fontname : "fixed"))
808 {
809 delete TermWin.fontset;
810 TermWin.fontset = fs;
811 TermWin.fwidth = fs->base_font ()->width;
812 TermWin.fheight = fs->base_font ()->height;
813 TermWin.fbase = fs->base_font ()->ascent;
814
815 if (TermWin.parent[0])
816 {
817 resize_all_windows (0, 0, 0);
818 scr_remap_chars ();
819 scr_touch (true);
820 }
821
822 return true;
823 }
824 }
825
826 return false;
827}
828
829bool
727rxvt_term::font_up_down (int n, int direction) 830rxvt_term::font_up_down (int n, int direction)
728{} 831{
832 return false;
833}
729 834
730/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
731/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
732/* xterm sequences - title, iconName, color (exptl) */ 837/* xterm sequences - title, iconName, color (exptl) */
733void 838void
734rxvt_term::set_title (const char *str) 839rxvt_term::set_title (const char *str)
735{ 840{
736#ifndef SMART_WINDOW_TITLE 841#ifndef SMART_WINDOW_TITLE
737 XStoreName (display->display, TermWin.parent[0], str); 842 XStoreName (display->display, TermWin.parent[0], str);
738#else 843#else
739 char *name; 844 char *name;
740 845
741 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
742 name = NULL; 847 name = NULL;
743 if (name == NULL || STRCMP (name, str)) 848 if (name == NULL || STRCMP (name, str))
744 XStoreName (display->display, TermWin.parent[0], str); 849 XStoreName (display->display, TermWin.parent[0], str);
… …
751rxvt_term::set_iconName (const char *str) 856rxvt_term::set_iconName (const char *str)
752{ 857{
753#ifndef SMART_WINDOW_TITLE 858#ifndef SMART_WINDOW_TITLE
754 XSetIconName (display->display, TermWin.parent[0], str); 859 XSetIconName (display->display, TermWin.parent[0], str);
755#else 860#else
756 char *name; 861 char *name;
757 862
758 if (XGetIconName (display->display, TermWin.parent[0], &name)) 863 if (XGetIconName (display->display, TermWin.parent[0], &name))
759 name = NULL; 864 name = NULL;
760 if (name == NULL || STRCMP (name, str)) 865 if (name == NULL || STRCMP (name, str))
761 XSetIconName (display->display, TermWin.parent[0], str); 866 XSetIconName (display->display, TermWin.parent[0], str);
… …
766 871
767#ifdef XTERM_COLOR_CHANGE 872#ifdef XTERM_COLOR_CHANGE
768void 873void
769rxvt_term::set_window_color (int idx, const char *color) 874rxvt_term::set_window_color (int idx, const char *color)
770{ 875{
771 rxvt_color xcol; 876 rxvt_color xcol;
772 int i; 877 int i;
773 878
774 if (color == NULL || *color == '\0') 879 if (color == NULL || *color == '\0')
775 return; 880 return;
776 881
777 /* handle color aliases */ 882 /* handle color aliases */
… …
994 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
995 1100
996 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
997 window_vt_y, TermWin_TotalWidth (), 1102 window_vt_y, TermWin_TotalWidth (),
998 TermWin_TotalHeight ()); 1103 TermWin_TotalHeight ());
999#ifdef RXVT_GRAPHICS 1104 scr_clear (height != old_height);
1000 if (old_height)
1001 Gr_Resize (old_width - szHint.base_width,
1002 old_height - szHint.base_height);
1003#endif
1004 scr_clear ();
1005#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1006 resize_pixmap (); 1106 resize_pixmap ();
1007#endif 1107#endif
1008 1108
1009 } 1109 }
… …
1314 if (Input_Context) 1414 if (Input_Context)
1315 return; 1415 return;
1316 1416
1317#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1417#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318 if (rs[Rs_imLocale]) 1418 if (rs[Rs_imLocale])
1319 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1419 SET_LOCALE (rs[Rs_imLocale]);
1320#endif 1420#endif
1321 1421
1322 p = rs[Rs_inputMethod]; 1422 p = rs[Rs_inputMethod];
1323 if (p && *p) 1423 if (p && *p)
1324 { 1424 {
… …
1355 goto done; 1455 goto done;
1356 1456
1357done: 1457done:
1358#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1458#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359 if (rs[Rs_imLocale]) 1459 if (rs[Rs_imLocale])
1360 setlocale (LC_CTYPE, locale); 1460 SET_LOCALE (locale);
1361#endif 1461#endif
1362} 1462}
1363 1463
1364void 1464void
1365rxvt_term::IMSetStatusPosition () 1465rxvt_term::IMSetStatusPosition ()

Diff Legend

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