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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.15 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.18 by pcg, Tue Jan 20 01:35:39 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.15 2003/12/18 07:31:19 pcg Exp $ 4 * $Id: init.C,v 1.18 2004/01/20 01:35:39 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * 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> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
1042 1042
1043 if (i >= 8 && i <= 15) 1043 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1044 { /* bright colors */
1045 i -= 8; 1045 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1046#ifndef NO_BRIGHTCOLOR
1047
1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1047 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1049 return; 1048 return;
1050#endif 1049#endif
1051
1052 } 1050 }
1051
1053 if (i >= 0 && i <= 7) /* normal colors */ 1052 if (i >= 0 && i <= 7) /* normal colors */
1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1053 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1055 } 1054 }
1056} 1055}
1057 1056
… …
1127 R->ModMetaMask = modmasks[i - 1]; 1126 R->ModMetaMask = modmasks[i - 1];
1128} 1127}
1129 1128
1130/*----------------------------------------------------------------------*/ 1129/*----------------------------------------------------------------------*/
1131/* rxvt_Create_Windows() - Open and map the window */ 1130/* rxvt_Create_Windows() - Open and map the window */
1132/* EXTPROTO */
1133void 1131void
1134rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1132rxvt_term::create_windows (int argc, const char *const *argv)
1135{ 1133{
1136 XClassHint classHint; 1134 XClassHint classHint;
1137 XWMHints wmHint; 1135 XWMHints wmHint;
1138 XGCValues gcvalue; 1136 XGCValues gcvalue;
1139 long vt_emask; 1137 long vt_emask;
1140 1138
1141#ifdef PREFER_24BIT
1142 XSetWindowAttributes attributes; 1139 XSetWindowAttributes attributes;
1143 XWindowAttributes gattr; 1140 XWindowAttributes gattr;
1144 1141
1145 XCMAP = DefaultColormap(R->Xdisplay, Xscreen); 1142 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1146 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen); 1143 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1144 Xscreen = DefaultScreen (Xdisplay);
1147 1145
1148 if (R->Options & Opt_transparent) 1146 if (Options & Opt_transparent)
1149 { 1147 {
1150 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen), 1148 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr);
1151 &gattr);
1152 XDEPTH = gattr.depth; 1149 Xdepth = gattr.depth;
1153 } 1150 }
1154 else 1151 else
1155 { 1152 {
1156 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen); 1153 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1154#ifdef PREFER_24BIT
1157 /* 1155 /*
1158 * If depth is not 24, look for a 24bit visual. 1156 * If depth is not 24, look for a 24bit visual.
1159 */ 1157 */
1160 if (XDEPTH != 24) 1158 if (Xdepth != 24)
1161 { 1159 {
1162 XVisualInfo vinfo; 1160 XVisualInfo vinfo;
1163 1161
1164 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo)) 1162 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1165 { 1163 {
1166 XDEPTH = 24; 1164 Xdepth = 24;
1167 XVISUAL = vinfo.visual; 1165 Xvisual = vinfo.visual;
1168 XCMAP = XCreateColormap(R->Xdisplay, 1166 Xcmap = XCreateColormap(Xdisplay,
1169 RootWindow(R->Xdisplay, Xscreen), 1167 RootWindow(Xdisplay, Xscreen),
1170 XVISUAL, AllocNone); 1168 Xvisual, AllocNone);
1171 } 1169 }
1172 } 1170 }
1173 }
1174#endif 1171#endif
1172 }
1175 1173
1176 /* grab colors before netscape does */ 1174 /* grab colors before netscape does */
1177 rxvt_Get_Colours(aR); 1175 rxvt_Get_Colours (this);
1178 1176
1179 rxvt_change_font(aR_ 1, NULL); 1177 rxvt_change_font (this, 1, NULL);
1180 rxvt_window_calc(aR_ 0, 0); 1178 window_calc (0, 0);
1181 R->old_width = R->szHint.width; 1179 old_width = szHint.width;
1182 R->old_height = R->szHint.height; 1180 old_height = szHint.height;
1183 1181
1184 /* parent window - reverse video so we can see placement errors 1182 /* parent window - reverse video so we can see placement errors
1185 * sub-window placement & size in rxvt_resize_subwindows() 1183 * sub-window placement & size in rxvt_resize_subwindows()
1186 */ 1184 */
1187 1185
1188#ifdef PREFER_24BIT 1186#ifdef PREFER_24BIT
1189
1190 attributes.background_pixel = R->PixColors[Color_fg]; 1187 attributes.background_pixel = PixColors[Color_fg];
1191 attributes.border_pixel = R->PixColors[Color_border]; 1188 attributes.border_pixel = PixColors[Color_border];
1192 attributes.colormap = XCMAP; 1189 attributes.colormap = Xcmap;
1193 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1190 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1194 R->szHint.x, R->szHint.y, 1191 szHint.x, szHint.y,
1195 R->szHint.width, R->szHint.height, 1192 szHint.width, szHint.height,
1196 R->TermWin.ext_bwidth, 1193 TermWin.ext_bwidth,
1197 XDEPTH, InputOutput, 1194 Xdepth, InputOutput,
1198 XVISUAL, 1195 Xvisual,
1199 CWBackPixel | CWBorderPixel 1196 CWBackPixel | CWBorderPixel
1200 | CWColormap, &attributes); 1197 | CWColormap, &attributes);
1201#else 1198#else
1202
1203 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot, 1199 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1204 R->szHint.x, R->szHint.y, 1200 szHint.x, szHint.y,
1205 R->szHint.width, 1201 szHint.width,
1206 R->szHint.height, 1202 szHint.height,
1207 R->TermWin.ext_bwidth, 1203 TermWin.ext_bwidth,
1208 R->PixColors[Color_border], 1204 PixColors[Color_border],
1209 R->PixColors[Color_fg]); 1205 PixColors[Color_fg]);
1210#endif 1206#endif
1211 1207
1212 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1208 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST);
1213 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1209 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1214 1210
1215 classHint.res_name = (char *)R->rs[Rs_name]; 1211 classHint.res_name = (char *)rs[Rs_name];
1216 classHint.res_class = (char *)APL_CLASS; 1212 classHint.res_class = (char *)APL_CLASS;
1217 1213
1218 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1214 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1219 wmHint.input = True; 1215 wmHint.input = True;
1220 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1216 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1221 : NormalState); 1217 : NormalState);
1222 wmHint.window_group = R->TermWin.parent[0]; 1218 wmHint.window_group = TermWin.parent[0];
1223 1219
1224 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1220 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL,
1225 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1221 (char **)argv, argc, &szHint, &wmHint, &classHint);
1226 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1222 XSelectInput(Xdisplay, TermWin.parent[0],
1227 (KeyPressMask 1223 (KeyPressMask
1228#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1224#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1229 | KeyReleaseMask 1225 | KeyReleaseMask
1230#endif 1226#endif
1231 | FocusChangeMask | VisibilityChangeMask 1227 | FocusChangeMask | VisibilityChangeMask
1232 | StructureNotifyMask)); 1228 | StructureNotifyMask));
1233 1229
1234 /* vt cursor: Black-on-White is standard, but this is more popular */ 1230 /* vt cursor: Black-on-White is standard, but this is more popular */
1235 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1231 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);
1236 1232
1237#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1233#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1238 /* cursor (menuBar/scrollBar): Black-on-White */ 1234 /* cursor (menuBar/scrollBar): Black-on-White */
1239 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1235 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr);
1240#endif 1236#endif
1241 1237
1242#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1243 1239
1244 { 1240 {
1245 XColor blackcolour; 1241 XColor blackcolour;
1246 blackcolour.red = 0; 1242 blackcolour.red = 0;
1247 blackcolour.green = 0; 1243 blackcolour.green = 0;
1248 blackcolour.blue = 0; 1244 blackcolour.blue = 0;
1249 Font f = XLoadFont (R->Xdisplay, "fixed"); 1245 Font f = XLoadFont (Xdisplay, "fixed");
1250 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1246 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ',
1251 &blackcolour, &blackcolour); 1247 &blackcolour, &blackcolour);
1252 XUnloadFont (R->Xdisplay, f); 1248 XUnloadFont (Xdisplay, f);
1253 } 1249 }
1254#endif 1250#endif
1255 1251
1256 /* the vt window */ 1252 /* the vt window */
1257 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1253 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1258 R->window_vt_x, R->window_vt_y, 1254 window_vt_x, window_vt_y,
1259 TermWin_TotalWidth(), 1255 TermWin_TotalWidth(),
1260 TermWin_TotalHeight(), 1256 TermWin_TotalHeight(),
1261 0, 1257 0,
1262 R->PixColors[Color_fg], 1258 PixColors[Color_fg],
1263 R->PixColors[Color_bg]); 1259 PixColors[Color_bg]);
1264#ifdef DEBUG_X 1260#ifdef DEBUG_X
1265
1266 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1261 XStoreName(Xdisplay, TermWin.vt, "vt window");
1267#endif 1262#endif
1268
1269 R->pointer_unblank ();
1270 1263
1271 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1264 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1272 | PropertyChangeMask); 1265 | PropertyChangeMask);
1266
1273#ifdef POINTER_BLANK 1267#ifdef POINTER_BLANK
1268 pointer_unblank ();
1274 1269
1275 if ((R->Options & Opt_pointerBlank)) 1270 if ((Options & Opt_pointerBlank))
1276 vt_emask |= PointerMotionMask; 1271 vt_emask |= PointerMotionMask;
1277 else 1272 else
1278#endif 1273#endif
1279
1280 vt_emask |= (Button1MotionMask | Button3MotionMask); 1274 vt_emask |= (Button1MotionMask | Button3MotionMask);
1275
1281 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1276 XSelectInput(Xdisplay, TermWin.vt, vt_emask);
1282 1277
1283#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1278#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1284 1279
1285 if (menuBar_height()) 1280 if (menuBar_height())
1286 { 1281 {
1287 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1282 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1288 R->window_vt_x, 0, 1283 window_vt_x, 0,
1289 TermWin_TotalWidth(), 1284 TermWin_TotalWidth(),
1290 menuBar_TotalHeight(), 1285 menuBar_TotalHeight(),
1291 0, 1286 0,
1292 R->PixColors[Color_fg], 1287 PixColors[Color_fg],
1293 R->PixColors[Color_scroll]); 1288 PixColors[Color_scroll]);
1294#ifdef DEBUG_X 1289#ifdef DEBUG_X
1295 1290
1296 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1291 XStoreName(Xdisplay, menuBar.win, "menubar");
1297#endif 1292#endif
1298 1293
1299 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1294 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr);
1300 XSelectInput(R->Xdisplay, R->menuBar.win, 1295 XSelectInput(Xdisplay, menuBar.win,
1301 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1296 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1302 | Button1MotionMask)); 1297 | Button1MotionMask));
1303 } 1298 }
1304#endif 1299#endif
1305#ifdef XPM_BACKGROUND 1300#ifdef XPM_BACKGROUND
1306 if (R->rs[Rs_backgroundPixmap] != NULL 1301 if (rs[Rs_backgroundPixmap] != NULL
1307 && !(R->Options & Opt_transparent)) 1302 && !(Options & Opt_transparent))
1308 { 1303 {
1309 const char *p = R->rs[Rs_backgroundPixmap]; 1304 const char *p = rs[Rs_backgroundPixmap];
1310 1305
1311 if ((p = STRCHR(p, ';')) != NULL) 1306 if ((p = STRCHR(p, ';')) != NULL)
1312 { 1307 {
1313 p++; 1308 p++;
1314 rxvt_scale_pixmap(aR_ p); 1309 rxvt_scale_pixmap (this, p);
1315 } 1310 }
1316 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1311 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]);
1317 rxvt_scr_touch(aR_ True); 1312 rxvt_scr_touch (this, True);
1318 } 1313 }
1319#endif 1314#endif
1320 1315
1321 /* graphics context for the vt window */ 1316 /* graphics context for the vt window */
1322 gcvalue.foreground = R->PixColors[Color_fg]; 1317 gcvalue.foreground = PixColors[Color_fg];
1323 gcvalue.background = R->PixColors[Color_bg]; 1318 gcvalue.background = PixColors[Color_bg];
1324 gcvalue.graphics_exposures = 1; 1319 gcvalue.graphics_exposures = 1;
1325 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1320 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt,
1326 GCForeground | GCBackground 1321 GCForeground | GCBackground
1327 | GCGraphicsExposures, &gcvalue); 1322 | GCGraphicsExposures, &gcvalue);
1328 1323
1329#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1324#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1330 1325
1331 gcvalue.foreground = R->PixColors[Color_topShadow]; 1326 gcvalue.foreground = PixColors[Color_topShadow];
1332 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1327 topShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1333 GCForeground, &gcvalue); 1328 GCForeground, &gcvalue);
1334 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1329 gcvalue.foreground = PixColors[Color_bottomShadow];
1335 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1330 botShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1336 GCForeground, &gcvalue); 1331 GCForeground, &gcvalue);
1337 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1332 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1338 : Color_scroll)]; 1333 : Color_scroll)];
1339 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1334 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1340 GCForeground, &gcvalue); 1335 GCForeground, &gcvalue);
1341#endif 1336#endif
1342} 1337}
1343 1338
1344/*----------------------------------------------------------------------*/ 1339/*----------------------------------------------------------------------*/
… …
1429 1424
1430 fdstdin = dup (STDIN_FILENO); 1425 fdstdin = dup (STDIN_FILENO);
1431 dup2 (tty_fd, STDIN_FILENO); 1426 dup2 (tty_fd, STDIN_FILENO);
1432#endif 1427#endif
1433 1428
1429#ifdef UTMP_SUPPORT
1434 rxvt_privileged_utmp (this, SAVE); 1430 rxvt_privileged_utmp (this, SAVE);
1431#endif
1432
1435#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1433#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1436 1434
1437 dup2 (fdstdin, STDIN_FILENO); 1435 dup2 (fdstdin, STDIN_FILENO);
1438 close (fdstdin); 1436 close (fdstdin);
1439#endif 1437#endif

Diff Legend

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