aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-11 10:21:44 (GMT)
committerfluxgen <fluxgen>2002-01-11 10:21:44 (GMT)
commit17f438db1ee854bbc85e8d1e7f91ee28b501b7ab (patch)
tree0cd5ea483999575e12f8c2460bd7477dee5dc209 /src/Screen.cc
parent1e6a318f25d3ef69ca9d5ad54603ce735261b227 (diff)
downloadfluxbox-17f438db1ee854bbc85e8d1e7f91ee28b501b7ab.zip
fluxbox-17f438db1ee854bbc85e8d1e7f91ee28b501b7ab.tar.bz2
fixed enums
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 74b0c22..88fa659 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -195,7 +195,7 @@ rootcommand("")
195 image_control->setDither(resource.image_dither); 195 image_control->setDither(resource.image_dither);
196 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), 196 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(),
197 image_control, fluxbox->getStyleFilename(), getRootCommand().c_str()); 197 image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
198 198
199#ifdef GNOME 199#ifdef GNOME
200 /* create the GNOME window */ 200 /* create the GNOME window */
201 Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(), 201 Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(),
@@ -205,12 +205,13 @@ rootcommand("")
205 XChangeProperty(getBaseDisplay()->getXDisplay(), 205 XChangeProperty(getBaseDisplay()->getXDisplay(),
206 getRootWindow(), getBaseDisplay()->getGnomeSupportingWMCheckAtom(), 206 getRootWindow(), getBaseDisplay()->getGnomeSupportingWMCheckAtom(),
207 XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1); 207 XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1);
208 208
209 XChangeProperty(getBaseDisplay()->getXDisplay(), gnome_win, 209 XChangeProperty(getBaseDisplay()->getXDisplay(), gnome_win,
210 getBaseDisplay()->getGnomeSupportingWMCheckAtom(), 210 getBaseDisplay()->getGnomeSupportingWMCheckAtom(),
211 XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1); 211 XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1);
212 212
213 Atom gnomeatomlist[1] = {getBaseDisplay()->getGnomeWorkspaceAtom()}; 213 Atom gnomeatomlist[1] = {getBaseDisplay()->getGnomeWorkspaceAtom()};
214
214 XChangeProperty(getBaseDisplay()->getXDisplay(), 215 XChangeProperty(getBaseDisplay()->getXDisplay(),
215 getRootWindow(), getBaseDisplay()->getGnomeProtAtom(), 216 getRootWindow(), getBaseDisplay()->getGnomeProtAtom(),
216 XA_ATOM, 32, PropModeReplace, 217 XA_ATOM, 32, PropModeReplace,
@@ -1055,7 +1056,7 @@ void BScreen::InitMenu(void) {
1055 0, 0, 1056 0, 0,
1056#endif // NLS 1057#endif // NLS
1057 "xterm"), 1058 "xterm"),
1058 BScreen::Execute, 1059 BScreen::EXECUTE,
1059 i18n->getMessage( 1060 i18n->getMessage(
1060#ifdef NLS 1061#ifdef NLS
1061 ScreenSet, Screenxterm, 1062 ScreenSet, Screenxterm,
@@ -1070,7 +1071,7 @@ void BScreen::InitMenu(void) {
1070 0, 0, 1071 0, 0,
1071#endif // NLS 1072#endif // NLS
1072 "Restart"), 1073 "Restart"),
1073 BScreen::Restart); 1074 BScreen::RESTART);
1074 rootmenu->insert(i18n->getMessage( 1075 rootmenu->insert(i18n->getMessage(
1075#ifdef NLS 1076#ifdef NLS
1076 ScreenSet, ScreenExit, 1077 ScreenSet, ScreenExit,
@@ -1078,7 +1079,7 @@ void BScreen::InitMenu(void) {
1078 0, 0, 1079 0, 0,
1079#endif // NLS 1080#endif // NLS
1080 "Exit"), 1081 "Exit"),
1081 BScreen::Exit); 1082 BScreen::EXIT);
1082 } else 1083 } else
1083 fluxbox->saveMenuFilename(fluxbox->getMenuFilename()); 1084 fluxbox->saveMenuFilename(fluxbox->getMenuFilename());
1084} 1085}
@@ -1181,7 +1182,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1181 continue; 1182 continue;
1182 } 1183 }
1183 1184
1184 menu->insert(label, BScreen::Execute, command); 1185 menu->insert(label, BScreen::EXECUTE, command);
1185 break; 1186 break;
1186 1187
1187 case 442: // exit 1188 case 442: // exit
@@ -1198,7 +1199,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1198 continue; 1199 continue;
1199 } 1200 }
1200 1201
1201 menu->insert(label, BScreen::Exit); 1202 menu->insert(label, BScreen::EXIT);
1202 break; 1203 break;
1203 1204
1204 case 561: // style 1205 case 561: // style
@@ -1238,7 +1239,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1238 *(style + command_length) = '\0'; 1239 *(style + command_length) = '\0';
1239 } 1240 }
1240 1241
1241 menu->insert(label, BScreen::SetStyle, style); 1242 menu->insert(label, BScreen::SETSTYLE, style);
1242 } 1243 }
1243 1244
1244 break; 1245 break;
@@ -1380,9 +1381,9 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1380 } 1381 }
1381 1382
1382 if (*command) 1383 if (*command)
1383 menu->insert(label, BScreen::RestartOther, command); 1384 menu->insert(label, BScreen::RESTARTOTHER, command);
1384 else 1385 else
1385 menu->insert(label, BScreen::Restart); 1386 menu->insert(label, BScreen::RESTART);
1386 } 1387 }
1387 1388
1388 break; 1389 break;
@@ -1403,7 +1404,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1403 continue; 1404 continue;
1404 } 1405 }
1405 1406
1406 menu->insert(label, BScreen::Reconfigure); 1407 menu->insert(label, BScreen::RECONFIGURE);
1407 } 1408 }
1408 1409
1409 break; 1410 break;
@@ -1488,7 +1489,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1488 strncpy(style + slen + 1, ls[n], nlen + 1); 1489 strncpy(style + slen + 1, ls[n], nlen + 1);
1489 1490
1490 if ((! stat(style, &statbuf)) && S_ISREG(statbuf.st_mode)) 1491 if ((! stat(style, &statbuf)) && S_ISREG(statbuf.st_mode))
1491 stylesmenu->insert(ls[n], BScreen::SetStyle, style); 1492 stylesmenu->insert(ls[n], BScreen::SETSTYLE, style);
1492 1493
1493 delete [] ls[n]; 1494 delete [] ls[n];
1494 } 1495 }