aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:40 (GMT)
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:40 (GMT)
commit82fbaff22e3e4b1bbdd1e2192cfeff061ce7285c (patch)
tree308704093028c293b650fcefab4a14ef6f6ca42b /common
parente99e58b6d385a8ae806a97b88ec4dbb26c898619 (diff)
v3.83
Diffstat (limited to 'common')
-rw-r--r--common/Subdir.mk4
-rw-r--r--common/channel.c12
-rw-r--r--common/channel.h2
3 files changed, 16 insertions, 2 deletions
diff --git a/common/Subdir.mk b/common/Subdir.mk
index 0b8b5ec..1bb72d2 100644
--- a/common/Subdir.mk
+++ b/common/Subdir.mk
@@ -16,10 +16,10 @@ OBJS-common-input := \
common/midictrl.o
# RegEdit.c is good old K&R ...
-common/RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
+common/RegEdit.o: CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes
common/channel-no-x11.o: CFLAGS += -DNO_X11=1
-common/channel-no-x11.o:: common/channel.c
+common/channel-no-x11.o: common/channel.c
@$(echo_compile_c)
@$(compile_c)
@$(fixup_deps)
diff --git a/common/channel.c b/common/channel.c
index 0c79355..567f6ae 100644
--- a/common/channel.c
+++ b/common/channel.c
@@ -75,7 +75,10 @@ int cur_capture = CAPTURE_OFF;
int have_config;
int keypad_ntsc = 0;
int keypad_partial = 1;
+int use_wm_fullscreen = 1;
int use_osd = 1;
+int osd_x = 30;
+int osd_y = 20;
int fs_width,fs_height,fs_xoff,fs_yoff;
int pix_width=128, pix_height=96, pix_cols=1;
@@ -468,6 +471,12 @@ read_config(char *conffile, int *argc, char **argv)
if (NULL != (val = cfg_get_str("global","osd")))
if (-1 != (i = str_to_int(val,booltab)))
use_osd = i;
+ if (NULL != (val = cfg_get_str("global","osd-position")))
+ if (2 != sscanf(val,"%d , %d",&osd_x,&osd_y))
+ fprintf(stderr,"invalid values for osd-position: %s\n",val);
+ if (NULL != (val = cfg_get_str("global","use-wm-fullscreen")))
+ if (-1 != (i = str_to_int(val,booltab)))
+ use_wm_fullscreen = i;
if (NULL != (val = cfg_get_str("global","mov-driver")))
mov_driver = val;
@@ -580,6 +589,9 @@ save_config()
fprintf(fp,"keypad-ntsc = %s\n",int_to_str(keypad_ntsc,booltab));
fprintf(fp,"keypad-partial = %s\n",int_to_str(keypad_partial,booltab));
fprintf(fp,"osd = %s\n",int_to_str(use_osd,booltab));
+ fprintf(fp,"osd-position = %d , %d\n",osd_x,osd_y);
+ fprintf(fp,"use-wm-fullscreen = %s\n",
+ int_to_str(use_wm_fullscreen,booltab));
if (mixer)
fprintf(fp,"mixer = %s\n",mixer);
if (midi)
diff --git a/common/channel.h b/common/channel.h
index 4d92893..fbc44f1 100644
--- a/common/channel.h
+++ b/common/channel.h
@@ -45,6 +45,8 @@ extern int jpeg_quality;
extern int keypad_ntsc;
extern int keypad_partial;
extern int use_osd;
+extern int osd_x, osd_y;
+extern int use_wm_fullscreen;
extern int fs_width,fs_height,fs_xoff,fs_yoff;
extern int pix_width,pix_height,pix_cols;
extern int last_sender, cur_sender;

Privacy Policy