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.44 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

… …
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
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_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 (unicode_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
61void * 125void *
62rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
63{ 127{
64 void *p = malloc (s); 128 void *p = malloc (s);
65 129
… …
118 182
119 delete TermWin.fontset; 183 delete TermWin.fontset;
120 184
121 if (display) 185 if (display)
122 { 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
123 if (TermWin.parent[0]) 194 if (TermWin.parent[0])
124 XDestroyWindow (display->display, TermWin.parent[0]); 195 XDestroyWindow (display->display, TermWin.parent[0]);
125#if defined(MENUBAR) && (MENUBAR_MAX > 1)
126 if (menuBar.win)
127 XDestroyWindow (display->display, menuBar.win);
128 delete menuBar.drawable;
129#endif
130 } 196 }
131 197
132 // TODO: free pixcolours, colours should become part of rxvt_display 198 // TODO: free pixcolours, colours should become part of rxvt_display
133 199
134 delete PixColors; 200 delete PixColors;
… …
383 449
384 p = malloc (size); 450 p = malloc (size);
385 if (p) 451 if (p)
386 return p; 452 return p;
387 453
388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 454 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
389 rxvt_clean_exit (); 455 rxvt_clean_exit ();
390 exit (EXIT_FAILURE); 456 exit (EXIT_FAILURE);
391 /* NOTREACHED */ 457 /* NOTREACHED */
392} 458}
393 459
… …
399 465
400 p = calloc (number, size); 466 p = calloc (number, size);
401 if (p) 467 if (p)
402 return p; 468 return p;
403 469
404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 470 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
405 rxvt_clean_exit (); 471 rxvt_clean_exit ();
406 exit (EXIT_FAILURE); 472 exit (EXIT_FAILURE);
407 /* NOTREACHED */ 473 /* NOTREACHED */
408} 474}
409 475
… …
418 else 484 else
419 p = malloc (size); 485 p = malloc (size);
420 if (p) 486 if (p)
421 return p; 487 return p;
422 488
423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); 489 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
424 rxvt_clean_exit (); 490 rxvt_clean_exit ();
425 exit (EXIT_FAILURE); 491 exit (EXIT_FAILURE);
426 /* NOTREACHED */ 492 /* NOTREACHED */
427} 493}
428 494
… …
620 else 686 else
621 szHint.win_gravity = SouthWestGravity; 687 szHint.win_gravity = SouthWestGravity;
622 } 688 }
623 } 689 }
624 } 690 }
691
625 /* TODO: BOUNDS */ 692 /* TODO: BOUNDS */
626 TermWin.width = TermWin.ncol * TermWin.fwidth; 693 TermWin.width = TermWin.ncol * TermWin.fwidth;
627 TermWin.height = TermWin.nrow * TermWin.fheight; 694 TermWin.height = TermWin.nrow * TermWin.fheight;
628 max_width = MAX_COLS * TermWin.fwidth; 695 max_width = MAX_COLS * TermWin.fwidth;
629 max_height = MAX_ROWS * TermWin.fheight; 696 max_height = MAX_ROWS * TermWin.fheight;
… …
737 } 804 }
738 else 805 else
739 { 806 {
740 rxvt_fontset *fs = new rxvt_fontset (this); 807 rxvt_fontset *fs = new rxvt_fontset (this);
741 808
742 if (fs && fs->populate (fontname)) 809 if (fs && fs->populate (fontname ? fontname : "fixed"))
743 { 810 {
744 delete TermWin.fontset; 811 delete TermWin.fontset;
745 TermWin.fontset = fs; 812 TermWin.fontset = fs;
746 TermWin.fwidth = fs->base_font ()->width; 813 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height; 814 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent; 815 TermWin.fbase = fs->base_font ()->ascent;
749 816
750 // TODO: screen needs to be told about new fonts
751
752 if (TermWin.parent[0]) 817 if (TermWin.parent[0])
753 { 818 {
754 resize_all_windows (0, 0, 0); 819 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 820 scr_remap_chars ();
756 scr_touch (true); 821 scr_touch (true);
… …
776rxvt_term::set_title (const char *str) 841rxvt_term::set_title (const char *str)
777{ 842{
778#ifndef SMART_WINDOW_TITLE 843#ifndef SMART_WINDOW_TITLE
779 XStoreName (display->display, TermWin.parent[0], str); 844 XStoreName (display->display, TermWin.parent[0], str);
780#else 845#else
781 char *name; 846 char *name;
782 847
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0) 848 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
784 name = NULL; 849 name = NULL;
785 if (name == NULL || STRCMP (name, str)) 850 if (name == NULL || STRCMP (name, str))
786 XStoreName (display->display, TermWin.parent[0], str); 851 XStoreName (display->display, TermWin.parent[0], str);
… …
793rxvt_term::set_iconName (const char *str) 858rxvt_term::set_iconName (const char *str)
794{ 859{
795#ifndef SMART_WINDOW_TITLE 860#ifndef SMART_WINDOW_TITLE
796 XSetIconName (display->display, TermWin.parent[0], str); 861 XSetIconName (display->display, TermWin.parent[0], str);
797#else 862#else
798 char *name; 863 char *name;
799 864
800 if (XGetIconName (display->display, TermWin.parent[0], &name)) 865 if (XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL; 866 name = NULL;
802 if (name == NULL || STRCMP (name, str)) 867 if (name == NULL || STRCMP (name, str))
803 XSetIconName (display->display, TermWin.parent[0], str); 868 XSetIconName (display->display, TermWin.parent[0], str);
… …
808 873
809#ifdef XTERM_COLOR_CHANGE 874#ifdef XTERM_COLOR_CHANGE
810void 875void
811rxvt_term::set_window_color (int idx, const char *color) 876rxvt_term::set_window_color (int idx, const char *color)
812{ 877{
813 rxvt_color xcol; 878 rxvt_color xcol;
814 int i; 879 int i;
815 880
816 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
817 return; 882 return;
818 883
819 /* handle color aliases */ 884 /* handle color aliases */
… …
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1101 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1037 1102
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1103 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
1039 window_vt_y, TermWin_TotalWidth (), 1104 window_vt_y, TermWin_TotalWidth (),
1040 TermWin_TotalHeight ()); 1105 TermWin_TotalHeight ());
1041 scr_clear (); 1106 scr_clear (height != old_height);
1042#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1043 resize_pixmap (); 1108 resize_pixmap ();
1044#endif 1109#endif
1045 1110
1046 } 1111 }

Diff Legend

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