-/* xanalogtv, Copyright (c) 2003 Trevor Blackwell <tlb@tlb.org>
+/* xanalogtv, Copyright (c) 2003-2018 Trevor Blackwell <tlb@tlb.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#endif
#include "screenhack.h"
-#include "xpm-pixmap.h"
+#include "ximage-loader.h"
#include "analogtv.h"
#include "images/logo-50.xpm"
chansetting *cs;
int change_now;
-
+ int colorbars_only_p;
};
ypos=ANALOGTV_V/5;
xpos=ANALOGTV_VIS_START + ANALOGTV_VIS_LEN/2;
+ if (! st->colorbars_only_p)
{
char localname[256];
if (gethostname (localname, sizeof (localname))==0) {
}
ypos += st->ugly_font.char_h*5/2;
- analogtv_draw_xpm(st->tv, input,
- logo_50_xpm, xpos - 100, ypos);
+ if (! st->colorbars_only_p)
+ analogtv_draw_xpm(st->tv, input,
+ logo_50_xpm, xpos - 100, ypos);
ypos += 58;
ypos += st->ugly_font.char_h*4;
#endif
+ if (! st->colorbars_only_p)
{
char timestamp[256];
time_t t = time ((time_t *) 0);
static XrmOptionDescRec xanalogtv_options [] = {
{ "-delay", ".delay", XrmoptionSepArg, 0 },
+ { "-colorbars-only", ".colorbarsOnly", XrmoptionNoArg, "True" },
ANALOGTV_OPTIONS
{ 0, 0, 0, 0 }
};
}
-#if 0
-static int
-analogtv_load_xpm(analogtv *it, analogtv_input *input, char **xpm)
-{
- Pixmap pixmap;
- XImage *image;
- int width,height;
- int rc;
-
- pixmap=xpm_data_to_pixmap (it->dpy, it->window, xpm,
- &width, &height, NULL);
- image = XGetImage(it->dpy, pixmap, 0, 0, width, height, ~0L, ZPixmap);
- XFreePixmap(it->dpy, pixmap);
- rc=analogtv_load_ximage(it, input, image);
- if (image) XDestroyImage(image);
- return rc;
-}
-#endif
-
-
static void add_stations(struct state *st)
{
while (st->n_stations < MAX_STATIONS) {
analogtv_input *input = st->stations[i];
st->chansettings[i].image_loaded_p = True;
- if (i == 0) { /* station 0 is always colorbars */
+ if (i == 0 || /* station 0 is always colorbars */
+ st->colorbars_only_p) {
input->updater = update_smpte_colorbars;
input->do_teletext=1;
}
st->window = window;
st->tv=analogtv_allocate(dpy, window);
+ st->colorbars_only_p =
+ get_boolean_resource(dpy, "colorbarsOnly", "ColorbarsOnly");
+
add_stations(st);
analogtv_set_defaults(st->tv, "");