"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "zfuncs.cc" between
fotoxx-22.41.tar.gz and fotoxx-22.50.tar.gz

About: fotoxx is a program for photo editing and collection management.

zfuncs.cc  (fotoxx-22.41)	:	zfuncs.cc  (fotoxx-22.50)
skipping to change at line 6928		skipping to change at line 6928
context.rect.height = gdk_window_get_height(gdkwin);		context.rect.height = gdk_window_get_height(gdkwin);
context.reg = cairo_region_create_rectangle(&context.rect);		context.reg = cairo_region_create_rectangle(&context.rect);
context.ctx = gdk_window_begin_draw_frame(gdkwin,context.reg);		context.ctx = gdk_window_begin_draw_frame(gdkwin,context.reg);
context.dcr = gdk_drawing_context_get_cairo_context(context.ctx);		context.dcr = gdk_drawing_context_get_cairo_context(context.ctx);
return context.dcr;		return context.dcr;
}		}
void draw_context_destroy(draw_context_t &context)		void draw_context_destroy(draw_context_t &context)
{		{
if (! context.dcr) {		if (! context.dcr) {
Plog(0,"draw_context_destroy(): not created");		Plog(0,"draw_context_destroy(): not created \n");
return;		return;
}		}
gdk_window_end_draw_frame(context.win,context.ctx);		gdk_window_end_draw_frame(context.win,context.ctx);
cairo_region_destroy(context.reg);		cairo_region_destroy(context.reg);
/* cairo_destroy(context.dcr); this is fatal */		/* cairo_destroy(context.dcr); this is fatal */
context.dcr = 0;		context.dcr = 0;
return;		return;
}		}
/******************************************************************************* */		/******************************************************************************* */
skipping to change at line 8303		skipping to change at line 8303
if (me != me0 && me0 >= 0) { // unhighlight prior		if (me != me0 && me0 >= 0) { // unhighlight prior
paint_menu(cr,vbm,me0,0);		paint_menu(cr,vbm,me0,0);
me0 = -1;		me0 = -1;
}		}
if (me == me0) return; // same as before		if (me == me0) return; // same as before
if (me == vbm->mcount) return; // no new menu match		if (me == vbm->mcount) return; // no new menu match
paint_menu(cr,vbm,me,1); // highlight menu entry at mouse		paint_menu(cr,vbm,me,1); // highlight menu entry at mouse
desc = vbm->menu[me].desc; // show tool tip		desc = vbm->menu[me].desc; // show tool tip
if (desc) poptext_widget(widget,desc,winww,mpy,1,4); // px = menu width, py = mouse		if (desc) poptext_widget(widget,desc,winww,mpy,1,10); // px = menu width, py = mouse
me0 = me; // remember last match		me0 = me; // remember last match
return;		return;
}		}
if (me0 >= 0) // mouse left layout		if (me0 >= 0) // mouse left layout
{		{
paint_menu(cr,vbm,me0,0); // unhighlight prior		paint_menu(cr,vbm,me0,0); // unhighlight prior
desc = vbm->menu[me0].desc; // remove prior tool tip		desc = vbm->menu[me0].desc; // remove prior tool tip
if (desc) poptext_mouse(0,0,0,0,0);		if (desc) poptext_mouse(0,0,0,0,0);
me0 = -1;		me0 = -1;
skipping to change at line 10137		skipping to change at line 10137
GtkWidget *focuswidget;		GtkWidget *focuswidget;
int KB_Ctrl = 0, KB_Alt = 0; // track state of Ctrl and Alt keys		int KB_Ctrl = 0, KB_Alt = 0; // track state of Ctrl and Alt keys
int KBkey = kbevent->keyval;		int KBkey = kbevent->keyval;
cchar *type;		cchar *type;
int ii, cc;		int ii, cc;
if (kbevent->state & GDK_CONTROL_MASK) KB_Ctrl = 1;		if (kbevent->state & GDK_CONTROL_MASK) KB_Ctrl = 1;
if (kbevent->state & GDK_MOD1_MASK) KB_Alt = 1;		if (kbevent->state & GDK_MOD1_MASK) KB_Alt = 1;
if (KBkey == GDK_KEY_Escape) { // escape key		if (KBkey == GDK_KEY_Escape) { // escape key
		Plog(1,"escape key \n"); // 22.50
if (zd->eventCB) zdialog_send_event(zd,"escape");		if (zd->eventCB) zdialog_send_event(zd,"escape");
else zd->zstat = -2;		else zd->zstat = -2;
return 1;		return 1;
}		}
if (KBkey == GDK_KEY_F1) { KBevent(kbevent); return 1; }; // these keys handled by main app		if (KBkey == GDK_KEY_F1) { KBevent(kbevent); return 1; }; // these keys handled by main app
if (KBkey == GDK_KEY_F10) { KBevent(kbevent); return 1; };		if (KBkey == GDK_KEY_F10) { KBevent(kbevent); return 1; };
if (KBkey == GDK_KEY_F11) { KBevent(kbevent); return 1; };		if (KBkey == GDK_KEY_F11) { KBevent(kbevent); return 1; };
for (ii = 0; ii < Nkbshortcuts; ii++) { // look for dialog button shortcut		for (ii = 0; ii < Nkbshortcuts; ii++) { // look for dialog button shortcut
skipping to change at line 12255		skipping to change at line 12256
xmessage(message);		xmessage(message);
return 0;		return 0;
}		}
zd = zdialog_new("post",parent,null);		zd = zdialog_new("post",parent,null);
zdialog_add_widget(zd,"hbox","hb1","dialog",0,"space=3");		zdialog_add_widget(zd,"hbox","hb1","dialog",0,"space=3");
zdialog_add_widget(zd,"label","lab1","hb1",message,"space=5");		zdialog_add_widget(zd,"label","lab1","hb1",message,"space=5");
zdialog_set_decorated(zd,0);		zdialog_set_decorated(zd,0);
zdialog_can_focus(zd,0); // 22.1		zdialog_can_focus(zd,0); // 22.1
zdialog_run(zd,0,posn); // mouse position		zdialog_run(zd,0,posn); // mouse position
		zdialog_present(zd); // 22.50
if (seconds) {		if (seconds) {
if (ii < 99) ii++; // track unique zdialogs		if (ii < 99) ii++; // track unique zdialogs
else ii = 0;		else ii = 0;
zdx[ii].zd = zd;		zdx[ii].zd = zd;
zdx[ii].uniqueID = zd->uniqueID;		zdx[ii].uniqueID = zd->uniqueID;
g_timeout_add_seconds(seconds,(GSourceFunc) zmessage_post_timeout,&zdx[ii] );		g_timeout_add_seconds(seconds,(GSourceFunc) zmessage_post_timeout,&zdx[ii] );
}		}
return zd;		return zd;
skipping to change at line 12295		skipping to change at line 12297
if (! main_thread()) return 0;		if (! main_thread()) return 0;
snprintf(messagebold,460,"<span font=\"bold\" color=\"red\">%s</span>",messag e);		snprintf(messagebold,460,"<span font=\"bold\" color=\"red\">%s</span>",messag e);
zd = zdialog_new("post",parent,null);		zd = zdialog_new("post",parent,null);
zdialog_add_widget(zd,"hbox","hb1","dialog",0,"space=3");		zdialog_add_widget(zd,"hbox","hb1","dialog",0,"space=3");
zdialog_add_widget(zd,"label","lab1","hb1",messagebold,"space=5");		zdialog_add_widget(zd,"label","lab1","hb1",messagebold,"space=5");
zdialog_set_decorated(zd,0);		zdialog_set_decorated(zd,0);
zdialog_can_focus(zd,0); // 22.1		zdialog_can_focus(zd,0); // 22.1
zdialog_run(zd,0,posn); // mouse position		zdialog_run(zd,0,posn); // mouse position
		zdialog_present(zd); // 22.50
if (seconds) {		if (seconds) {
if (ii < 99) ii++; // track unique zdialogs		if (ii < 99) ii++; // track unique zdialogs
else ii = 0;		else ii = 0;
zdx[ii].zd = zd;		zdx[ii].zd = zd;
zdx[ii].uniqueID = zd->uniqueID;		zdx[ii].uniqueID = zd->uniqueID;
g_timeout_add_seconds(seconds,(GSourceFunc) zmessage_post_timeout,&zdx[ii] );		g_timeout_add_seconds(seconds,(GSourceFunc) zmessage_post_timeout,&zdx[ii] );
}		}
return zd;		return zd;
End of changes. 5 change blocks.
2 lines changed or deleted		5 lines changed or added

---