Commit 146af696 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Set LogDir by default to /var/log/gdm and add configure --with-log-dir

2007-04-13  Brian Cameron  <brian.cameron@sun.com>

        * configure.ac, config/Makefile.am: Set LogDir by default to
          /var/log/gdm and add configure --with-log-dir option so this
          can be easily configured.
        * gui/modules/AccessDwellMouseEvents.in,
          gui/modules/AccessKeyMouseEvents.in: Improve comments and make
          GOK key binding a bit less painful to enter.

svn path=/trunk/; revision=4829
parent f3c47295
This diff is collapsed.
......@@ -5,11 +5,11 @@ bisessdir = $(datadir)/gdm/BuiltInSessions
instsessdir = $(datadir)/xsessions
initdir = $(gdmconfdir)/Init
authdir = $(localstatedir)/gdm
logdir = $(localstatedir)/log/gdm
gnomercdir = $(gdmconfdir)
postdir = $(gdmconfdir)/PostSession
predir = $(gdmconfdir)/PreSession
postlogindir = $(gdmconfdir)/PostLogin
# logdir is set by configure.ac
noinst_DATA = gdm.conf
......
......@@ -835,9 +835,17 @@ AC_SUBST(EXTRA_SETUP_LIBS)
#
AC_SUBST(authdir, ${localstatedir}/gdm)
AC_SUBST(gdmlocaledir, ${gdmconfdir})
AC_SUBST(logdir, ${localstatedir}/log/gdm)
AC_SUBST(pixmapdir, ${datadir}/pixmaps)
AC_ARG_WITH(log-dir, [ --with-log-dir=<file> log dir])
if ! test -z "$with_log_dir"; then
GDM_LOG_DIR=$with_log_dir
else
GDM_LOG_DIR=/var/log/gdm
fi
AC_SUBST(logdir, $GDM_LOG_DIR)
withval=""
AC_ARG_WITH(at-bindir,
[ --with-at-bindir=<PATH> PATH to Accessible Technology programs [default=BINDIR]],)
......
......@@ -33,17 +33,20 @@
# <Add> @AT_BINDIR@/orca -n -d main-window
#
# GNOME On-Screen Keyboard - support several different options for different
# user needs. Note these gestures all start by moving the mouse into the top
# window border.
# AT Progarm - GOK (GNOME On-screen Keyboard)
#
# Support several different options for different user needs. Note these
# gestures all start by moving the mouse into the top window border.
#
TBLR I 10000 @AT_BINDIR@/gok --login --access-method=dwellselection
TLBR I 10000 @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1
TRBL I 10000 @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2
TBRL I 10000 @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch3 --select-action=switch3
# Orca. Note these gestures all start by moving the mouse into the
# bottom window border.
# AT Program - ORCA
#
# Note these gestures all start by moving the mouse into the bottom window
# border.
#
# Speech
#
......
......@@ -15,7 +15,7 @@
#
# e.g.
#
# <Control>k 5 1000 10000 @AT_BINDIR@/gok --login --access-method=directselection
# <Control>k 1 1000 10000 @AT_BINDIR@/gok --login --access-method=directselection
#
# Means press Contol-k 5 times, holding each keypress down for at least 1000ms
# (1s) each time and with no greater interval than 10000ms (10s) between each
......@@ -54,19 +54,28 @@
# <Add> @AT_BINDIR@/gnome-mag
#
# hold right or left mouse button 3 times for 3 seconds each time
# AT Program - GOK (GNOME On-screen Keyboard)
#
<Mouse1> 3 3000 10000 @AT_BINDIR@/gok --login --access-method=directselection
# we add the right mouse button as it may be the left mouse button
# for a left handed user
# Include a gesture for both right and left mouse button, for both right
# and left handed users.
#
# hold right or left mouse button 3 times for 3 seconds each time.
<Mouse1> 3 3000 10000 @AT_BINDIR@/gok --login --access-method=directselection
<Mouse3> 3 3000 10000 @AT_BINDIR@/gok --login --access-method=directselection
# Also support Xinput switches
#
<Switch1> 1 5000 0 @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1
<Switch2> 3 50 3000 @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2
<Switch3> 3 1000 10000 @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch3 --select-action=switch3
# Although most GOK users would want to use a mouse/switch button to start GOK,
# also include a keybinding for starting GOK with direct selection mode.
#
<Control>k 1 1000 10000 @AT_BINDIR@/gok --login --access-method=directselection
# AT Program - ORCA
#
# press ctrl-s for 1 second to launch orca in speech mode
#
<Control>s 1 1000 10000 @AT_BINDIR@/orca -n -d main-window
......@@ -80,7 +89,3 @@
<Control>o 1 1000 10000 @AT_BINDIR@/orca -n -d main-window -e magnifier
<Control>g 1 1000 10000 @AT_BINDIR@/orca -n -d main-window -e magnifier
# Start GOK with direct selection mode.
#
<Control>k 5 1000 10000 @AT_BINDIR@/gok --login --access-method=directselection
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment