ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
31	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	52	$TOOLTIP->show;
33		53
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		55
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
39		58
40	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
42	$TOOLTIP->update;	61	$TOOLTIP->update;
43	}	62	}
…		…
51	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
52	}	71	}
53		72
54	# class methods for events	73	# class methods for events
55	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	76	if $FOCUS;
58	}	77	}
59		78
60	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	81	if $FOCUS;
63	}	82	}
64		83
65	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	85	my ($ev) = @_;
…		…
75	check_tooltip;	94	check_tooltip;
76	}	95	}
77		96
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		98
80	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	101	}
85		102
86	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	104	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
89		106
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		108
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		110
94	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		113
99	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	116	$grab->update if $grab;
102	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		134
120	check_tooltip;	135	check_tooltip;
121	}	136	}
122		137
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	139	if $HOVER;
127	}	140	}
128		141
129	# convert position array to integers	142	# convert position array to integers
130	sub harmonize {	143	sub harmonize {
131	my ($vals) = @_;	144	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	150	$rem += $_ - $i;
138	$_ = $i;	151	$_ = $i;
139	}	152	}
140	}	153	}
141		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
142	# call when resolution changes etc.	171	# call when resolution changes etc.
143	sub rescale_widgets {	172	sub rescale_widgets {
144	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
145		174
146	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	183	}
157
158	$widget->reconfigure;
159	}	184	}
		185
		186	reconfigure_widgets;
160	}	187	}
161		188
162	#############################################################################	189	#############################################################################
163		190
164	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
177	can_events => 1,	204	can_events => 1,
178	@_	205	@_
179	}, $class;	206	}, $class;
180		207
181	for (keys %$self) {	208	for (keys %$self) {
182	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
184	}	211	}
185	}	212	}
186		213
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
189	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
190	}	234	}
191		235
192	sub destroy {	236	sub destroy {
193	my ($self) = @_;	237	my ($self) = @_;
194		238
…		…
196	%$self = ();	240	%$self = ();
197	}	241	}
198		242
199	sub show {	243	sub show {
200	my ($self) = @_;	244	my ($self) = @_;
201
202	return if $self->{parent};	245	return if $self->{parent};
203		246
204	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
205	}	248	}
206		249
207	sub hide {	250	sub show_centered {
208	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1)
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
209		283
210	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
212		299
213	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
214	if $self->{parent};	301	if $self->{parent};
215	}	302	}
216		303
…		…
225	}	312	}
226		313
227	sub set_size {	314	sub set_size {
228	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
229		316
230	$self->{user_w} = $w;	317	$self->{def_w} = $w;
231	$self->{user_h} = $h;	318	$self->{def_h} = $h;
232		319
233	$self->check_size;	320	$self->check_size;
234	}	321	}
235		322
236	sub size_request {	323	sub size_request {
…		…
283		370
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	373	}
287		374
		375	sub set_tooltip {
		376	my ($self, $tooltip) = @_;
		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
		383	$self->{tooltip} = $tooltip;
		384
		385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		386	delete $CFClient::UI::TOOLTIP->{owner};
		387	CFClient::UI::check_tooltip;
		388	}
		389	}
		390
288	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
289	sub coord2local {	392	sub coord2local {
290	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
291		394
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	395	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	408	return if $FOCUS == $self;
306	return unless $self->{can_focus};	409	return unless $self->{can_focus};
307		410
308	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
309		412
310	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
311		414
312	$focus->update if $focus;	415	$focus->update if $focus;
313	$FOCUS->update;	416	$FOCUS->update;
314	}	417	}
315		418
…		…
318		421
319	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
320		423
321	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
322		425
323	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
324		427
325	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
326	}	432	}
327		433
328	sub mouse_motion { }	434	sub mouse_motion { }
329	sub button_up { }	435	sub button_up { }
330	sub key_down { }	436	sub key_down { }
331	sub key_up { }	437	sub key_up { }
332		438
333	sub button_down {	439	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
335		441
336	$self->focus_in;	442	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	477	glPushMatrix;
372	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	481	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
379	glEnd;	485	glEnd;
380	glPopMatrix;	486	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	488	}
383	}	489	}
384		490
385	sub _draw {	491	sub _draw {
386	my ($self) = @_;	492	my ($self) = @_;
…		…
403	sub set_parent {	509	sub set_parent {
404	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
405		511
406	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
407		513
408	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible;
		515
409	$self->check_size	516	$self->check_size;
410	unless exists $self->{req_w};	517	$self->show;
411	}	518	}
412		519
413	sub check_size {	520	sub check_size {
414	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
415		522
…		…
428	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
429		536
430	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	538	}
432		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
433	sub emit {	546	sub emit {
434	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
435		548
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
437	}	555	}
438		556
439	sub DESTROY {	557	sub DESTROY {
440	my ($self) = @_;	558	my ($self) = @_;
441		559
…		…
456	my $class = shift;	574	my $class = shift;
457		575
458	# range [value, low, high, page]	576	# range [value, low, high, page]
459		577
460	$class->SUPER::new (	578	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
463	@_	581	@_
464	)	582	)
465	}	583	}
466		584
467	sub _draw {	585	sub _draw {
468	my ($self) = @_;	586	my ($self) = @_;
469		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
471		594
472	glEnable GL_BLEND;	595	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
475		598
476	glBegin GL_QUADS;	599	glBegin GL_QUADS;
477	glVertex 0 , 0;	600	glVertex 0 , 0;
478	glVertex 0 , $h;	601	glVertex 0 , $h;
479	glVertex $w, $h;	602	glVertex $w, $h;
480	glVertex $w, 0;	603	glVertex $w, 0;
481	glEnd;	604	glEnd;
482		605
483	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
484	}	608	}
485		609
486	#############################################################################	610	#############################################################################
487		611
488	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
548	delete $child->{parent};	672	delete $child->{parent};
549	$child->hide;	673	$child->hide;
550		674
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		676
553	$self->check_size;	677	$self->check_size (1);
554	$self->update;	678	$self->update;
555	}	679	}
556		680
557	sub clear {	681	sub clear {
558	my ($self) = @_;	682	my ($self) = @_;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
675		799
676	$self->_render;	800	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	801	};
685	}	802	}
686		803
687	sub _draw {	804	sub _draw {
688	my ($self) = @_;	805	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	809	my $tex = $self->{texture}
693	or return;	810	or return;
694		811
695	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
698		815
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		817
701	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
702	}	819	}
…		…
705		822
706	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
707		824
708	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
709		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
710	sub size_request {	837	sub size_request {
711	my ($self) = @_;	838	my ($self) = @_;
712		839
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		841
716	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
717	}	843	}
718		844
719	sub size_allocate {	845	sub size_allocate {
720	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
721		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
722	$self->update;	852	$self->update;
723	}	853	}
724		854
725	sub set_offset {	855	sub set_offset {
726	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
777	my $class = shift;	907	my $class = shift;
778		908
779	my $self;	909	my $self;
780		910
781	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
782	vertical => 1,	912	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	914	on_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
786	},	916	},
787	;	917	;
788		918
789	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	921	slider => $slider,
792	@_,	922	@_,
793	);	923	);
794		924
795	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	926	$self->add ($self->{vp});
797	$self->add ($self->{slider});	927	$self->add ($self->{slider});
798		928
799	$self	929	$self
		930	}
		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	949	}
801		950
802	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	952	# update viewport offset on scroll
804		953
…		…
855	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856		1005
857	sub new {	1006	sub new {
858	my $class = shift;	1007	my $class = shift;
859		1008
860	# TODO: user_x, user_y, overwrite moveto?
861
862	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
865	border => 0.6,	1012	border => 0.6,
866	toplevel => 1,	1013	is_toplevel => 1,
867	can_events => 1,	1014	can_events => 1,
868	@_	1015	@_
869	);	1016	);
870		1017
871	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	1019	align => 0,
…		…
896	my ($self, $w, $h) = @_;	1043	my ($self, $w, $h) = @_;
897		1044
898	$h -= List::Util::max 0, $self->border * 2;	1045	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	1046	$w -= List::Util::max 0, $self->border * 2;
900		1047
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1049	if $self->{title};
903		1050
904	$self->child->configure ($self->border, $self->border, $w, $h);	1051	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1052	}
906		1053
…		…
925	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
926		1073
927	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
929		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
933	$self->check_size;	1082	$self->check_size;
934	};	1083	};
935		1084
936	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
940	$self->{motion} = sub {	1089	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
942		1091
943	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
944		1093
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
946	$self->update;	1098	$self->update;
947	};	1099	};
948	}	1100	}
949	}	1101	}
950		1102
…		…
1012	sub new {	1164	sub new {
1013	my $class = shift;	1165	my $class = shift;
1014		1166
1015	$class->SUPER::new (	1167	$class->SUPER::new (
1016	col_expand => [],	1168	col_expand => [],
1017	@_	1169	@_,
1018	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1175	}
1020		1176
1021	sub add {	1177	sub add {
1022	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1023		1179
1024	$child->set_parent ($self);	1180	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1026		1182
1027	$child->check_size;	1183	$self->check_size (1);
1028	}	1184	}
1029		1185
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1187	sub clear {
1036	my ($self) = @_;	1188	my ($self) = @_;
1037		1189
1038	my @children = $self->children;	1190	my @children = $self->children;
1039	delete $self->{children};	1191	delete $self->{children};
…		…
1041	for (@children) {	1193	for (@children) {
1042	delete $_->{parent};	1194	delete $_->{parent};
1043	$_->hide;	1195	$_->hide;
1044	}	1196	}
1045		1197
		1198	$self->check_size (1);
1046	$self->update;	1199	$self->update;
1047	}	1200	}
1048		1201
1049	sub get_wh {	1202	sub get_wh {
1050	my ($self) = @_;	1203	my ($self) = @_;
…		…
1082	sub size_allocate {	1235	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1084		1237
1085	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1086		1239
1087	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1089		1242
1090	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1147	}	1300	}
1148	}	1301	}
1149		1302
1150	#############################################################################	1303	#############################################################################
1151		1304
1152	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1153
1154	# TODO: wrap into common Box base class
1155		1306
1156	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1157		1308
1158	sub size_request {	1309	sub size_request {
1159	my ($self) = @_;	1310	my ($self) = @_;
1160		1311
1161	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1162		1313	? (
1163	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1164	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165	(List::Util::max map $_->[1], @alloc),	1316	)
1166	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1167	}	1321	}
1168		1322
1169	sub size_allocate {	1323	sub size_allocate {
1170	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1171		1325
1172	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1173
1174	my $children = $self->{children};	1327	my $children = $self->{children};
1175		1328
1176	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1177
1178	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1179		1331
1180	if ($req_h > $h) {	1332	if ($req > $space) {
1181	# ah well, not enough space	1333	# ah well, not enough space
1182	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1183	} else {	1335	} else {
1184	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185	$exp ||= 1;
1186		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1187	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1188	my $child = $children->[$_];
1189
1190	my $alloc_h = $h[$_];
1191	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192	$h[$_] = $alloc_h;
1193	}
1194	}	1340	}
1195		1341
1196	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1197		1343
1198	my $y = 0;	1344	my $pos = 0;
1199	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201	my $h = $h[$_];	1346	my $alloc = $req[$_];
1202	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203		1348
1204	$y += $h;	1349	$pos += $alloc;
1205	}	1350	}
1206		1351
1207	1	1352	1
1208	}	1353	}
1209		1354
1210	#############################################################################	1355	#############################################################################
1211		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1212	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1213		1373
1214	# TODO: wrap into common Box base class
1215
1216	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1217		1375
1218	sub size_request {	1376	sub new {
1219	my ($self) = @_;	1377	my $class = shift;
1220		1378
1221	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1222		1380	vertical => 1,
1223	(	1381	@_,
1224	(List::Util::max map $_->[0], @alloc),
1225	(List::Util::sum map $_->[1], @alloc),
1226	)	1382	)
1227	}	1383	}
1228		1384
1229	sub size_allocate {
1230	my ($self, $w, $h) = @_;
1231
1232	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234	my $children = $self->{children};
1235
1236	my @h = map $_->{req_h}, @$children;
1237
1238	my $req_h = List::Util::sum @h;
1239
1240	if ($req_h > $h) {
1241	# ah well, not enough space
1242	$_ *= $h / $req_h for @h;
1243	} else {
1244	my $exp = List::Util::sum map $_->{expand}, @$children;
1245	$exp ||= 1;
1246
1247	for (0 .. $#$children) {
1248	my $child = $children->[$_];
1249
1250	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251	}
1252	}
1253
1254	CFClient::UI::harmonize \@h;
1255
1256	my $y = 0;
1257	for (0 .. $#$children) {
1258	my $child = $children->[$_];
1259	my $h = $h[$_];
1260	$child->configure (0, $y, $w, $h);
1261
1262	$y += $h;
1263	}
1264
1265	1
1266	}
1267
1268	#############################################################################	1385	#############################################################################
1269		1386
1270	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
1271		1388
1272	our @ISA = CFClient::UI::Base::;	1389	our @ISA = CFClient::UI::DrawBG::;
1273		1390
1274	use CFClient::OpenGL;	1391	use CFClient::OpenGL;
1275		1392
1276	sub new {	1393	sub new {
1277	my ($class, %arg) = @_;	1394	my ($class, %arg) = @_;
1278		1395
1279	my $self = $class->SUPER::new (	1396	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1397	fg => [1, 1, 1],
		1398	#bg => none
		1399	#active_bg => none
1281	#font => default_font	1400	#font => default_font
1282	#text => initial text	1401	#text => initial text
1283	#markup => initial narkup	1402	#markup => initial narkup
		1403	#max_w => maximum pixel width
		1404	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1405	layout => (new CFClient::Layout),
1285	fontsize => 1,	1406	fontsize => 1,
1286	align => -1,	1407	align => -1,
1287	valign => -1,	1408	valign => -1,
1288	padding => 2,	1409	padding => 2,
…		…
1303	}	1424	}
1304		1425
1305	$self	1426	$self
1306	}	1427	}
1307		1428
1308	sub escape {	1429	sub escape($) {
1309	local $_ = $_[1];	1430	local $_ = $_[0];
1310		1431
1311	s/&/&amp;/g;	1432	s/&/&amp;/g;
1312	s/>/&gt;/g;	1433	s/>/&gt;/g;
1313	s/</&lt;/g;	1434	s/</&lt;/g;
1314		1435
1315	$_[1]	1436	$_
1316	}	1437	}
1317		1438
1318	sub update {	1439	sub update {
1319	my ($self) = @_;	1440	my ($self) = @_;
1320		1441
…		…
1353	sub size_request {	1474	sub size_request {
1354	my ($self) = @_;	1475	my ($self) = @_;
1355		1476
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1477	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1478	$self->{layout}->set_width ($self->{max_w} || -1);
		1479	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1480	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1482
1360	my ($w, $h) = $self->{layout}->size;	1483	my ($w, $h) = $self->{layout}->size;
1361		1484
1362	if (exists $self->{template}) {	1485	if (exists $self->{template}) {
…		…
1392	}	1515	}
1393		1516
1394	sub _draw {	1517	sub _draw {
1395	my ($self) = @_;	1518	my ($self) = @_;
1396		1519
		1520	$self->SUPER::_draw; # draw background, if applicable
		1521
1397	my $tex = $self->{texture} ||= do {	1522	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1523	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1524	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1525	$self->{layout}->set_width ($self->{w});
		1526	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1529
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1530	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1531
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1534	: ($self->{w} - $tex->{w}) * 0.5);
1408		1535
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1538	: ($self->{h} - $tex->{h}) * 0.5);
1412		1539
1413	$tex	1540	$tex
1414	};	1541	};
1415		1542
1416	glEnable GL_TEXTURE_2D;	1543	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1445	can_hover => 1,	1572	can_hover => 1,
1446	can_focus => 1,	1573	can_focus => 1,
1447	valign => 0,	1574	valign => 0,
1448	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1449	@_	1577	@_
1450	)	1578	)
1451	}	1579	}
1452		1580
1453	sub _set_text {	1581	sub _set_text {
…		…
1463	$self->{text} = $text;	1591	$self->{text} = $text;
1464		1592
1465	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1467		1595
1468	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1469	}	1597	}
1470		1598
1471	sub set_text {	1599	sub set_text {
1472	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1473		1601
1474	$self->{cursor} = length $text;	1602	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1603	$self->_set_text ($text);
		1604	$self->update;
1476	$self->check_size;	1605	$self->check_size;
1477	$self->update;
1478	}	1606	}
1479		1607
1480	sub get_text {	1608	sub get_text {
1481	$_[0]{text}	1609	$_[0]{text}
1482	}	1610	}
…		…
1485	my ($self) = @_;	1613	my ($self) = @_;
1486		1614
1487	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1488		1616
1489	($w + 1, $h) # add 1 for cursor	1617	($w + 1, $h) # add 1 for cursor
1490	}
1491
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}	1618	}
1497		1619
1498	sub key_down {	1620	sub key_down {
1499	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1500		1622
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1641	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1642	$self->_emit ('escape');
1521	} elsif ($uni) {	1643	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1645	}
1524		1646
1525	$self->_set_text ($text);	1647	$self->_set_text ($text);
1526	$self->update;	1648	$self->update;
		1649	$self->check_size;
1527	}	1650	}
1528		1651
1529	sub focus_in {	1652	sub focus_in {
1530	my ($self) = @_;	1653	my ($self) = @_;
1531		1654
…		…
1611	if ($sym == 13) {	1734	if ($sym == 13) {
1612	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1617	$self->update;	1740	$self->update;
1618		1741
1619	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1783	my $class = shift;
1661		1784
1662	$class->SUPER::new (	1785	$class->SUPER::new (
1663	padding => 4,	1786	padding => 4,
1664	fg => [1, 1, 1],	1787	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1788	active_fg => [0, 0, 1],
1667	can_hover => 1,	1789	can_hover => 1,
1668	align => 0,	1790	align => 0,
1669	valign => 0,	1791	valign => 0,
1670	can_events => 1,	1792	can_events => 1,
1671	@_	1793	@_
1672	)	1794	)
1673	}	1795	}
1674		1796
		1797	sub activate { }
		1798
1675	sub button_up {	1799	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1677		1801
		1802	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1805	}
1683		1806
1684	sub _draw {	1807	sub _draw {
1685	my ($self) = @_;	1808	my ($self) = @_;
1686		1809
…		…
1718		1841
1719	$class->SUPER::new (	1842	$class->SUPER::new (
1720	padding => 2,	1843	padding => 2,
1721	fg => [1, 1, 1],	1844	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1845	active_fg => [1, 1, 0],
		1846	bg => [0, 0, 0, 0.2],
		1847	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1848	state => 0,
1724	can_hover => 1,	1849	can_hover => 1,
1725	@_	1850	@_
1726	)	1851	)
1727	}	1852	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1737		1862
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1742	}	1867	}
1743	}	1868	}
1744		1869
1745	sub _draw {	1870	sub _draw {
1746	my ($self) = @_;	1871	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2136	qw(s1_slider.png s1_slider_bg.png);
2012		2137
2013	sub new {	2138	sub new {
2014	my $class = shift;	2139	my $class = shift;
2015		2140
2016	# range [value, low, high, page]	2141	# range [value, low, high, page, unit]
2017		2142
2018	# TODO: 0-width page	2143	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2144	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2145	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
		2149	bg => [0, 0, 0, 0.2],
		2150	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2027	vertical => 0,	2154	vertical => 0,
2028	can_hover => 1,	2155	can_hover => 1,
2029	inner_pad => 5,	2156	inner_pad => 0.02,
2030	@_	2157	@_
2031	);	2158	);
2032		2159
		2160	$self->set_value ($self->{range}[0]);
		2161	$self->update;
		2162
2033	$self	2163	$self
		2164	}
		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
		2175	sub set_value {
		2176	my ($self, $value) = @_;
		2177
		2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2179
		2180	$hi = $lo + 1 if $hi <= $lo;
		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
		2184	$value = $lo if $value < $lo;
		2185	$value = $hi - $page if $value > $hi - $page;
		2186
		2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2188	if $unit;
		2189
		2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2191
		2192	if ($value != $old_value) {
		2193	$self->_emit (changed => $value);
		2194	$self->update;
		2195	}
2034	}	2196	}
2035		2197
2036	sub size_request {	2198	sub size_request {
2037	my ($self) = @_;	2199	my ($self) = @_;
2038		2200
…		…
2044		2206
2045	sub button_down {	2207	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2047		2209
2048	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
2049	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2050	}	2215	}
2051		2216
2052	sub mouse_motion {	2217	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2054		2219
2055	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
		2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2222
		2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2224
		2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2226
		2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2228	}
		2229	}
		2230
		2231	sub update {
		2232	my ($self) = @_;
		2233
		2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2235	$self->set_value ($self->{range}[0]);
		2236
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2057		2239
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2241
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2244
2063	$x -= $inner_pad_px; # substract the padding	2245	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2246	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2247
2069	$self->emit (changed => $x);	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2249	$self->{knob_w} = $knob_w;
2071	}	2250	});
2072	}
2073		2251
2074	# the inner_* stuff is for generating a padding for the slider handle,	2252	$self->SUPER::update;
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}	2253	}
2081		2254
2082	sub _draw {	2255	sub _draw {
2083	my ($self) = @_;	2256	my ($self) = @_;
2084		2257
2085	$self->SUPER::_draw ();	2258	$self->SUPER::_draw ();
2086		2259
2087	my ($w, $h) = @$self{qw(w h)};	2260	glScale $self->{w}, $self->{h};
2088		2261
2089	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2091		2264
		2265	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2267	}
2097		2268
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2271
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2272	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2274
2122	# draw background	2275	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2276	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2277
2125	# draw handle	2278	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2280
2128	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2129	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2130		2324
2131	#############################################################################	2325	#############################################################################
2132		2326
2133	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2134		2328
…		…
2164		2358
2165	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2360	$self->reflow;
2167	}	2361	}
2168		2362
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2363	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2190		2365
2191	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2192		2367
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2371
2197	$self->reflow;	2372	$self->reflow;
2198	}	2373	}
2199		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2200	sub add_paragraph {	2409	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2202		2411
2203	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2204		2413	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2208		2417
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2419	}
2214		2420
2215	sub update {	2421	sub update {
2216	my ($self) = @_;	2422	my ($self) = @_;
2217		2423
…		…
2220	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2221		2427
2222	delete $self->{texture};	2428	delete $self->{texture};
2223		2429
2224	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2225	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2434	my $height = 0;
2227		2435
2228	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2229	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2230		2451
2231	$self->{height} = $height;	2452	$self->{height} = $height;
2232		2453
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2455
2235	delete $self->{texture};	2456	delete $self->{texture};
2236	}	2457	}
2237		2458
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2241		2462
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2246		2464
2247	my $y0 = $top;	2465	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2249		2467
2250	my $y = 0;	2468	my $y = 0;
2251		2469
2252	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2253		2471
2254	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2255		2473
		2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
		2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2477
2256	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2479	my $h = $par->[1];
2258		2480
2259	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2262		2485
2263	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2487
		2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2490	}
2266		2491
2267	$y += $h;	2492	$y += $h;
2268	}	2493	}
2269		2494
2270	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2271	};	2496	};
2272	});	2497	});
2273	}	2498	}
2274		2499
2275	sub _draw {	2500	sub _draw {
2276	my ($self) = @_;	2501	my ($self) = @_;
2277		2502
2278	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2506	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2283		2508
2284	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2285		2510
2286	}	2511	}
…		…
2335		2560
2336	sub new {	2561	sub new {
2337	my $class = shift;	2562	my $class = shift;
2338		2563
2339	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2340	state => 0,	2565	state => 0,
2341	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2342	@_	2567	@_
2343	);	2568	);
2344		2569
2345	if ($self->{state}) {
2346	$self->{state} = 0;
2347	$self->toggle_flopper;
2348	}
2349
2350	$self	2570	$self
2351	}	2571	}
2352		2572
2353	sub toggle_flopper {	2573	sub toggle_flopper {
2354	my ($self) = @_;	2574	my ($self) = @_;
2355		2575
2356	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2357	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");
2361	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");
2364	}
2365
2366	$self->emit (changed => $self->{state});
2367	}	2577	}
2368		2578
2369	#############################################################################	2579	#############################################################################
2370		2580
2371	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2385		2595
2386	sub set_tooltip_from {	2596	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2597	my ($self, $widget) = @_;
2388		2598
2389	$self->add (new CFClient::UI::Label	2599	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2600	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2602	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2603	fg => [0, 0, 0, 1],
		2604	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2605	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2606	);
2396	}	2607	}
2397		2608
2398	sub size_request {	2609	sub size_request {
2399	my ($self) = @_;	2610	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2446		2657
2447	sub new {	2658	sub new {
2448	my $class = shift;	2659	my $class = shift;
2449		2660
2450	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2451	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2452	@_,	2664	@_,
2453	)	2665	);
		2666
		2667	if ($self->{anim} && $self->{animspeed}) {
		2668	Scalar::Util::weaken (my $widget = $self);
		2669
		2670	$self->{timer} = Event->timer (
		2671	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2672	hard => 1,
		2673	interval => $self->{animspeed},
		2674	cb => sub {
		2675	++$widget->{frame};
		2676	$widget->update;
		2677	},
		2678	);
		2679	}
		2680
		2681	$self
2454	}	2682	}
2455		2683
2456	sub size_request {	2684	sub size_request {
2457	(32, 8)	2685	(32, 8)
2458	}	2686	}
2459		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2460	sub _draw {	2696	sub _draw {
2461	my ($self) = @_;	2697	my ($self) = @_;
2462		2698
2463	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
		2700
		2701	my $face;
		2702
		2703	if ($self->{frame}) {
		2704	my $anim = $::CONN->{anim}[$self->{anim}];
		2705
		2706	$face = $anim->[ $self->{frame} % @$anim ]
		2707	if $anim && @$anim;
		2708	}
		2709
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2711
2466	# TODO animation
2467	if ($tex) {	2712	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2473	}	2718	}
2474	}	2719	}
2475		2720
2476	#############################################################################	2721	sub DESTROY {
		2722	my ($self) = @_;
2477		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
2478	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2479		2733
2480	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2735
2482	sub new {	2736	sub new {
2483	my $class = shift;	2737	my $class = shift;
2484		2738
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2495	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541
2542	#############################################################################
2543
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,	2741	@_,
2554	);	2742	);
2555		2743
2556	$self	2744	$self
2557	}	2745	}
…		…
2567	or ($a->{name} cmp $b->{name})	2755	or ($a->{name} cmp $b->{name})
2568	} @$items;	2756	} @$items;
2569		2757
2570	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2571		2759
		2760	my $row = 0;
2572	for my $item (@items) {	2761	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2762	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2763
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2767
2580	$self->{scrolled}->add (@items);	2768	$row++;
2581		2769	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}
2584
2585	sub size_request {
2586	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});
2588	}	2770	}
2589		2771
2590	#############################################################################	2772	#############################################################################
2591		2773
2592	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2627		2809
2628	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2811	sub popup {
2630	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2631		2813
2632	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2633		2815
2634	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2817	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2637		2819
…		…
2652		2834
2653	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2836	undef $GRAB;
2655	$self->hide;	2837	$self->hide;
2656		2838
2657	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2659	}	2841	}
2660	}	2842	}
2661		2843
2662	#############################################################################	2844	#############################################################################
2663		2845
2664	package CFClient::UI::Statusbox;	2846	package CFClient::UI::Statusbox;
2665		2847
2666	our @ISA = CFClient::UI::VBox::;	2848	our @ISA = CFClient::UI::VBox::;
		2849
		2850	sub new {
		2851	my $class = shift;
		2852
		2853	$class->SUPER::new (
		2854	fontsize => 0.8,
		2855	@_,
		2856	)
		2857	}
2667		2858
2668	sub reorder {	2859	sub reorder {
2669	my ($self) = @_;	2860	my ($self) = @_;
2670	my $NOW = time;	2861	my $NOW = time;
2671		2862
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2881	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2882	: $item->{text};
2692		2883
2693	for ($short) {	2884	for ($short) {
2694	s/^\s+//;	2885	s/^\s+//;
2695	s/\012.*/…/s;	2886	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2887	}
2699		2888
2700	new CFClient::UI::Label	2889	new CFClient::UI::Label
2701	markup => $short,	2890	markup => $short,
2702	tooltip => $item->{tooltip},	2891	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2892	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2893	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2894	fontsize => $item->{fontsize} || $self->{fontsize},
		2895	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2896	fg => $item->{fg},
2707	can_events => 1,	2897	can_events => 1,
2708	can_hover => 1	2898	can_hover => 1
2709	};	2899	};
2710	}	2900	}
2711		2901
…		…
2716	sub add {	2906	sub add {
2717	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2718		2908
2719	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2721		2913
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2915
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2917
…		…
2737	$self->{item}{$group} = {	2929	$self->{item}{$group} = {
2738	id => ++$self->{id},	2930	id => ++$self->{id},
2739	text => $text,	2931	text => $text,
2740	timeout => $timeout,	2932	timeout => $timeout,
2741	tooltip => $text,	2933	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2934	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2935	pri => 0,
2745	count => 1,	2936	count => 1,
2746	%arg,	2937	%arg,
2747	};	2938	};
2748	}	2939	}
2749		2940
2750	$self->reorder;	2941	$self->reorder;
2751	}	2942	}
2752		2943
		2944	sub reconfigure {
		2945	my ($self) = @_;
		2946
		2947	delete $_->{label}
		2948	for values %{ $self->{item} || {} };
		2949
		2950	$self->reorder;
		2951	$self->SUPER::reconfigure;
		2952	}
		2953
2753	#############################################################################	2954	#############################################################################
2754		2955
2755	package CFClient::UI::Root;	2956	package CFClient::UI::Root;
2756		2957
2757	our @ISA = CFClient::UI::Container::;	2958	our @ISA = CFClient::UI::Container::;
…		…
2760		2961
2761	sub new {	2962	sub new {
2762	my $class = shift;	2963	my $class = shift;
2763		2964
2764	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2765	@_,	2967	@_,
2766	)	2968	)
2767	}	2969	}
2768		2970
2769	sub configure {	2971	sub configure {
…		…
2787	}	2989	}
2788		2990
2789	sub size_allocate {	2991	sub size_allocate {
2790	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2791		2993
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798	for my $child ($self->children) {	2994	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		2996
		2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2998	if exists $child->{req_x};
		2999
		3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3001	if exists $child->{req_y};
		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2803	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2804	}	3009	}
2805	}	3010	}
2806		3011
2807	sub coord2local {	3012	sub coord2local {
…		…
2825		3030
2826	sub add {	3031	sub add {
2827	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2828		3033
2829	for my $child (@children) {	3034	for my $child (@children) {
2830	$child->{toplevel} = 1;	3035	$child->{is_toplevel} = 1;
2831		3036
2832	# integerise window positions	3037	# integerise window positions
2833	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
2835	}	3040	}
2836		3041
2837	$self->SUPER::add (@children);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2838	}	3061	}
2839		3062
2840	sub on_refresh {	3063	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2842		3065
…		…
2856	$_->()	3079	$_->()
2857	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
2858	}	3081	}
2859		3082
2860	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2861	my @queue = ([], []);	3084	my @queue;
2862		3085
2863	for (;;) {	3086	for (;;) {
2864	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
2865	# heuristic: check containers last	3088	#TODO use array-of-depth approach
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
2867	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
2868	}	3092	}
2869		3093
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
2871		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2873	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
2874	: $widget->size_request;	3100	: $widget->size_request;
2875		3101
2876	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
2877	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2895	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
2897		3123
2898	$widget->{w} = $w;	3124	$widget->{w} = $w;
2899	$widget->{h} = $h;	3125	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
2902	}	3127	}
2903	}	3128	}
2904		3129
2905	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
2913		3138
2914	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3140	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3143	glLoadIdentity;
2919		3144
2920	$self->_draw;	3145	$self->_draw;
2921	}	3146	}
…		…
2923	#############################################################################	3148	#############################################################################
2924		3149
2925	package CFClient::UI;	3150	package CFClient::UI;
2926		3151
2927	$ROOT = new CFClient::UI::Root;	3152	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3154
2930	1	3155	1
2931		3156

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines