Commit bb6d1844 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Remove "About feh" menu item & image

parent ef3f1979

share/images/about.png

deleted100644 → 0
−59.7 KiB
Loading image diff...

src/events.c

+34 −50
Original line number Diff line number Diff line
@@ -510,22 +510,7 @@ static void feh_event_handle_MotionNotify(XEvent * ev) 
	} else {

		while (XCheckTypedWindowEvent(disp, ev->xmotion.window, MotionNotify, ev));

		winwid = winwidget_get_from_window(ev->xmotion.window);

		if (winwid != NULL) {

			if (winwid->type == WIN_TYPE_ABOUT) {

				Imlib_Image orig_im;

				int x, y;



				x = ev->xmotion.x - winwid->im_x;

				y = ev->xmotion.y - winwid->im_y;

				orig_im = winwid->im;

				winwid->im = gib_imlib_clone_image(orig_im);

				imlib_context_set_image(winwid->im);

				imlib_apply_filter("bump_map_point(x=[],y=[],map="

						PREFIX "/share/feh/images/about.png);", &x, &y);

				winwidget_render_image(winwid, 0, 0);

				gib_imlib_free_image_and_decache(winwid->im);

				winwid->im = orig_im;

			} else if (winwid->type == WIN_TYPE_THUMBNAIL) {

		if ((winwid != NULL) && (winwid->type == WIN_TYPE_THUMBNAIL)) {

			static feh_thumbnail *last_thumb = NULL;

			feh_thumbnail *thumbnail;

			int x, y;
@@ -562,7 +547,6 @@ static void feh_event_handle_MotionNotify(XEvent * ev) 
			last_thumb = thumbnail;

		}

	}

	}

	return;

}

src/menu.c

+1 −33
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ Window menu_cover = 0; 
feh_menu *menu_root = NULL;

feh_menu *menu_main = NULL;

feh_menu *menu_single_win = NULL;

feh_menu *menu_about_win = NULL;

feh_menu *menu_thumbnail_viewer = NULL;

feh_menu *menu_thumbnail_win = NULL;

feh_menu *menu_bg = NULL;
@@ -50,7 +49,7 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data); 
void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i);



enum {

	CB_ABOUT = 1, CB_CLOSE, CB_EXIT, CB_RELOAD, CB_REMOVE, CB_DELETE, CB_RESET,

	CB_CLOSE = 1, CB_EXIT, CB_RELOAD, CB_REMOVE, CB_DELETE, CB_RESET,

	CB_REMOVE_THUMB, CB_DELETE_THUMB, CB_BG_TILED, CB_BG_SCALED,

	CB_BG_CENTERED, CB_BG_FILLED, CB_BG_TILED_NOFILE,

	CB_BG_SCALED_NOFILE, CB_BG_CENTERED_NOFILE, CB_BG_FILLED_NOFILE,
@@ -955,8 +954,6 @@ void feh_menu_init_main(void) 
	mi = feh_menu_add_entry(menu_main, "Options", NULL, "OPTIONS", 0, NULL, NULL);

	mi->func_gen_sub = feh_menu_func_gen_options;



	if (!opt.full_screen)

		feh_menu_add_entry(menu_main, "About " PACKAGE, NULL, NULL, CB_ABOUT, NULL, NULL);

	if (opt.multiwindow)

		feh_menu_add_entry(menu_main, "Close", NULL, NULL, CB_CLOSE, NULL, NULL);

	feh_menu_add_entry(menu_main, "Exit", NULL, NULL, CB_EXIT, NULL, NULL);
@@ -1104,17 +1101,6 @@ void feh_menu_init_common() 
	return;

}



void feh_menu_init_about_win(void)

{

	menu_about_win = feh_menu_new();

	menu_about_win->name = estrdup("ABOUTWIN");



	feh_menu_add_entry(menu_about_win, "Close", NULL, NULL, CB_CLOSE, NULL, NULL);

	feh_menu_add_entry(menu_about_win, "Exit", NULL, NULL, CB_EXIT, NULL, NULL);



	return;

}



void feh_menu_init_single_win(void)

{

	feh_menu *m;
@@ -1147,8 +1133,6 @@ void feh_menu_init_single_win(void) 
	feh_menu_add_entry(menu_single_win, NULL, NULL, NULL, 0, NULL, NULL);

	mi = feh_menu_add_entry(menu_single_win, "Options", NULL, "OPTIONS", 0, NULL, NULL);

	mi->func_gen_sub = feh_menu_func_gen_options;

	feh_menu_add_entry(menu_single_win, "About " PACKAGE, NULL, NULL,

			CB_ABOUT, NULL, NULL);

	feh_menu_add_entry(menu_single_win, "Close", NULL, NULL, CB_CLOSE, NULL, NULL);

	feh_menu_add_entry(menu_single_win, "Exit", NULL, NULL, CB_EXIT, NULL, NULL);
@@ -1177,8 +1161,6 @@ void feh_menu_init_thumbnail_win(void) 
	feh_menu_add_entry(menu_thumbnail_win, NULL, NULL, NULL, 0, NULL, NULL);

	mi = feh_menu_add_entry(menu_thumbnail_win, "Options", NULL, "OPTIONS", 0, NULL, NULL);

	mi->func_gen_sub = feh_menu_func_gen_options;

	feh_menu_add_entry(menu_thumbnail_win, "About " PACKAGE, NULL, NULL,

			CB_ABOUT, NULL, NULL);

	feh_menu_add_entry(menu_thumbnail_win, "Close", NULL, NULL, CB_CLOSE, NULL, NULL);

	feh_menu_add_entry(menu_thumbnail_win, "Exit", NULL, NULL, CB_EXIT, NULL, NULL);

	return;
@@ -1216,8 +1198,6 @@ void feh_menu_init_thumbnail_viewer(void) 
	mi = feh_menu_add_entry(menu_thumbnail_viewer, "Options", NULL,

			"OPTIONS", 0, NULL, NULL);

	mi->func_gen_sub = feh_menu_func_gen_options;

	feh_menu_add_entry(menu_thumbnail_viewer, "About " PACKAGE, NULL, NULL,

			CB_ABOUT, NULL, NULL);

	feh_menu_add_entry(menu_thumbnail_viewer, "Close", NULL, NULL, CB_CLOSE, NULL, NULL);

	feh_menu_add_entry(menu_thumbnail_viewer, "Exit", NULL, NULL, CB_EXIT, NULL, NULL);

	m = feh_menu_new();
@@ -1284,8 +1264,6 @@ void feh_menu_cb_opt_fullscreen(feh_menu * m, feh_menu_item * i) 
void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data)

{

	char *path;

	Imlib_Image im;

	winwidget winwid;



	switch (action) {

		case CB_BG_TILED:
@@ -1320,16 +1298,6 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data) 
		case CB_BG_FILLED_NOFILE:

			feh_wm_set_bg(NULL, m->fehwin->im, 0, 0, 1, (int) data, 1);

			break;

		case CB_ABOUT:

			if (feh_load_image_char(&im, PREFIX "/share/feh/images/about.png")

					!= 0) {

				winwid = winwidget_create_from_image(im, "About " PACKAGE,

						WIN_TYPE_ABOUT);

				winwid->file = gib_list_add_front(NULL,

						feh_file_new(PREFIX "/share/feh/images/about.png"));

				winwidget_show(winwid);

			}

			break;

		case CB_CLOSE:

			winwidget_destroy(m->fehwin);

			break;

src/menu.h

+0 −2
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ void feh_menu_move(feh_menu * m, int x, int y); 
void feh_menu_slide_all_menus_relative(int dx, int dy);

void feh_menu_init_main(void);

void feh_menu_init_single_win(void);

void feh_menu_init_about_win(void);

void feh_menu_init_common(void);

void feh_menu_init_thumbnail_viewer(void);

void feh_menu_init_thumbnail_win(void);
@@ -169,7 +168,6 @@ void feh_menu_select_submenu(feh_menu * selected_menu); 


extern feh_menu *menu_root;

extern feh_menu *menu_single_win;

extern feh_menu *menu_about_win;

extern feh_menu *menu_thumbnail_viewer;

extern feh_menu *menu_thumbnail_win;

extern Window menu_cover;

src/winwidget.c

+1 −9
Original line number Diff line number Diff line
@@ -676,10 +676,6 @@ void winwidget_destroy(winwidget winwid) 
	winwidget_destroy_xwin(winwid);

	if (winwid->name)

		free(winwid->name);

	if ((winwid->type == WIN_TYPE_ABOUT) && winwid->file) {

		feh_file_free(FEH_FILE(winwid->file->data));

		free(winwid->file);

	}

	if (winwid->gc)

		XFreeGC(disp, winwid->gc);

	if (winwid->im)
@@ -1058,11 +1054,7 @@ void winwidget_show_menu(winwidget winwid) 
	Window r;



	XQueryPointer(disp, winwid->win, &r, &r, &x, &y, &b, &b, &c);

	if (winwid->type == WIN_TYPE_ABOUT) {

		if (!menu_about_win)

			feh_menu_init_about_win();

		feh_menu_show_at_xy(menu_about_win, winwid, x, y);

	} else if (winwid->type == WIN_TYPE_SINGLE) {

	if (winwid->type == WIN_TYPE_SINGLE) {

		if (!menu_single_win)

			feh_menu_init_single_win();

		feh_menu_show_at_xy(menu_single_win, winwid, x, y);