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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 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;
		18
		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	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	52	$TOOLTIP->show;
31		53
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		55
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
37		58
38	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
40	$TOOLTIP->update;	61	$TOOLTIP->update;
41	}	62	}
…		…
49	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
50	}	71	}
51		72
52	# class methods for events	73	# class methods for events
53	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	76	if $FOCUS;
56	}	77	}
57		78
58	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	81	if $FOCUS;
61	}	82	}
62		83
63	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	85	my ($ev) = @_;
…		…
73	check_tooltip;	94	check_tooltip;
74	}	95	}
75		96
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		98
78	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	101	}
83		102
84	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	104	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
87		106
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		108
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		110
92	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		113
97	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	116	$grab->update if $grab;
100	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		134
118	check_tooltip;	135	check_tooltip;
119	}	136	}
120		137
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	139	if $HOVER;
125	}	140	}
126		141
127	# convert position array to integers	142	# convert position array to integers
128	sub harmonize {	143	sub harmonize {
129	my ($vals) = @_;	144	my ($vals) = @_;
…		…
133	for (@$vals) {	148	for (@$vals) {
134	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
135	$rem += $_ - $i;	150	$rem += $_ - $i;
136	$_ = $i;	151	$_ = $i;
137	}	152	}
		153	}
		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
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		185	}
		186	}
		187
		188	reconfigure_widgets;
138	}	189	}
139		190
140	#############################################################################	191	#############################################################################
141		192
142	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
155	can_events => 1,	206	can_events => 1,
156	@_	207	@_
157	}, $class;	208	}, $class;
158		209
159	for (keys %$self) {	210	for (keys %$self) {
160	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
162	}	213	}
163	}	214	}
164		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
165	$self	225	$self
166	}	226	}
167		227
168	sub destroy {	228	sub destroy {
169	my ($self) = @_;	229	my ($self) = @_;
…		…
172	%$self = ();	232	%$self = ();
173	}	233	}
174		234
175	sub show {	235	sub show {
176	my ($self) = @_;	236	my ($self) = @_;
177
178	return if $self->{parent};	237	return if $self->{parent};
179		238
180	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
181	}	240	}
182		241
183	sub hide {	242	sub show_centered {
184	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	return unless $self->{visible};
		259
		260	# broken show/hide model
		261
		262	delete $self->{root};
		263	delete $self->{visible};
185		264
186	undef $GRAB if $GRAB == $self;	265	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	266	undef $HOVER if $HOVER == $self;
		267
		268	CFClient::UI::check_tooltip
		269	if $CFClient::UI::TOOLTIP->{owner} == $self;
		270
		271	$self->focus_out;
		272
		273	$self->emit (visibility_change => 0);
		274	}
		275
		276	sub hide {
		277	my ($self) = @_;
		278
		279	$self->set_invisible;
188		280
189	$self->{parent}->remove ($self)	281	$self->{parent}->remove ($self)
190	if $self->{parent};	282	if $self->{parent};
191	}	283	}
192		284
…		…
242		334
243	sub size_allocate {	335	sub size_allocate {
244	# nothing to be done	336	# nothing to be done
245	}	337	}
246		338
		339	sub reconfigure {
		340	my ($self) = @_;
		341
		342	$self->check_size (1);
		343	$self->update;
		344	}
		345
247	sub children {	346	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}	347	}
261		348
262	sub set_max_size {	349	sub set_max_size {
263	my ($self, $w, $h) = @_;	350	my ($self, $w, $h) = @_;
264		351
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	352	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	353	delete $self->{max_h}; $self->{max_h} = $h if $h;
		354	}
		355
		356	sub set_tooltip {
		357	my ($self, $tooltip) = @_;
		358
		359	$tooltip =~ s/^\s+//;
		360	$tooltip =~ s/\s+$//;
		361
		362	return if $self->{tooltip} eq $tooltip;
		363
		364	$self->{tooltip} = $tooltip;
		365
		366	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		367	delete $CFClient::UI::TOOLTIP->{owner};
		368	CFClient::UI::check_tooltip;
		369	}
267	}	370	}
268		371
269	# translate global coordinates to local coordinate system	372	# translate global coordinates to local coordinate system
270	sub coord2local {	373	sub coord2local {
271	my ($self, $x, $y) = @_;	374	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	389	return if $FOCUS == $self;
287	return unless $self->{can_focus};	390	return unless $self->{can_focus};
288		391
289	my $focus = $FOCUS; $FOCUS = $self;	392	my $focus = $FOCUS; $FOCUS = $self;
290		393
291	$self->emit (focus_in => $focus);	394	$self->_emit (focus_in => $focus);
292		395
293	$focus->update if $focus;	396	$focus->update if $focus;
294	$FOCUS->update;	397	$FOCUS->update;
295	}	398	}
296		399
…		…
299		402
300	return unless $FOCUS == $self;	403	return unless $FOCUS == $self;
301		404
302	my $focus = $FOCUS; undef $FOCUS;	405	my $focus = $FOCUS; undef $FOCUS;
303		406
304	$self->emit (focus_out => $focus);	407	$self->_emit (focus_out => $focus);
305		408
306	$focus->update if $focus; #?	409	$focus->update if $focus; #?
		410
		411	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		412	unless $FOCUS;
307	}	413	}
308		414
309	sub mouse_motion { }	415	sub mouse_motion { }
310	sub button_up { }	416	sub button_up { }
311	sub key_down { }	417	sub key_down { }
312	sub key_up { }	418	sub key_up { }
313		419
314	sub button_down {	420	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	421	my ($self, $ev, $x, $y) = @_;
316		422
317	$self->focus_in;	423	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	457	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	458	glPushMatrix;
353	glColor 1, 1, 0, 1;	459	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	461	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	462	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	463	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	464	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	465	glVertex 0 , $self->{h} - 1;
360	glEnd;	466	glEnd;
361	glPopMatrix;	467	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	468	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	469	}
364	}	470	}
365		471
366	sub _draw {	472	sub _draw {
367	my ($self) = @_;	473	my ($self) = @_;
…		…
384	sub set_parent {	490	sub set_parent {
385	my ($self, $parent) = @_;	491	my ($self, $parent) = @_;
386		492
387	Scalar::Util::weaken ($self->{parent} = $parent);	493	Scalar::Util::weaken ($self->{parent} = $parent);
388		494
		495	if ($parent->{visible} || 1) {
		496	$self->{root} = $parent->{root};
		497	$self->{visible} = $parent->{visible} + 1;
		498
		499	$self->emit (visibility_change => 1)
		500	unless $self->{parent}{visible};
		501	}
		502
		503	# TODO: req_w _does_change after ->reconfigure
389	$self->check_size	504	$self->check_size
390	unless exists $self->{req_w};	505	unless exists $self->{req_w};
		506
		507	$self->show;
391	}	508	}
392		509
393	sub check_size {	510	sub check_size {
394	my ($self, $forced) = @_;	511	my ($self, $forced) = @_;
395		512
…		…
408	my ($self, $signal, $cb) = @_;	525	my ($self, $signal, $cb) = @_;
409		526
410	push @{ $self->{signal_cb}{$signal} }, $cb;	527	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	528	}
412		529
		530	sub _emit {
		531	my ($self, $signal, @args) = @_;
		532
		533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		534	}
		535
413	sub emit {	536	sub emit {
414	my ($self, $signal, @args) = @_;	537	my ($self, $signal, @args) = @_;
415		538
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	539	$self->_emit ($signal, @args)
		540	|| $self->$signal (@args);
		541	}
		542
		543	sub visibility_change {
		544	#my ($self, $visible) = @_;
417	}	545	}
418		546
419	sub DESTROY {	547	sub DESTROY {
420	my ($self) = @_;	548	my ($self) = @_;
421		549
		550	delete $WIDGET{$self+0};
422	#$self->deactivate;	551	#$self->deactivate;
423	}	552	}
424		553
425	#############################################################################	554	#############################################################################
426		555
…		…
435	my $class = shift;	564	my $class = shift;
436		565
437	# range [value, low, high, page]	566	# range [value, low, high, page]
438		567
439	$class->SUPER::new (	568	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	569	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	570	#active_bg => [1, 1, 1, 0.5],
442	@_	571	@_
443	)	572	)
444	}	573	}
445		574
446	sub _draw {	575	sub _draw {
447	my ($self) = @_;	576	my ($self) = @_;
448		577
		578	my $color = $FOCUS == $self && $self->{active_bg}
		579	? $self->{active_bg}
		580	: $self->{bg};
		581
		582	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	583	my ($w, $h) = @$self{qw(w h)};
450		584
451	glEnable GL_BLEND;	585	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	586	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	587	glColor @$color;
454		588
455	glBegin GL_QUADS;	589	glBegin GL_QUADS;
456	glVertex 0 , 0;	590	glVertex 0 , 0;
457	glVertex 0 , $h;	591	glVertex 0 , $h;
458	glVertex $w, $h;	592	glVertex $w, $h;
459	glVertex $w, 0;	593	glVertex $w, 0;
460	glEnd;	594	glEnd;
461		595
462	glDisable GL_BLEND;	596	glDisable GL_BLEND;
		597	}
463	}	598	}
464		599
465	#############################################################################	600	#############################################################################
466		601
467	package CFClient::UI::Empty;	602	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	662	delete $child->{parent};
528	$child->hide;	663	$child->hide;
529		664
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		666
532	$self->check_size;	667	$self->check_size (1);
533	$self->update;	668	$self->update;
534	}	669	}
535		670
536	sub clear {	671	sub clear {
537	my ($self) = @_;	672	my ($self) = @_;
…		…
628	}	763	}
629		764
630	sub update {	765	sub update {
631	my ($self) = @_;	766	my ($self) = @_;
632		767
633	$ROOT->on_refresh ($self => sub { $self->render_child });	768	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	769	$self->SUPER::update;
635	}	770	}
636		771
637	sub size_allocate {	772	sub size_allocate {
638	my ($self, $w, $h) = @_;	773	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	786	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	787	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	788	glClear GL_COLOR_BUFFER_BIT;
654		789
655	$self->_render;	790	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	791	};
664	}	792	}
665		793
666	sub _draw {	794	sub _draw {
667	my ($self) = @_;	795	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	799	my $tex = $self->{texture}
672	or return;	800	or return;
673		801
674	glEnable GL_TEXTURE_2D;	802	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	803	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	804	glColor 1, 1, 1, 1;
677		805
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	806	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		807
680	glDisable GL_TEXTURE_2D;	808	glDisable GL_TEXTURE_2D;
681	}	809	}
…		…
684		812
685	package CFClient::UI::ViewPort;	813	package CFClient::UI::ViewPort;
686		814
687	our @ISA = CFClient::UI::Window::;	815	our @ISA = CFClient::UI::Window::;
688		816
		817	sub new {
		818	my $class = shift;
		819
		820	$class->SUPER::new (
		821	scroll_x => 0,
		822	scroll_y => 1,
		823	@_,
		824	)
		825	}
		826
689	sub size_request {	827	sub size_request {
690	my ($self) = @_;	828	my ($self) = @_;
691		829
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		831
695	@$self{qw(child_w child_h)}	832	@$self{qw(child_w child_h)}
696	}	833	}
697		834
698	sub size_allocate {	835	sub size_allocate {
699	my ($self, $w, $h) = @_;	836	my ($self, $w, $h) = @_;
700		837
		838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		840
		841	$self->child->configure (0, 0, $w, $h);
701	$self->update;	842	$self->update;
702	}	843	}
703		844
704	sub set_offset {	845	sub set_offset {
705	my ($self, $x, $y) = @_;	846	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	897	my $class = shift;
757		898
758	my $self;	899	my $self;
759		900
760	my $slider = new CFClient::UI::Slider	901	my $slider = new CFClient::UI::Slider
761	vertical => 1,	902	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	903	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	904	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	905	$self->{vp}->set_offset (0, $_[1]);
765	},	906	},
766	;	907	;
767		908
768	$self = $class->SUPER::new (	909	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	910	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	911	slider => $slider,
771	@_,	912	@_,
772	);	913	);
773		914
774	$self->{vp}->add ($self->{scrolled});	915	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	917	$self->add ($self->{slider});
777		918
778	$self	919	$self
779	}	920	}
780		921
		922	sub update {
		923	my ($self) = @_;
		924
		925	$self->SUPER::update;
		926
		927	# todo: overwrite size_allocate of child
		928	my $child = $self->{vp}->child;
		929	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		930	}
		931
		932	sub size_allocate {
		933	my ($self, $w, $h) = @_;
		934
		935	$self->SUPER::size_allocate ($w, $h);
		936
		937	my $child = $self->{vp}->child;
		938	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		939	}
		940
781	#TODO# update range on size_allocate depeneing on child	941	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	942	# update viewport offset on scroll
783		943
784	#############################################################################	944	#############################################################################
785		945
786	package CFClient::UI::Frame;	946	package CFClient::UI::Frame;
787		947
788	our @ISA = CFClient::UI::Bin::;	948	our @ISA = CFClient::UI::Bin::;
789		949
790	use CFClient::OpenGL;	950	use CFClient::OpenGL;
		951
		952	sub new {
		953	my $class = shift;
		954
		955	$class->SUPER::new (
		956	bg => undef,
		957	@_,
		958	)
		959	}
		960
		961	sub _draw {
		962	my ($self) = @_;
		963
		964	if ($self->{bg}) {
		965	my ($w, $h) = @$self{qw(w h)};
		966
		967	glEnable GL_BLEND;
		968	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		969	glColor @{ $self->{bg} };
		970
		971	glBegin GL_QUADS;
		972	glVertex 0 , 0;
		973	glVertex 0 , $h;
		974	glVertex $w, $h;
		975	glVertex $w, 0;
		976	glEnd;
		977
		978	glDisable GL_BLEND;
		979	}
		980
		981	$self->SUPER::_draw;
		982	}
791		983
792	#############################################################################	984	#############################################################################
793		985
794	package CFClient::UI::FancyFrame;	986	package CFClient::UI::FancyFrame;
795		987
…		…
805	my $class = shift;	997	my $class = shift;
806		998
807	# TODO: user_x, user_y, overwrite moveto?	999	# TODO: user_x, user_y, overwrite moveto?
808		1000
809	my $self = $class->SUPER::new (	1001	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	1002	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	1003	border_bg => [1, 1, 1, 1],
812	border => 0.6,	1004	border => 0.6,
		1005	is_toplevel => 1,
813	can_events => 1,	1006	can_events => 1,
814	@_	1007	@_
815	);	1008	);
816		1009
817	$self->{title} &&= new CFClient::UI::Label	1010	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	1011	align => 0,
…		…
842	my ($self, $w, $h) = @_;	1035	my ($self, $w, $h) = @_;
843		1036
844	$h -= List::Util::max 0, $self->border * 2;	1037	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	1038	$w -= List::Util::max 0, $self->border * 2;
846		1039
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1040	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	1041	if $self->{title};
849		1042
850	$self->child->configure ($self->border, $self->border, $w, $h);	1043	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1044	}
852		1045
…		…
871	my ($ev, $x, $y) = @_;	1064	my ($ev, $x, $y) = @_;
872		1065
873	my $dx = $ev->{x} - $ox;	1066	my $dx = $ev->{x} - $ox;
874	my $dy = $ev->{y} - $oy;	1067	my $dy = $ev->{y} - $oy;
875		1068
		1069	$self->{user_x} = $wx + $dx * $mx;
		1070	$self->{user_y} = $wy + $dy * $my;
876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1073	$self->move ($self->{user_x}, $self->{user_y});
879	$self->check_size;	1074	$self->check_size;
880	};	1075	};
881		1076
882	} elsif ($lr ^ $td) {	1077	} elsif ($lr ^ $td) {
883	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
886	$self->{motion} = sub {	1081	$self->{motion} = sub {
887	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
888		1083
889	($x, $y) = ($ev->{x}, $ev->{y});	1084	($x, $y) = ($ev->{x}, $ev->{y});
890		1085
891	$self->move ($bx + $x - $ox, $by + $y - $oy);	1086	$self->{user_x} = $bx + $x - $ox;
		1087	$self->{user_y} = $by + $y - $oy;
		1088	$self->move ($self->{user_x}, $self->{user_y});
892	$self->update;	1089	$self->update;
893	};	1090	};
894	}	1091	}
895	}	1092	}
896		1093
…		…
958	sub new {	1155	sub new {
959	my $class = shift;	1156	my $class = shift;
960		1157
961	$class->SUPER::new (	1158	$class->SUPER::new (
962	col_expand => [],	1159	col_expand => [],
963	@_	1160	@_,
964	)	1161	)
		1162	}
		1163
		1164	sub children {
		1165	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1166	}
966		1167
967	sub add {	1168	sub add {
968	my ($self, $x, $y, $child) = @_;	1169	my ($self, $x, $y, $child) = @_;
969		1170
970	$child->set_parent ($self);	1171	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1172	$self->{children}[$y][$x] = $child;
972		1173
973	$child->check_size;	1174	$self->check_size (1);
974	}	1175	}
975		1176
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1177	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1178	sub clear {
982	my ($self) = @_;	1179	my ($self) = @_;
983		1180
984	my @children = $self->children;	1181	my @children = $self->children;
985	delete $self->{children};	1182	delete $self->{children};
…		…
987	for (@children) {	1184	for (@children) {
988	delete $_->{parent};	1185	delete $_->{parent};
989	$_->hide;	1186	$_->hide;
990	}	1187	}
991		1188
		1189	$self->check_size (1);
992	$self->update;	1190	$self->update;
993	}	1191	}
994		1192
995	sub get_wh {	1193	sub get_wh {
996	my ($self) = @_;	1194	my ($self) = @_;
…		…
1028	sub size_allocate {	1226	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1227	my ($self, $w, $h) = @_;
1030		1228
1031	my ($ws, $hs) = $self->get_wh;	1229	my ($ws, $hs) = $self->get_wh;
1032		1230
1033	my $req_w = sum @$ws;	1231	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1232	my $req_h = (sum @$hs) || 1;
1035		1233
1036	# TODO: nicer code && do row_expand	1234	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1235	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1236	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1237	my $col_expand = (sum @col_expand) || 1;
…		…
1213		1411
1214	#############################################################################	1412	#############################################################################
1215		1413
1216	package CFClient::UI::Label;	1414	package CFClient::UI::Label;
1217		1415
1218	our @ISA = CFClient::UI::Base::;	1416	our @ISA = CFClient::UI::DrawBG::;
1219		1417
1220	use CFClient::OpenGL;	1418	use CFClient::OpenGL;
1221		1419
1222	sub new {	1420	sub new {
1223	my ($class, %arg) = @_;	1421	my ($class, %arg) = @_;
1224		1422
1225	my $self = $class->SUPER::new (	1423	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1424	fg => [1, 1, 1],
		1425	#bg => none
		1426	#active_bg => none
1227	#font => default_font	1427	#font => default_font
1228	#text => initial text	1428	#text => initial text
1229	#markup => initial narkup	1429	#markup => initial narkup
		1430	#max_w => maximum pixel width
		1431	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1432	layout => (new CFClient::Layout),
1231	fontsize => 1,	1433	fontsize => 1,
1232	align => -1,	1434	align => -1,
1233	valign => -1,	1435	valign => -1,
1234	padding => 2,	1436	padding => 2,
…		…
1249	}	1451	}
1250		1452
1251	$self	1453	$self
1252	}	1454	}
1253		1455
1254	sub escape {	1456	sub escape($) {
1255	local $_ = $_[1];	1457	local $_ = $_[0];
1256		1458
1257	s/&/&amp;/g;	1459	s/&/&amp;/g;
1258	s/>/&gt;/g;	1460	s/>/&gt;/g;
1259	s/</&lt;/g;	1461	s/</&lt;/g;
1260		1462
1261	$_[1]	1463	$_
1262	}	1464	}
1263		1465
1264	sub update {	1466	sub update {
1265	my ($self) = @_;	1467	my ($self) = @_;
1266		1468
…		…
1299	sub size_request {	1501	sub size_request {
1300	my ($self) = @_;	1502	my ($self) = @_;
1301		1503
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1504	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{max_w} || -1);	1505	$self->{layout}->set_width ($self->{max_w} || -1);
		1506	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1507	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1509
1306	my ($w, $h) = $self->{layout}->size;	1510	my ($w, $h) = $self->{layout}->size;
1307		1511
1308	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1338	}	1542	}
1339		1543
1340	sub _draw {	1544	sub _draw {
1341	my ($self) = @_;	1545	my ($self) = @_;
1342		1546
		1547	$self->SUPER::_draw; # draw background, if applicable
		1548
1343	my $tex = $self->{texture} ||= do {	1549	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1550	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1551	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$self->{layout}->set_width ($self->{w});	1552	$self->{layout}->set_width ($self->{w});
		1553	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1556
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1557	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1558
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1561	: ($self->{w} - $tex->{w}) * 0.5);
1354		1562
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1565	: ($self->{h} - $tex->{h}) * 0.5);
1358		1566
1359	$tex	1567	$tex
1360	};	1568	};
1361		1569
1362	glEnable GL_TEXTURE_2D;	1570	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1598	active_fg => [0, 0, 0],
1391	can_hover => 1,	1599	can_hover => 1,
1392	can_focus => 1,	1600	can_focus => 1,
1393	valign => 0,	1601	valign => 0,
1394	can_events => 1,	1602	can_events => 1,
		1603	#text => ...
1395	@_	1604	@_
1396	)	1605	)
1397	}	1606	}
1398		1607
1399	sub _set_text {	1608	sub _set_text {
…		…
1409	$self->{text} = $text;	1618	$self->{text} = $text;
1410		1619
1411	$text =~ s/./*/g if $self->{hidden};	1620	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1621	$self->{layout}->set_text ("$text ");
1413		1622
1414	$self->emit (changed => $self->{text});	1623	$self->_emit (changed => $self->{text});
1415	}	1624	}
1416		1625
1417	sub set_text {	1626	sub set_text {
1418	my ($self, $text) = @_;	1627	my ($self, $text) = @_;
1419		1628
1420	$self->{cursor} = length $text;	1629	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1630	$self->_set_text ($text);
		1631	$self->update;
1422	$self->check_size;	1632	$self->check_size;
1423	$self->update;
1424	}	1633	}
1425		1634
1426	sub get_text {	1635	sub get_text {
1427	$_[0]{text}	1636	$_[0]{text}
1428	}	1637	}
…		…
1431	my ($self) = @_;	1640	my ($self) = @_;
1432		1641
1433	my ($w, $h) = $self->SUPER::size_request;	1642	my ($w, $h) = $self->SUPER::size_request;
1434		1643
1435	($w + 1, $h) # add 1 for cursor	1644	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1645	}
1443		1646
1444	sub key_down {	1647	sub key_down {
1445	my ($self, $ev) = @_;	1648	my ($self, $ev) = @_;
1446		1649
…		…
1448	my $sym = $ev->{sym};	1651	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1652	my $uni = $ev->{unicode};
1450		1653
1451	my $text = $self->get_text;	1654	my $text = $self->get_text;
1452		1655
1453	if ($sym == 8) {	1656	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1657	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1658	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1659	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1660	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1661	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1662	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1663	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1664	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1665	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1666	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1667	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1668	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1669	$self->_emit ('escape');
1467	} elsif ($uni) {	1670	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1671	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1672	}
1470		1673
1471	$self->_set_text ($text);	1674	$self->_set_text ($text);
1472	$self->update;	1675	$self->update;
		1676	$self->check_size;
1473	}	1677	}
1474		1678
1475	sub focus_in {	1679	sub focus_in {
1476	my ($self) = @_;	1680	my ($self) = @_;
1477		1681
…		…
1557	if ($sym == 13) {	1761	if ($sym == 13) {
1558	unshift @{$self->{history}},	1762	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1763	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1764	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1765	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1766	$self->_emit (activate => $txt);
1563	$self->update;	1767	$self->update;
1564		1768
1565	} elsif ($sym == CFClient::SDLK_UP) {	1769	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1770	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1771	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1810	my $class = shift;
1607		1811
1608	$class->SUPER::new (	1812	$class->SUPER::new (
1609	padding => 4,	1813	padding => 4,
1610	fg => [1, 1, 1],	1814	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1815	active_fg => [0, 0, 1],
1613	can_hover => 1,	1816	can_hover => 1,
1614	align => 0,	1817	align => 0,
1615	valign => 0,	1818	valign => 0,
1616	can_events => 1,	1819	can_events => 1,
1617	@_	1820	@_
1618	)	1821	)
1619	}	1822	}
1620		1823
		1824	sub activate { }
		1825
1621	sub button_up {	1826	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1827	my ($self, $ev, $x, $y) = @_;
1623		1828
		1829	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1830	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1831	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1832	}
1629		1833
1630	sub _draw {	1834	sub _draw {
1631	my ($self) = @_;	1835	my ($self) = @_;
1632		1836
…		…
1664		1868
1665	$class->SUPER::new (	1869	$class->SUPER::new (
1666	padding => 2,	1870	padding => 2,
1667	fg => [1, 1, 1],	1871	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1872	active_fg => [1, 1, 0],
		1873	bg => [0, 0, 0, 0.2],
		1874	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1875	state => 0,
1670	can_hover => 1,	1876	can_hover => 1,
1671	@_	1877	@_
1672	)	1878	)
1673	}	1879	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1888	my ($self, $ev, $x, $y) = @_;
1683		1889
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1892	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1893	$self->_emit (changed => $self->{state});
1688	}	1894	}
1689	}	1895	}
1690		1896
1691	sub _draw {	1897	sub _draw {
1692	my ($self) = @_;	1898	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2163	qw(s1_slider.png s1_slider_bg.png);
1958		2164
1959	sub new {	2165	sub new {
1960	my $class = shift;	2166	my $class = shift;
1961		2167
1962	# range [value, low, high, page]	2168	# range [value, low, high, page, unit]
1963		2169
1964	# TODO: 0-width page	2170	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2171	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2172	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2173	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2174	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2175	active_fg => [0, 0, 0],
		2176	bg => [0, 0, 0, 0.2],
		2177	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2178	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2179	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2180	req_h => $::WIDTH / 80,
1973	vertical => 0,	2181	vertical => 0,
1974	can_hover => 1,	2182	can_hover => 1,
1975	inner_pad => 5,	2183	inner_pad => 0.02,
1976	@_	2184	@_
1977	);	2185	);
1978		2186
		2187	$self->set_value ($self->{range}[0]);
		2188	$self->update;
		2189
1979	$self	2190	$self
		2191	}
		2192
		2193	sub set_range {
		2194	my ($self, $range) = @_;
		2195
		2196	($range, $self->{range}) = ($self->{range}, $range);
		2197
		2198	$self->update
		2199	if "@$range" ne "@{$self->{range}}";
		2200	}
		2201
		2202	sub set_value {
		2203	my ($self, $value) = @_;
		2204
		2205	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2206
		2207	$hi = $lo + 1 if $hi <= $lo;
		2208
		2209	$page = $hi - $lo if $page > $hi - $lo;
		2210
		2211	$value = $lo if $value < $lo;
		2212	$value = $hi - $page if $value > $hi - $page;
		2213
		2214	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2215	if $unit;
		2216
		2217	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2218
		2219	if ($value != $old_value) {
		2220	$self->_emit (changed => $value);
		2221	$self->update;
		2222	}
1980	}	2223	}
1981		2224
1982	sub size_request {	2225	sub size_request {
1983	my ($self) = @_;	2226	my ($self) = @_;
1984		2227
…		…
1990		2233
1991	sub button_down {	2234	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
1993		2236
1994	$self->SUPER::button_down ($ev, $x, $y);	2237	$self->SUPER::button_down ($ev, $x, $y);
		2238
		2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2240
1995	$self->mouse_motion ($ev, $x, $y);	2241	$self->mouse_motion ($ev, $x, $y);
1996	}	2242	}
1997		2243
1998	sub mouse_motion {	2244	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2000		2246
2001	if ($GRAB == $self) {	2247	if ($GRAB == $self) {
		2248	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2249
		2250	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2251
		2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2253
		2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2255	}
		2256	}
		2257
		2258	sub update {
		2259	my ($self) = @_;
		2260
		2261	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2262	$self->set_value ($self->{range}[0]);
		2263
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2264	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2265	my $range = ($hi - $page - $lo) || 1e-100;
2003		2266
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2267	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2268
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2269	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2270	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2271
2009	$x -= $inner_pad_px; # substract the padding	2272	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2273	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2274
2015	$self->emit (changed => $x);	2275	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2276	$self->{knob_w} = $knob_w;
2017	}	2277	});
2018	}
2019		2278
2020	# the inner_* stuff is for generating a padding for the slider handle,	2279	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2280	}
2027		2281
2028	sub _draw {	2282	sub _draw {
2029	my ($self) = @_;	2283	my ($self) = @_;
2030		2284
2031	$self->SUPER::_draw ();	2285	$self->SUPER::_draw ();
2032		2286
2033	my ($w, $h) = @$self{qw(w h)};	2287	glScale $self->{w}, $self->{h};
2034		2288
2035	if ($self->{vertical}) {	2289	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2290	# draw a vertical slider like a rotated horizontal slider
2037		2291
		2292	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2293	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2294	}
2043		2295
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2296	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2297	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2298
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2299	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2300	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2301
2068	# draw background	2302	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2303	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2304
2071	# draw handle	2305	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2306	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2307
2074	glDisable GL_TEXTURE_2D;	2308	glDisable GL_TEXTURE_2D;
2075	}	2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFClient::UI::ValSlider;
		2314
		2315	our @ISA = CFClient::UI::HBox::;
		2316
		2317	sub new {
		2318	my ($class, %arg) = @_;
		2319
		2320	my $range = delete $arg{range};
		2321
		2322	my $self = $class->SUPER::new (
		2323	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2324	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2325	to_value => sub { shift },
		2326	from_value => sub { shift },
		2327	%arg,
		2328	);
		2329
		2330	$self->{slider}->connect (changed => sub {
		2331	my ($self, $value) = @_;
		2332	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2333	$self->{parent}->emit (changed => $value);
		2334	});
		2335
		2336	# $self->{entry}->connect (changed => sub {
		2337	# my ($self, $value) = @_;
		2338	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2339	# $self->{parent}->emit (changed => $value);
		2340	# });
		2341
		2342	$self->add ($self->{slider}, $self->{entry});
		2343
		2344	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2345
		2346	$self
		2347	}
		2348
		2349	sub set_range { shift->{slider}->set_range (@_) }
		2350	sub set_value { shift->{slider}->set_value (@_) }
2076		2351
2077	#############################################################################	2352	#############################################################################
2078		2353
2079	package CFClient::UI::TextView;	2354	package CFClient::UI::TextView;
2080		2355
…		…
2110		2385
2111	$self->{fontsize} = $fontsize;	2386	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2387	$self->reflow;
2113	}	2388	}
2114		2389
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2390	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2391	my ($self, $w, $h) = @_;
2136		2392
2137	$self->SUPER::size_allocate ($w, $h);	2393	$self->SUPER::size_allocate ($w, $h);
2138		2394
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2397	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2398
2143	$self->reflow;	2399	$self->reflow;
2144	}	2400	}
2145		2401
		2402	sub text_size {
		2403	my ($self, $text, $indent) = @_;
		2404
		2405	my $layout = $self->{layout};
		2406
		2407	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2408	$layout->set_width ($self->{children}[0]{w} - $indent);
		2409	$layout->set_markup ($text);
		2410
		2411	$layout->size
		2412	}
		2413
		2414	sub reflow {
		2415	my ($self) = @_;
		2416
		2417	$self->{need_reflow}++;
		2418	$self->update;
		2419	}
		2420
		2421	sub set_offset {
		2422	my ($self, $offset) = @_;
		2423
		2424	# todo: base offset on lines or so, not on pixels
		2425	$self->{children}[1]->set_value ($offset);
		2426	}
		2427
		2428	sub clear {
		2429	my ($self) = @_;
		2430
		2431	$self->{par} = [];
		2432	$self->{height} = 0;
		2433	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2434	}
		2435
2146	sub add_paragraph {	2436	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2437	my ($self, $color, $text, $indent) = @_;
2148		2438
2149	#TODO: intelligently "reformat" paragraph	2439	for my $line (split /\n/, $text) {
2150		2440	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2441	$self->{height} += $h;
		2442	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2443	}
2154		2444
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2445	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2446	}
2160		2447
2161	sub update {	2448	sub update {
2162	my ($self) = @_;	2449	my ($self) = @_;
2163		2450
…		…
2165		2452
2166	return unless $self->{h} > 0;	2453	return unless $self->{h} > 0;
2167		2454
2168	delete $self->{texture};	2455	delete $self->{texture};
2169		2456
2170	$ROOT->on_refresh ($self, sub {	2457	$ROOT->on_post_alloc ($self, sub {
		2458	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2459
2171	if (delete $self->{need_reflow}) {	2460	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2461	my $height = 0;
2173		2462
2174	$height += $_->[0] = $self->text_height ($_->[2])	2463	my $layout = $self->{layout};
		2464
		2465	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2466
2175	for @{$self->{par}};	2467	for (@{$self->{par}}) {
		2468	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2469	$layout->set_width ($W - $_->[3]);
		2470	$layout->set_markup ($_->[4]);
		2471	my ($w, $h) = $layout->size;
		2472	$_->[0] = $w + $_->[3];
		2473	$_->[1] = $h;
		2474	}
		2475
		2476	$height += $_->[1];
		2477	}
2176		2478
2177	$self->{height} = $height;	2479	$self->{height} = $height;
2178		2480
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2481	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2482
2181	delete $self->{texture};	2483	delete $self->{texture};
2182	}	2484	}
2183		2485
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2486	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2487	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2488	glClear GL_COLOR_BUFFER_BIT;
2187		2489
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2490	my $top = int $self->{children}[1]{range}[0];
2192		2491
2193	my $y0 = $top;	2492	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2493	my $y1 = $top + $H;
2195		2494
2196	my $y = 0;	2495	my $y = 0;
2197		2496
2198	my $layout = $self->{layout};	2497	my $layout = $self->{layout};
2199		2498
2200	$layout->set_font ($self->{font}) if $self->{font};	2499	$layout->set_font ($self->{font}) if $self->{font};
2201		2500
		2501	glEnable GL_BLEND;
		2502	#TODO# not correct in windows where rgba is forced off
		2503	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2504
2202	for my $par (@{$self->{par}}) {	2505	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2506	my $h = $par->[1];
2204		2507
2205	if ($y0 < $y + $h && $y < $y1) {	2508	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2509	$layout->set_foreground (@{ $par->[2] });
		2510	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2511	$layout->set_markup ($par->[4]);
2208		2512
2209	my ($W, $H) = $layout->size;	2513	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2514
		2515	glRasterPos $par->[3], $y - $y0;
		2516	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2517	}
2212		2518
2213	$y += $h;	2519	$y += $h;
2214	}	2520	}
2215		2521
2216	glDisable GL_TEXTURE_2D;	2522	glDisable GL_BLEND;
2217	};	2523	};
2218	});	2524	});
2219	}	2525	}
2220		2526
2221	sub _draw {	2527	sub _draw {
2222	my ($self) = @_;	2528	my ($self) = @_;
2223		2529
2224	glEnable GL_TEXTURE_2D;	2530	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2532	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2533	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2534	glDisable GL_TEXTURE_2D;
2229		2535
2230	$self->{children}[1]->draw;	2536	$self->{children}[1]->draw;
2231		2537
2232	}	2538	}
…		…
2281		2587
2282	sub new {	2588	sub new {
2283	my $class = shift;	2589	my $class = shift;
2284		2590
2285	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2286	state => 0,	2592	state => 0,
2287	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2288	@_	2594	@_
2289	);	2595	);
2290		2596
2291	if ($self->{state}) {	2597	if ($self->{state}) {
2292	$self->{state} = 0;	2598	$self->{state} = 0;
…		…
2301		2607
2302	# TODO: use animation	2608	# TODO: use animation
2303	if ($self->{state} = !$self->{state}) {	2609	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});	2610	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));	2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");	2612	$self->_emit ("open");
2307	} else {	2613	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});	2614	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");	2615	$self->_emit ("close");
2310	}	2616	}
2311		2617
2312	$self->emit (changed => $self->{state});	2618	$self->_emit (changed => $self->{state});
2313	}	2619	}
2314		2620
2315	#############################################################################	2621	#############################################################################
2316		2622
2317	package CFClient::UI::Tooltip;	2623	package CFClient::UI::Tooltip;
…		…
2331		2637
2332	sub set_tooltip_from {	2638	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2639	my ($self, $widget) = @_;
2334		2640
2335	$self->add (new CFClient::UI::Label	2641	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2642	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2644	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2645	fg => [0, 0, 0, 1],
		2646	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2647	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2648	);
2342	}	2649	}
2343		2650
2344	sub size_request {	2651	sub size_request {
2345	my ($self) = @_;	2652	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2698	use CFClient::OpenGL;
2392		2699
2393	sub new {	2700	sub new {
2394	my $class = shift;	2701	my $class = shift;
2395		2702
2396	$class->SUPER::new (	2703	my $self = $class->SUPER::new (
2397	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2398	@_,	2706	@_,
2399	)	2707	);
		2708
		2709	if ($self->{anim} && $self->{animspeed}) {
		2710	Scalar::Util::weaken (my $widget = $self);
		2711
		2712	$self->{timer} = Event->timer (
		2713	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2714	hard => 1,
		2715	interval => $self->{animspeed},
		2716	cb => sub {
		2717	++$widget->{frame};
		2718	$widget->update;
		2719	},
		2720	);
		2721	}
		2722
		2723	$self
2400	}	2724	}
2401		2725
2402	sub size_request {	2726	sub size_request {
2403	(32, 8)	2727	(32, 8)
2404	}	2728	}
2405		2729
		2730	sub update {
		2731	my ($self) = @_;
		2732
		2733	return unless $self->{visible};
		2734
		2735	$self->SUPER::update;
		2736	}
		2737
2406	sub _draw {	2738	sub _draw {
2407	my ($self) = @_;	2739	my ($self) = @_;
2408		2740
2409	return unless $::CONN;#d# manage and cache textures differently	2741	return unless $::CONN;
		2742
		2743	my $face;
		2744
		2745	if ($self->{frame}) {
		2746	my $anim = $::CONN->{anim}[$self->{anim}];
		2747
		2748	$face = $anim->[ $self->{frame} % @$anim ]
		2749	if $anim && @$anim;
		2750	}
		2751
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2752	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2753
2412	# TODO animation
2413	if ($tex) {	2754	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2755	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2756	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2757	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2758	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2419	}	2760	}
2420	}	2761	}
2421		2762
		2763	sub DESTROY {
		2764	my ($self) = @_;
		2765
		2766	$self->{timer}->cancel
		2767	if $self->{timer};
		2768
		2769	$self->SUPER::DESTROY;
		2770	}
		2771
2422	#############################################################################	2772	#############################################################################
2423		2773
2424	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2425		2775
2426	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2777
2428	sub new {	2778	sub new {
2429	my $class = shift;	2779	my $class = shift;
2430		2780
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2441	can_hover => 1,	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2783	@_,
2500	);	2784	);
2501		2785
2502	$self	2786	$self
2503	}	2787	}
…		…
2506	my ($self, $items) = @_;	2790	my ($self, $items) = @_;
2507		2791
2508	$self->{scrolled}->clear;	2792	$self->{scrolled}->clear;
2509	return unless $items;	2793	return unless $items;
2510		2794
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2795	my @items = sort {
		2796	($a->{type} <=> $b->{type})
		2797	or ($a->{name} cmp $b->{name})
		2798	} @$items;
2512		2799
2513	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2514		2801
		2802	my $row = 0;
2515	for my $item (@items) {	2803	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2804	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2805
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2809
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2810	$row++;
		2811	}
2524	}	2812	}
2525		2813
2526	sub size_request {	2814	sub size_request {
2527	my ($self) = @_;	2815	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});	2816	($self->{req_w}, $self->{req_h});
…		…
2568		2856
2569	# popup given the event (must be a mouse button down event currently)	2857	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2858	sub popup {
2571	my ($self, $ev) = @_;	2859	my ($self, $ev) = @_;
2572		2860
2573	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2574		2862
2575	# maybe save $GRAB? must be careful about events...	2863	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2864	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2865	$self->{button} = $ev->{button};
2578		2866
…		…
2593		2881
2594	if ($ev->{button} == $self->{button}) {	2882	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2883	undef $GRAB;
2596	$self->hide;	2884	$self->hide;
2597		2885
2598	$self->emit ("popdown");	2886	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2887	$self->{hover}[1]->() if $self->{hover};
2600	}	2888	}
2601	}	2889	}
2602		2890
2603	#############################################################################	2891	#############################################################################
2604		2892
2605	package CFClient::UI::Statusbox;	2893	package CFClient::UI::Statusbox;
2606		2894
2607	our @ISA = CFClient::UI::VBox::;	2895	our @ISA = CFClient::UI::VBox::;
		2896
		2897	sub new {
		2898	my $class = shift;
		2899
		2900	$class->SUPER::new (
		2901	fontsize => 0.8,
		2902	@_,
		2903	)
		2904	}
2608		2905
2609	sub reorder {	2906	sub reorder {
2610	my ($self) = @_;	2907	my ($self) = @_;
2611	my $NOW = time;	2908	my $NOW = time;
2612		2909
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2928	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2929	: $item->{text};
2633		2930
2634	for ($short) {	2931	for ($short) {
2635	s/^\s+//;	2932	s/^\s+//;
2636	s/\012.*/…/s;	2933	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2934	}
2640		2935
2641	new CFClient::UI::Label	2936	new CFClient::UI::Label
2642	markup => $short,	2937	markup => $short,
2643	tooltip => $item->{tooltip},	2938	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2939	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2940	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2941	fontsize => $item->{fontsize} || $self->{fontsize},
		2942	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2943	fg => $item->{fg},
2648	can_events => 1,	2944	can_events => 1,
2649	can_hover => 1	2945	can_hover => 1
2650	};	2946	};
2651	}	2947	}
2652		2948
…		…
2654	$self->SUPER::add (reverse @widgets);	2950	$self->SUPER::add (reverse @widgets);
2655	}	2951	}
2656		2952
2657	sub add {	2953	sub add {
2658	my ($self, $text, %arg) = @_;	2954	my ($self, $text, %arg) = @_;
		2955
		2956	$text =~ s/^\s+//;
		2957	$text =~ s/\s+$//;
		2958
		2959	return unless $text;
2659		2960
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2961	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2962
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2963	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2964
…		…
2666	$item->{count}++;	2967	$item->{count}++;
2667	} else {	2968	} else {
2668	$item->{count} = 1;	2969	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2970	$item->{text} = $item->{tooltip} = $text;
2670	}	2971	}
		2972	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2973	$item->{timeout} = $timeout;
2672	delete $item->{label};	2974	delete $item->{label};
2673	} else {	2975	} else {
2674	$self->{item}{$group} = {	2976	$self->{item}{$group} = {
2675	id => ++$self->{id},	2977	id => ++$self->{id},
2676	text => $text,	2978	text => $text,
2677	timeout => $timeout,	2979	timeout => $timeout,
2678	tooltip => $text,	2980	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2981	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2982	pri => 0,
2682	count => 1,	2983	count => 1,
2683	%arg,	2984	%arg,
2684	};	2985	};
2685	}	2986	}
2686		2987
2687	$self->reorder;	2988	$self->reorder;
2688	}	2989	}
2689		2990
		2991	sub reconfigure {
		2992	my ($self) = @_;
		2993
		2994	delete $_->{label}
		2995	for values %{ $self->{item} || {} };
		2996
		2997	$self->reorder;
		2998	$self->SUPER::reconfigure;
		2999	}
		3000
2690	#############################################################################	3001	#############################################################################
2691		3002
2692	package CFClient::UI::Root;	3003	package CFClient::UI::Root;
2693		3004
2694	our @ISA = CFClient::UI::Container::;	3005	our @ISA = CFClient::UI::Container::;
…		…
2697		3008
2698	sub new {	3009	sub new {
2699	my $class = shift;	3010	my $class = shift;
2700		3011
2701	$class->SUPER::new (	3012	$class->SUPER::new (
		3013	visible => 1,
2702	@_,	3014	@_,
2703	)	3015	)
2704	}	3016	}
2705		3017
2706	sub configure {	3018	sub configure {
…		…
2724	}	3036	}
2725		3037
2726	sub size_allocate {	3038	sub size_allocate {
2727	my ($self, $w, $h) = @_;	3039	my ($self, $w, $h) = @_;
2728		3040
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744
2745	for my $child ($self->children) {	3041	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		3043
		3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3045	if exists $child->{req_x};
		3046
		3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3048	if exists $child->{req_y};
		3049
		3050	$X = $self->{user_x} if exists $self->{user_x};
		3051	$Y = $self->{user_y} if exists $self->{user_y};
		3052
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3055
2750	$child->configure ($X, $Y, $W, $H);	3056	$child->configure ($X, $Y, $W, $H);
2751	}	3057	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3058	}
2756		3059
2757	sub coord2local {	3060	sub coord2local {
2758	my ($self, $x, $y) = @_;	3061	my ($self, $x, $y) = @_;
2759		3062
…		…
2772	$self->check_size;	3075	$self->check_size;
2773	$::WANT_REFRESH++;	3076	$::WANT_REFRESH++;
2774	}	3077	}
2775		3078
2776	sub add {	3079	sub add {
2777	my ($self, $child) = @_;	3080	my ($self, @children) = @_;
2778		3081
		3082	for (my @widgets = @children; my $w = pop @widgets; ) {
		3083	push @widgets, $w->children;
		3084	$w->{root} = $self;
		3085	$w->{visible} = $self->{visible} + 1;
		3086	}
		3087
		3088	for my $child (@children) {
		3089	$child->{is_toplevel} = 1;
		3090
2779	# integerise window positions	3091	# integerise window positions
2780	$child->{x} = int $child->{x};	3092	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3093	$child->{y} = int $child->{y};
		3094	}
2782		3095
2783	$self->SUPER::add ($child);	3096	$self->SUPER::add (@children);
		3097	}
		3098
		3099	sub remove {
		3100	my ($self, @children) = @_;
		3101
		3102	$self->SUPER::remove (@children);
		3103
		3104	while (@children) {
		3105	my $w = pop @children;
		3106	push @children, $w->children;
		3107	$w->set_invisible;
		3108	}
2784	}	3109	}
2785		3110
2786	sub on_refresh {	3111	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
2788		3113
2789	$self->{refresh_hook}{$id} = $cb;	3114	$self->{refresh_hook}{$id} = $cb;
2790	}	3115	}
2791		3116
		3117	sub on_post_alloc {
		3118	my ($self, $id, $cb) = @_;
		3119
		3120	$self->{post_alloc_hook}{$id} = $cb;
		3121	}
		3122
2792	sub draw {	3123	sub draw {
2793	my ($self) = @_;	3124	my ($self) = @_;
2794		3125
		3126	while ($self->{refresh_hook}) {
		3127	$_->()
		3128	for values %{delete $self->{refresh_hook}};
		3129	}
		3130
2795	if ($self->{check_size}) {	3131	if ($self->{check_size}) {
2796	my @queue = ([], []);	3132	my @queue;
2797		3133
2798	for (;;) {	3134	for (;;) {
2799	if ($self->{check_size}) {	3135	if ($self->{check_size}) {
2800	# heuristic: check containers last	3136	#TODO use array-of-depth approach
2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
		3138	@queue = sort { $a->{visible} <=> $b->{visible} }
2802	for values %{delete $self->{check_size}}	3139	@queue, values %{delete $self->{check_size}};
2803	}	3140	}
2804		3141
2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
		3143
		3144	defined $widget->{visible} or last; # do not resize invisible widgets
2806		3145
2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(user_w user_h)}
2809	: $widget->size_request;	3148	: $widget->size_request;
2810		3149
…		…
2830	$w = 0 if $w < 0;	3169	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3170	$h = 0 if $h < 0;
2832		3171
2833	$widget->{w} = $w;	3172	$widget->{w} = $w;
2834	$widget->{h} = $h;	3173	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3174	$widget->emit (size_allocate => $w, $h);
2837	}	3175	}
2838	}	3176	}
2839		3177
2840	while ($self->{refresh_hook}) {	3178	while ($self->{post_alloc_hook}) {
2841	$_->()	3179	$_->()
2842	for values %{delete $self->{refresh_hook}};	3180	for values %{delete $self->{post_alloc_hook}};
2843	}	3181	}
2844		3182
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3183	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3185	glClear GL_COLOR_BUFFER_BIT;
2848		3186
2849	glMatrixMode GL_PROJECTION;	3187	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3188	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3190	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3191	glLoadIdentity;
2854		3192
2855	$self->_draw;	3193	$self->_draw;
2856	}	3194	}
…		…
2858	#############################################################################	3196	#############################################################################
2859		3197
2860	package CFClient::UI;	3198	package CFClient::UI;
2861		3199
2862	$ROOT = new CFClient::UI::Root;	3200	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3201	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3202
2865	1	3203	1
2866		3204

Diff Legend

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