aboutsummaryrefslogtreecommitdiff
path: root/src/BaseDisplay.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-04 15:09:30 (GMT)
committerfluxgen <fluxgen>2002-08-04 15:09:30 (GMT)
commit9789f8cb6b81e6dfd7cab05d0760790fb8c0aa5a (patch)
treef80974d4d822e62128cf499864d7dc9d5e64b978 /src/BaseDisplay.cc
parent33d482aba5053964594fb3c5b6f6a1537ca10cbf (diff)
downloadfluxbox_pavel-9789f8cb6b81e6dfd7cab05d0760790fb8c0aa5a.zip
fluxbox_pavel-9789f8cb6b81e6dfd7cab05d0760790fb8c0aa5a.tar.bz2
const correct and some comments
Diffstat (limited to 'src/BaseDisplay.cc')
-rw-r--r--src/BaseDisplay.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 2b5a194..d214906 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: BaseDisplay.cc,v 1.15 2002/07/19 21:16:53 fluxgen Exp $ 25// $Id: BaseDisplay.cc,v 1.16 2002/08/04 15:09:30 fluxgen Exp $
26 26
27// use GNU extensions 27// use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -136,7 +136,7 @@ static void signalhandler(int sig) {
136 static int re_enter = 0; 136 static int re_enter = 0;
137 137
138 switch (sig) { 138 switch (sig) {
139 case SIGCHLD: 139 case SIGCHLD: // we don't want the child process to kill us
140 int status; 140 int status;
141 waitpid(-1, &status, WNOHANG | WUNTRACED); 141 waitpid(-1, &status, WNOHANG | WUNTRACED);
142 142
@@ -192,18 +192,18 @@ static void signalhandler(int sig) {
192 192
193// convenience functions 193// convenience functions
194#ifndef __EMX__ 194#ifndef __EMX__
195void bexec(const char *command, char* displaystring) { 195void bexec(const char *command, char *displaystring) {
196 if (! fork()) { 196 if (! fork()) {
197 setsid(); 197 setsid();
198 putenv(displaystring); 198 putenv(displaystring);
199 execl("/bin/sh", "/bin/sh", "-c", command, NULL); 199 execl("/bin/sh", "/bin/sh", "-c", command, 0);
200 exit(0); 200 exit(0);
201 } 201 }
202} 202}
203#endif // !__EMX__ 203#endif // !__EMX__
204 204
205 205
206BaseDisplay::BaseDisplay(char *app_name, char *dpy_name):FbAtoms(0), 206BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name):FbAtoms(0),
207m_startup(true), m_shutdown(false), 207m_startup(true), m_shutdown(false),
208m_display_name(XDisplayName(dpy_name)), m_app_name(app_name), 208m_display_name(XDisplayName(dpy_name)), m_app_name(app_name),
209m_server_grabs(0) 209m_server_grabs(0)