Skip to content

Commit

Permalink
restored the daemon config option, updated copyright info for 2006
Browse files Browse the repository at this point in the history
  • Loading branch information
sip committed Jan 8, 2006
1 parent 39b102f commit 57ea6f7
Show file tree
Hide file tree
Showing 19 changed files with 46 additions and 35 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
(i.e. for session registering)
* Added automatic numlock on/off option
* Support for numpad Enter key
* restored support for daemon option in the config
file.

1.2.3 - 2005.09.11
* Added FreeBSD, NetBSD, OpenBSD support
Expand Down
4 changes: 2 additions & 2 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ INSTALLATION

USAGE

To launch slim, execute run the slim binary,
To launch slim, execute run the slim binary,
followed by the -d option if you want it to
run as a daemon in the background (reccommended)

Expand All @@ -47,7 +47,7 @@ THEMES
See THEMES

COPYRIGHT
SLiM is copyright (c) 2004-05 by Simone Rota, Johannes Winkelmann
SLiM is copyright (c) 2004-06 by Simone Rota, Johannes Winkelmann
and is available under the GNU General Public License.
See the COPYING file for the complete license.

Expand Down
8 changes: 6 additions & 2 deletions app.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -166,6 +166,10 @@ void App::Run() {

#ifndef XNEST_DEBUG
OpenLog();

if (cfg.getOption("daemon") == "yes") {
daemonmode = true;
}

// Daemonize
if (daemonmode) {
Expand Down
4 changes: 2 additions & 2 deletions app.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
5 changes: 3 additions & 2 deletions cfg.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SLiM - Simple Login Manager
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -25,6 +25,7 @@ Cfg::Cfg() {
options.insert(option("default_xserver","/usr/X11R6/bin/X"));
options.insert(option("xserver_arguments",""));
options.insert(option("numlock",""));
options.insert(option("daemon",""));
options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session"));
options.insert(option("halt_cmd","/sbin/shutdown -h now"));
options.insert(option("reboot_cmd","/sbin/shutdown -r now"));
Expand Down
4 changes: 2 additions & 2 deletions cfg.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SLiM - Simple Login Manager
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions const.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions image.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SLiM - Simple Login Manager
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions image.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SLiM - Simple Login Manager
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions input.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions input.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions numlock.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SLiM - Simple Login Manager
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions numlock.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* SLiM - Simple Login Manager
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions panel.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions panel.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
6 changes: 5 additions & 1 deletion slim.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
# Commands executed when starting and exiting a session.
# They can be used for registering a X11 session with
# sessreg. You can use the %user variable

#
# sessionstart_cmd some command
# sessionstop_cmd some command

# Start in daemon mode. Valid values: yes | no
# Note that this can overridden by the command line
# option "-d"
# daemon yes

# Available sessions (first one is the default).
# The current chosen session name is replaced in the login_cmd
Expand Down
4 changes: 2 additions & 2 deletions switchuser.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions switchuser.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* SLiM - Simple Login Manager
Copyright (C) 1997, 1998 Per Liden
Copyright (C) 2004-05 Simone Rota <[email protected]>
Copyright (C) 2004-05 Johannes Winkelmann <[email protected]>
Copyright (C) 2004-06 Simone Rota <[email protected]>
Copyright (C) 2004-06 Johannes Winkelmann <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down

0 comments on commit 57ea6f7

Please sign in to comment.