/*
* On-screen Display Daemon
*
- * (c) 2010 Martin Mares <mj@ucw.cz>
+ * (c) 2010--2013 Martin Mares <mj@ucw.cz>
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <inttypes.h>
+#include <unistd.h>
#include <poll.h>
#include <getopt.h>
-#include <sys/time.h>
+#include <locale.h>
#include <xosd.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-#define DEBUG
+#undef DEBUG
#include "util.h"
+#include "display.h"
-static xosd *osd;
+static struct osd_state *osd;
-typedef uint64_t timestamp_t;
static timestamp_t now;
/*** Options ***/
-static int num_lines = 4;
-static char *font_name = "-bitstream-bitstream vera sans-bold-r-normal-*-*-320-*-*-p-*-*";
+static int num_lines = 4; // FIXME
+static char *font_name = "-bitstream-bitstream vera sans-bold-r-normal-*-*-320-*-*-p-*-*"; // FIXME
static char *default_color = "green";
static char *default_outline_color = "black";
static int default_duration = 1000;
-static int default_min_duration = 1000;
+static int default_min_duration = 250;
+static int debug_mode;
-static const char short_opts[] = "c:d:f:l:m:o:";
+static const char short_opts[] = "c:d:Df:l:m:o:";
static const struct option long_opts[] = {
{ "color", required_argument, NULL, 'c' },
+ { "debug", no_argument, NULL, 'D' },
{ "duration", required_argument, NULL, 'd' },
{ "font", required_argument, NULL, 'f' },
{ "lines", required_argument, NULL, 'l' },
{ "min-duration", required_argument, NULL, 'm' },
{ "outline-color", required_argument, NULL, 'o' },
- { NULL, 0, NULL, 0 },
+ { NULL, 0, NULL, 0 },
};
static void NONRET
fprintf(stderr, "Usage: osdd <options>\n\n\
Options:\n\
-c, --color=<c>\t\tDefault color (#rgb, #rrggbb or a name from rgb.txt)\n\
+-D, --debug\t\tDebugging mode (do not detach from the terminal)\n\
-d, --duration=<ms>\tDefault message duration in milliseconds\n\
-f, --font=<f>\t\tFont to use for the OSD\n\
-l, --lines=<n>\t\tNumber of lines of the OSD\n\
case 'd':
default_duration = atoi(optarg);
break;
+ case 'D':
+ debug_mode = 1;
+ break;
case 'f':
font_name = optarg;
break;
DBG("## Displaying message\n");
msg->min_light = now + default_min_duration;
msg->max_light = now + default_duration;
- xosd_set_colour(osd, default_color);
- xosd_set_outline_colour(osd, default_outline_color);
+ char *fg_color = default_color;
+ char *outline_color = default_outline_color;
char *line = msg->text;
- int row = 0;
while (*line)
{
// The parser it destructive, but it does not do any harm, since we display each message only once.
}
DBG("\t%s:%s\n", key, val);
+ struct osd_line *l = NULL;
if (!key[0])
{
- if (row < num_lines)
- xosd_display(osd, row++, XOSD_string, val);
+ l = osd_add_line(osd, OSD_TYPE_TEXT);
+ sprintf(l->u.text, "%.*s", OSD_MAX_LINE_LEN, val);
}
else if (!strcmp(key, "percentage") || !strcmp(key, "percent"))
{
- if (row < num_lines)
- xosd_display(osd, row++, XOSD_percentage, atoi(val));
+ // FIXME
+ // xosd_display(osd, row++, XOSD_percentage, atoi(val));
}
else if (!strcmp(key, "slider"))
{
- if (row < num_lines)
- xosd_display(osd, row++, XOSD_slider, atoi(val));
+ // FIXME
+ // xsd_display(osd, row++, XOSD_slider, atoi(val));
}
else if (!strcmp(key, "duration"))
msg->max_light = now + atoi(val);
else if (!strcmp(key, "min-duration"))
msg->min_light = now + atoi(val);
else if (!strcmp(key, "color"))
- xosd_set_colour(osd, val);
+ fg_color = val; // FIXME: Need copying!
else if (!strcmp(key, "outline-color"))
- xosd_set_outline_colour(osd, val);
- else
- DBG("\tPARSE ERROR\n");
+ outline_color = val; // FIXME: Need copying!
+
+ if (l)
+ {
+ l->fg_color = fg_color;
+ l->outline_color = outline_color;
+ }
line = nl;
}
hide_msg(struct msg *msg)
{
DBG("## Hiding message\n");
- for (int i=0; i<num_lines; i++)
- xosd_display(osd, i, XOSD_string, "");
- xosd_hide(osd);
+ osd_hide(osd);
+ // FIXME: Reset the osd state
free(msg);
}
main(int argc, char **argv)
{
parse_opts(argc, argv);
+ setlocale(LC_CTYPE, "");
XInitThreads();
Display *dpy = XOpenDisplay(NULL);
if (!pty)
die("Cannot intern OSD_QUEUE atom");
+ if (!debug_mode)
+ {
+ pid_t pid = fork();
+ if (pid < 0)
+ die("Cannot fork: %m");
+ if (pid > 0)
+ return 0;
+ setsid();
+ }
+
XSelectInput(dpy, win, PropertyChangeMask);
XDeleteProperty(dpy, win, pty);
XFlush(dpy);
- osd = xosd_create(num_lines);
- if (!osd)
- die("Cannot initialize OSD");
- xosd_set_font(osd, font_name);
- xosd_set_outline_offset(osd, 2);
- xosd_set_pos(osd, XOSD_middle);
- xosd_set_align(osd, XOSD_center);
+ osd = osd_new(dpy);
+ osd_set_font(osd, font_name);
struct pollfd pfd = {
.fd = ConnectionNumber(dpy),
for (;;)
{
- struct timeval tv;
- gettimeofday(&tv, NULL);
- now = (timestamp_t) tv.tv_sec * 1000 + tv.tv_usec / 1000;
+ now = get_current_time();
timestamp_t wait_until = now - 1;
if (!current_msg && first_msg)
{
XEvent ev;
XNextEvent(dpy, &ev);
+ if (osd_handle_event(osd, &ev))
+ continue;
if (ev.type != PropertyNotify)
continue;
XPropertyEvent *p = &ev.xproperty;
projects / osdd.git / blobdiff