Skip to content

Commit

Permalink
Missed commit from before converting to svn
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen Bach committed Apr 26, 2006
1 parent fce2247 commit 0f6bf15
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 18 deletions.
3 changes: 3 additions & 0 deletions viewglob/TODO
@@ -1,3 +1,6 @@
- after parsing file name, when scanning through list:
if (name > parsed)
parsed is new file (don't have to go through whole list)
- lex/yacc for vgexpand parsing
- minilanguage for shell scanning?
- dir-order doesn't work
Expand Down
11 changes: 8 additions & 3 deletions viewglob/common/x11-stuff.c
Expand Up @@ -46,10 +46,10 @@

#include <glib.h>

static Window *get_client_list (Display *disp, gulong *size);
static gchar* get_property (Display* disp, Window win, Atom xa_prop_type,
static Window *get_client_list(Display *disp, gulong *size);
static gchar* get_property(Display* disp, Window win, Atom xa_prop_type,
gchar* prop_name, gulong* size);
static gchar* get_window_title (Display* disp, Window win);
static gchar* get_window_title(Display* disp, Window win);
static gboolean client_msg(Display* disp, Window win, gchar* msg,
gulong data0, gulong data1, gulong data2, gulong data3, gulong data4);

Expand Down Expand Up @@ -242,6 +242,11 @@ static gchar* get_property (Display* disp, Window win,

xa_prop_name = XInternAtom(disp, prop_name, False);

/* MAX_PROPERTY_VALUE_LEN / 4 explanation (XGetWindowProperty manpage):
long_length = Specifies the length in 32-bit multiples of the
data to be retrieved.
*/
if (XGetWindowProperty(disp, win, xa_prop_name, 0,
MAX_PROPERTY_VALUE_LEN / 4, False,
xa_prop_type, &xa_ret_type, &ret_format,
Expand Down
2 changes: 1 addition & 1 deletion viewglob/vgdisplay/jump-resize.c
Expand Up @@ -194,7 +194,7 @@ static gboolean get_win_geometry(Display* Xdisplay, Window win, gint* x,
&depth)) {
case BadDrawable:
case BadWindow:
g_warning("Error while getting terminal window attributes");
g_warning("Error while getting window geometry");
return FALSE;
default:
break;
Expand Down
19 changes: 9 additions & 10 deletions viewglob/vgdisplay/vgclassic.c
Expand Up @@ -258,24 +258,23 @@ gint main(gint argc, gchar **argv) {
G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, syslogging, NULL);
openlog_wrapped(g_get_prgname());

GtkWidget* vbox;
GtkWidget* scrolled_window;

/* Display preferences. */
struct prefs v;

/* This is pretty central -- it gets passed around a lot. */
Exhibit e;
e.dls = NULL;
e.term_win = g_string_new(NULL);

/* Option defaults. */
prefs_init(&v);
parse_args(argc, argv, &v);

/* Set the label font sizes. */
file_box_set_sizing(v.font_size_modifier, v.show_icons);
dlisting_set_sizing(v.font_size_modifier);

/* This is pretty central -- it gets passed around a lot. */
Exhibit e;
e.dls = NULL;
e.term_win = g_string_new(NULL);

GtkWidget* vbox;
GtkWidget* scrolled_window;

/* Create window. */
e.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(e.window), 2);
Expand Down
9 changes: 5 additions & 4 deletions viewglob/vgdisplay/vgmini.c
Expand Up @@ -89,21 +89,22 @@ gint main(gint argc, char** argv) {
G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, syslogging, NULL);
openlog_wrapped(g_get_prgname());

/* Display preferences. */
struct prefs prfs;
prefs_init(&prfs);
parse_args(argc, argv, &prfs);

/* vgmini keeps sizes a little smaller than vgclassic. */
file_box_set_sizing(prfs.font_size_modifier - 1, prfs.show_icons);
dircont_set_sizing(prfs.font_size_modifier - 1);

struct vgmini vg;
vg.dcs = NULL;
vg.active = NULL;
vg.width_change = 0;
vg.term_win = g_string_new(NULL);
vg.jump_resize = prfs.jump_resize;

/* vgmini keeps sizes a little smaller than vgclassic. */
file_box_set_sizing(prfs.font_size_modifier - 1, prfs.show_icons);
dircont_set_sizing(prfs.font_size_modifier - 1);

/* Toplevel window. */
vg.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(vg.window), 0);
Expand Down

0 comments on commit 0f6bf15

Please sign in to comment.