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.245 by elmex, Sat May 27 21:15:57 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};	180	$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};	181	$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};	182	$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};	183	$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};	184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	185	}
157
158	$widget->reconfigure;
159	}	186	}
		187
		188	reconfigure_widgets;
160	}	189	}
161		190
162	#############################################################################	191	#############################################################################
163		192
164	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
177	can_events => 1,	206	can_events => 1,
178	@_	207	@_
179	}, $class;	208	}, $class;
180		209
181	for (keys %$self) {	210	for (keys %$self) {
182	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
184	}	213	}
185	}	214	}
186		215
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188		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
189	$self	225	$self
		226	}
		227
		228	sub toggle_visibility {
		229	my ($self) = @_;
		230
		231	if ($self->{visible}) {
		232	$self->hide;
		233	} else {
		234	$self->show;
		235	}
190	}	236	}
191		237
192	sub destroy {	238	sub destroy {
193	my ($self) = @_;	239	my ($self) = @_;
194		240
…		…
196	%$self = ();	242	%$self = ();
197	}	243	}
198		244
199	sub show {	245	sub show {
200	my ($self) = @_;	246	my ($self) = @_;
201
202	return if $self->{parent};	247	return if $self->{parent};
203		248
204	$CFClient::UI::ROOT->add ($self);	249	$CFClient::UI::ROOT->add ($self);
205	}	250	}
206		251
207	sub hide {	252	sub show_centered {
208	my ($self) = @_;	253	my ($self) = @_;
		254	return if $self->{parent};
		255
		256	$self->show;
		257
		258	$CFClient::UI::ROOT->on_post_alloc (
		259	"centered $self" => sub {
		260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		261	},
		262	);
		263	}
		264
		265	sub set_invisible {
		266	my ($self) = @_;
		267
		268	return unless $self->{visible};
		269
		270	# broken show/hide model
		271
		272	delete $self->{root};
		273	delete $self->{visible};
209		274
210	undef $GRAB if $GRAB == $self;	275	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	276	undef $HOVER if $HOVER == $self;
		277
		278	CFClient::UI::check_tooltip
		279	if $CFClient::UI::TOOLTIP->{owner} == $self;
		280
		281	$self->focus_out;
		282
		283	$self->emit (visibility_change => 0);
		284	}
		285
		286	sub hide {
		287	my ($self) = @_;
		288
		289	$self->set_invisible;
212		290
213	$self->{parent}->remove ($self)	291	$self->{parent}->remove ($self)
214	if $self->{parent};	292	if $self->{parent};
215	}	293	}
216		294
…		…
283		361
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	362	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	363	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	364	}
287		365
		366	sub set_tooltip {
		367	my ($self, $tooltip) = @_;
		368
		369	$tooltip =~ s/^\s+//;
		370	$tooltip =~ s/\s+$//;
		371
		372	return if $self->{tooltip} eq $tooltip;
		373
		374	$self->{tooltip} = $tooltip;
		375
		376	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		377	delete $CFClient::UI::TOOLTIP->{owner};
		378	CFClient::UI::check_tooltip;
		379	}
		380	}
		381
288	# translate global coordinates to local coordinate system	382	# translate global coordinates to local coordinate system
289	sub coord2local {	383	sub coord2local {
290	my ($self, $x, $y) = @_;	384	my ($self, $x, $y) = @_;
291		385
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	386	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	399	return if $FOCUS == $self;
306	return unless $self->{can_focus};	400	return unless $self->{can_focus};
307		401
308	my $focus = $FOCUS; $FOCUS = $self;	402	my $focus = $FOCUS; $FOCUS = $self;
309		403
310	$self->emit (focus_in => $focus);	404	$self->_emit (focus_in => $focus);
311		405
312	$focus->update if $focus;	406	$focus->update if $focus;
313	$FOCUS->update;	407	$FOCUS->update;
314	}	408	}
315		409
…		…
318		412
319	return unless $FOCUS == $self;	413	return unless $FOCUS == $self;
320		414
321	my $focus = $FOCUS; undef $FOCUS;	415	my $focus = $FOCUS; undef $FOCUS;
322		416
323	$self->emit (focus_out => $focus);	417	$self->_emit (focus_out => $focus);
324		418
325	$focus->update if $focus; #?	419	$focus->update if $focus; #?
		420
		421	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		422	unless $FOCUS;
326	}	423	}
327		424
328	sub mouse_motion { }	425	sub mouse_motion { }
329	sub button_up { }	426	sub button_up { }
330	sub key_down { }	427	sub key_down { }
331	sub key_up { }	428	sub key_up { }
332		429
333	sub button_down {	430	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	431	my ($self, $ev, $x, $y) = @_;
335		432
336	$self->focus_in;	433	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	467	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	468	glPushMatrix;
372	glColor 1, 1, 0, 1;	469	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	471	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	472	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	473	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	474	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	475	glVertex 0 , $self->{h} - 1;
379	glEnd;	476	glEnd;
380	glPopMatrix;	477	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	478	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	479	}
383	}	480	}
384		481
385	sub _draw {	482	sub _draw {
386	my ($self) = @_;	483	my ($self) = @_;
…		…
403	sub set_parent {	500	sub set_parent {
404	my ($self, $parent) = @_;	501	my ($self, $parent) = @_;
405		502
406	Scalar::Util::weaken ($self->{parent} = $parent);	503	Scalar::Util::weaken ($self->{parent} = $parent);
407		504
		505	if ($parent->{visible} || 1) {
		506	$self->{root} = $parent->{root};
		507	$self->{visible} = $parent->{visible} + 1;
		508
		509	$self->emit (visibility_change => 1)
		510	unless $self->{parent}{visible};
		511	}
		512
408	# TODO: req_w _does_change after ->reconfigure	513	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	514	$self->check_size
410	unless exists $self->{req_w};	515	unless exists $self->{req_w};
		516
		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
…		…
858	my $class = shift;	1007	my $class = shift;
859		1008
860	# TODO: user_x, user_y, overwrite moveto?	1009	# TODO: user_x, user_y, overwrite moveto?
861		1010
862	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
865	border => 0.6,	1014	border => 0.6,
866	toplevel => 1,	1015	is_toplevel => 1,
867	can_events => 1,	1016	can_events => 1,
868	@_	1017	@_
869	);	1018	);
870		1019
871	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	1021	align => 0,
…		…
896	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
897		1046
898	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
900		1049
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1051	if $self->{title};
903		1052
904	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1054	}
906		1055
…		…
925	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
926		1075
927	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
929		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
933	$self->check_size;	1084	$self->check_size;
934	};	1085	};
935		1086
936	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
940	$self->{motion} = sub {	1091	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
942		1093
943	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
944		1095
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098	$self->move ($self->{user_x}, $self->{user_y});
946	$self->update;	1099	$self->update;
947	};	1100	};
948	}	1101	}
949	}	1102	}
950		1103
…		…
1012	sub new {	1165	sub new {
1013	my $class = shift;	1166	my $class = shift;
1014		1167
1015	$class->SUPER::new (	1168	$class->SUPER::new (
1016	col_expand => [],	1169	col_expand => [],
1017	@_	1170	@_,
1018	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1176	}
1020		1177
1021	sub add {	1178	sub add {
1022	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1023		1180
1024	$child->set_parent ($self);	1181	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1026		1183
1027	$child->check_size;	1184	$self->check_size (1);
1028	}	1185	}
1029		1186
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1188	sub clear {
1036	my ($self) = @_;	1189	my ($self) = @_;
1037		1190
1038	my @children = $self->children;	1191	my @children = $self->children;
1039	delete $self->{children};	1192	delete $self->{children};
…		…
1041	for (@children) {	1194	for (@children) {
1042	delete $_->{parent};	1195	delete $_->{parent};
1043	$_->hide;	1196	$_->hide;
1044	}	1197	}
1045		1198
		1199	$self->check_size (1);
1046	$self->update;	1200	$self->update;
1047	}	1201	}
1048		1202
1049	sub get_wh {	1203	sub get_wh {
1050	my ($self) = @_;	1204	my ($self) = @_;
…		…
1082	sub size_allocate {	1236	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1084		1238
1085	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1086		1240
1087	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1089		1243
1090	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1267		1421
1268	#############################################################################	1422	#############################################################################
1269		1423
1270	package CFClient::UI::Label;	1424	package CFClient::UI::Label;
1271		1425
1272	our @ISA = CFClient::UI::Base::;	1426	our @ISA = CFClient::UI::DrawBG::;
1273		1427
1274	use CFClient::OpenGL;	1428	use CFClient::OpenGL;
1275		1429
1276	sub new {	1430	sub new {
1277	my ($class, %arg) = @_;	1431	my ($class, %arg) = @_;
1278		1432
1279	my $self = $class->SUPER::new (	1433	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1434	fg => [1, 1, 1],
		1435	#bg => none
		1436	#active_bg => none
1281	#font => default_font	1437	#font => default_font
1282	#text => initial text	1438	#text => initial text
1283	#markup => initial narkup	1439	#markup => initial narkup
		1440	#max_w => maximum pixel width
		1441	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1442	layout => (new CFClient::Layout),
1285	fontsize => 1,	1443	fontsize => 1,
1286	align => -1,	1444	align => -1,
1287	valign => -1,	1445	valign => -1,
1288	padding => 2,	1446	padding => 2,
…		…
1303	}	1461	}
1304		1462
1305	$self	1463	$self
1306	}	1464	}
1307		1465
1308	sub escape {	1466	sub escape($) {
1309	local $_ = $_[1];	1467	local $_ = $_[0];
1310		1468
1311	s/&/&amp;/g;	1469	s/&/&amp;/g;
1312	s/>/&gt;/g;	1470	s/>/&gt;/g;
1313	s/</&lt;/g;	1471	s/</&lt;/g;
1314		1472
1315	$_[1]	1473	$_
1316	}	1474	}
1317		1475
1318	sub update {	1476	sub update {
1319	my ($self) = @_;	1477	my ($self) = @_;
1320		1478
…		…
1353	sub size_request {	1511	sub size_request {
1354	my ($self) = @_;	1512	my ($self) = @_;
1355		1513
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1514	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1515	$self->{layout}->set_width ($self->{max_w} || -1);
		1516	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1517	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1518	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1519
1360	my ($w, $h) = $self->{layout}->size;	1520	my ($w, $h) = $self->{layout}->size;
1361		1521
1362	if (exists $self->{template}) {	1522	if (exists $self->{template}) {
…		…
1392	}	1552	}
1393		1553
1394	sub _draw {	1554	sub _draw {
1395	my ($self) = @_;	1555	my ($self) = @_;
1396		1556
		1557	$self->SUPER::_draw; # draw background, if applicable
		1558
1397	my $tex = $self->{texture} ||= do {	1559	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1560	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1561	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1562	$self->{layout}->set_width ($self->{w});
		1563	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1566
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1567	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1568
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1571	: ($self->{w} - $tex->{w}) * 0.5);
1408		1572
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1575	: ($self->{h} - $tex->{h}) * 0.5);
1412		1576
1413	$tex	1577	$tex
1414	};	1578	};
1415		1579
1416	glEnable GL_TEXTURE_2D;	1580	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1608	active_fg => [0, 0, 0],
1445	can_hover => 1,	1609	can_hover => 1,
1446	can_focus => 1,	1610	can_focus => 1,
1447	valign => 0,	1611	valign => 0,
1448	can_events => 1,	1612	can_events => 1,
		1613	#text => ...
1449	@_	1614	@_
1450	)	1615	)
1451	}	1616	}
1452		1617
1453	sub _set_text {	1618	sub _set_text {
…		…
1463	$self->{text} = $text;	1628	$self->{text} = $text;
1464		1629
1465	$text =~ s/./*/g if $self->{hidden};	1630	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1631	$self->{layout}->set_text ("$text ");
1467		1632
1468	$self->emit (changed => $self->{text});	1633	$self->_emit (changed => $self->{text});
1469	}	1634	}
1470		1635
1471	sub set_text {	1636	sub set_text {
1472	my ($self, $text) = @_;	1637	my ($self, $text) = @_;
1473		1638
1474	$self->{cursor} = length $text;	1639	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1640	$self->_set_text ($text);
		1641	$self->update;
1476	$self->check_size;	1642	$self->check_size;
1477	$self->update;
1478	}	1643	}
1479		1644
1480	sub get_text {	1645	sub get_text {
1481	$_[0]{text}	1646	$_[0]{text}
1482	}	1647	}
…		…
1485	my ($self) = @_;	1650	my ($self) = @_;
1486		1651
1487	my ($w, $h) = $self->SUPER::size_request;	1652	my ($w, $h) = $self->SUPER::size_request;
1488		1653
1489	($w + 1, $h) # add 1 for cursor	1654	($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	}	1655	}
1497		1656
1498	sub key_down {	1657	sub key_down {
1499	my ($self, $ev) = @_;	1658	my ($self, $ev) = @_;
1500		1659
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1674	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1675	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1676	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1677	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1678	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1679	$self->_emit ('escape');
1521	} elsif ($uni) {	1680	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1681	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1682	}
1524		1683
1525	$self->_set_text ($text);	1684	$self->_set_text ($text);
1526	$self->update;	1685	$self->update;
		1686	$self->check_size;
1527	}	1687	}
1528		1688
1529	sub focus_in {	1689	sub focus_in {
1530	my ($self) = @_;	1690	my ($self) = @_;
1531		1691
…		…
1611	if ($sym == 13) {	1771	if ($sym == 13) {
1612	unshift @{$self->{history}},	1772	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1773	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1774	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1775	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1776	$self->_emit (activate => $txt);
1617	$self->update;	1777	$self->update;
1618		1778
1619	} elsif ($sym == CFClient::SDLK_UP) {	1779	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1780	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1781	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1820	my $class = shift;
1661		1821
1662	$class->SUPER::new (	1822	$class->SUPER::new (
1663	padding => 4,	1823	padding => 4,
1664	fg => [1, 1, 1],	1824	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1825	active_fg => [0, 0, 1],
1667	can_hover => 1,	1826	can_hover => 1,
1668	align => 0,	1827	align => 0,
1669	valign => 0,	1828	valign => 0,
1670	can_events => 1,	1829	can_events => 1,
1671	@_	1830	@_
1672	)	1831	)
1673	}	1832	}
1674		1833
		1834	sub activate { }
		1835
1675	sub button_up {	1836	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1677		1838
		1839	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1840	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1841	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1842	}
1683		1843
1684	sub _draw {	1844	sub _draw {
1685	my ($self) = @_;	1845	my ($self) = @_;
1686		1846
…		…
1718		1878
1719	$class->SUPER::new (	1879	$class->SUPER::new (
1720	padding => 2,	1880	padding => 2,
1721	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1882	active_fg => [1, 1, 0],
		1883	bg => [0, 0, 0, 0.2],
		1884	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1885	state => 0,
1724	can_hover => 1,	1886	can_hover => 1,
1725	@_	1887	@_
1726	)	1888	)
1727	}	1889	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1898	my ($self, $ev, $x, $y) = @_;
1737		1899
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1902	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1903	$self->_emit (changed => $self->{state});
1742	}	1904	}
1743	}	1905	}
1744		1906
1745	sub _draw {	1907	sub _draw {
1746	my ($self) = @_;	1908	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2173	qw(s1_slider.png s1_slider_bg.png);
2012		2174
2013	sub new {	2175	sub new {
2014	my $class = shift;	2176	my $class = shift;
2015		2177
2016	# range [value, low, high, page]	2178	# range [value, low, high, page, unit]
2017		2179
2018	# TODO: 0-width page	2180	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2181	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2182	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2183	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2184	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2185	active_fg => [0, 0, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2188	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2189	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2190	req_h => $::WIDTH / 80,
2027	vertical => 0,	2191	vertical => 0,
2028	can_hover => 1,	2192	can_hover => 1,
2029	inner_pad => 5,	2193	inner_pad => 0.02,
2030	@_	2194	@_
2031	);	2195	);
2032		2196
		2197	$self->set_value ($self->{range}[0]);
		2198	$self->update;
		2199
2033	$self	2200	$self
		2201	}
		2202
		2203	sub set_range {
		2204	my ($self, $range) = @_;
		2205
		2206	($range, $self->{range}) = ($self->{range}, $range);
		2207
		2208	$self->update
		2209	if "@$range" ne "@{$self->{range}}";
		2210	}
		2211
		2212	sub set_value {
		2213	my ($self, $value) = @_;
		2214
		2215	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2216
		2217	$hi = $lo + 1 if $hi <= $lo;
		2218
		2219	$page = $hi - $lo if $page > $hi - $lo;
		2220
		2221	$value = $lo if $value < $lo;
		2222	$value = $hi - $page if $value > $hi - $page;
		2223
		2224	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2225	if $unit;
		2226
		2227	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2228
		2229	if ($value != $old_value) {
		2230	$self->_emit (changed => $value);
		2231	$self->update;
		2232	}
2034	}	2233	}
2035		2234
2036	sub size_request {	2235	sub size_request {
2037	my ($self) = @_;	2236	my ($self) = @_;
2038		2237
…		…
2044		2243
2045	sub button_down {	2244	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2047		2246
2048	$self->SUPER::button_down ($ev, $x, $y);	2247	$self->SUPER::button_down ($ev, $x, $y);
		2248
		2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2250
2049	$self->mouse_motion ($ev, $x, $y);	2251	$self->mouse_motion ($ev, $x, $y);
2050	}	2252	}
2051		2253
2052	sub mouse_motion {	2254	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2054		2256
2055	if ($GRAB == $self) {	2257	if ($GRAB == $self) {
		2258	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2259
		2260	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2261
		2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2263
		2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2265	}
		2266	}
		2267
		2268	sub update {
		2269	my ($self) = @_;
		2270
		2271	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2272	$self->set_value ($self->{range}[0]);
		2273
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2274	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2275	my $range = ($hi - $page - $lo) || 1e-100;
2057		2276
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2277	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2278
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2279	$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	2280	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2281
2063	$x -= $inner_pad_px; # substract the padding	2282	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2283	$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		2284
2069	$self->emit (changed => $x);	2285	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2286	$self->{knob_w} = $knob_w;
2071	}	2287	});
2072	}
2073		2288
2074	# the inner_* stuff is for generating a padding for the slider handle,	2289	$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	}	2290	}
2081		2291
2082	sub _draw {	2292	sub _draw {
2083	my ($self) = @_;	2293	my ($self) = @_;
2084		2294
2085	$self->SUPER::_draw ();	2295	$self->SUPER::_draw ();
2086		2296
2087	my ($w, $h) = @$self{qw(w h)};	2297	glScale $self->{w}, $self->{h};
2088		2298
2089	if ($self->{vertical}) {	2299	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2300	# draw a vertical slider like a rotated horizontal slider
2091		2301
		2302	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2303	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2304	}
2097		2305
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2306	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2307	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2308
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;	2309	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2311
2122	# draw background	2312	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2313	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2314
2125	# draw handle	2315	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2316	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2317
2128	glDisable GL_TEXTURE_2D;	2318	glDisable GL_TEXTURE_2D;
2129	}	2319	}
		2320
		2321	#############################################################################
		2322
		2323	package CFClient::UI::ValSlider;
		2324
		2325	our @ISA = CFClient::UI::HBox::;
		2326
		2327	sub new {
		2328	my ($class, %arg) = @_;
		2329
		2330	my $range = delete $arg{range};
		2331
		2332	my $self = $class->SUPER::new (
		2333	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2334	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2335	to_value => sub { shift },
		2336	from_value => sub { shift },
		2337	%arg,
		2338	);
		2339
		2340	$self->{slider}->connect (changed => sub {
		2341	my ($self, $value) = @_;
		2342	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2343	$self->{parent}->emit (changed => $value);
		2344	});
		2345
		2346	# $self->{entry}->connect (changed => sub {
		2347	# my ($self, $value) = @_;
		2348	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2349	# $self->{parent}->emit (changed => $value);
		2350	# });
		2351
		2352	$self->add ($self->{slider}, $self->{entry});
		2353
		2354	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2355
		2356	$self
		2357	}
		2358
		2359	sub set_range { shift->{slider}->set_range (@_) }
		2360	sub set_value { shift->{slider}->set_value (@_) }
2130		2361
2131	#############################################################################	2362	#############################################################################
2132		2363
2133	package CFClient::UI::TextView;	2364	package CFClient::UI::TextView;
2134		2365
…		…
2164		2395
2165	$self->{fontsize} = $fontsize;	2396	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2397	$self->reflow;
2167	}	2398	}
2168		2399
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 {	2400	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2401	my ($self, $w, $h) = @_;
2190		2402
2191	$self->SUPER::size_allocate ($w, $h);	2403	$self->SUPER::size_allocate ($w, $h);
2192		2404
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2407	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2408
2197	$self->reflow;	2409	$self->reflow;
2198	}	2410	}
2199		2411
		2412	sub text_size {
		2413	my ($self, $text, $indent) = @_;
		2414
		2415	my $layout = $self->{layout};
		2416
		2417	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2418	$layout->set_width ($self->{children}[0]{w} - $indent);
		2419	$layout->set_markup ($text);
		2420
		2421	$layout->size
		2422	}
		2423
		2424	sub reflow {
		2425	my ($self) = @_;
		2426
		2427	$self->{need_reflow}++;
		2428	$self->update;
		2429	}
		2430
		2431	sub set_offset {
		2432	my ($self, $offset) = @_;
		2433
		2434	# todo: base offset on lines or so, not on pixels
		2435	$self->{children}[1]->set_value ($offset);
		2436	}
		2437
		2438	sub clear {
		2439	my ($self) = @_;
		2440
		2441	$self->{par} = [];
		2442	$self->{height} = 0;
		2443	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2444	}
		2445
2200	sub add_paragraph {	2446	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2447	my ($self, $color, $text, $indent) = @_;
2202		2448
2203	#TODO: intelligently "reformat" paragraph	2449	for my $line (split /\n/, $text) {
2204		2450	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2451	$self->{height} += $h;
		2452	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2453	}
2208		2454
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2455	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2456	}
2214		2457
2215	sub update {	2458	sub update {
2216	my ($self) = @_;	2459	my ($self) = @_;
2217		2460
…		…
2220	return unless $self->{h} > 0;	2463	return unless $self->{h} > 0;
2221		2464
2222	delete $self->{texture};	2465	delete $self->{texture};
2223		2466
2224	$ROOT->on_post_alloc ($self, sub {	2467	$ROOT->on_post_alloc ($self, sub {
		2468	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2469
2225	if (delete $self->{need_reflow}) {	2470	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2471	my $height = 0;
2227		2472
2228	$height += $_->[0] = $self->text_height ($_->[2])	2473	my $layout = $self->{layout};
		2474
		2475	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2476
2229	for @{$self->{par}};	2477	for (@{$self->{par}}) {
		2478	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2479	$layout->set_width ($W - $_->[3]);
		2480	$layout->set_markup ($_->[4]);
		2481	my ($w, $h) = $layout->size;
		2482	$_->[0] = $w + $_->[3];
		2483	$_->[1] = $h;
		2484	}
		2485
		2486	$height += $_->[1];
		2487	}
2230		2488
2231	$self->{height} = $height;	2489	$self->{height} = $height;
2232		2490
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2491	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2492
2235	delete $self->{texture};	2493	delete $self->{texture};
2236	}	2494	}
2237		2495
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2496	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2497	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2498	glClear GL_COLOR_BUFFER_BIT;
2241		2499
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];	2500	my $top = int $self->{children}[1]{range}[0];
2246		2501
2247	my $y0 = $top;	2502	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2503	my $y1 = $top + $H;
2249		2504
2250	my $y = 0;	2505	my $y = 0;
2251		2506
2252	my $layout = $self->{layout};	2507	my $layout = $self->{layout};
2253		2508
2254	$layout->set_font ($self->{font}) if $self->{font};	2509	$layout->set_font ($self->{font}) if $self->{font};
2255		2510
		2511	glEnable GL_BLEND;
		2512	#TODO# not correct in windows where rgba is forced off
		2513	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2514
2256	for my $par (@{$self->{par}}) {	2515	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2516	my $h = $par->[1];
2258		2517
2259	if ($y0 < $y + $h && $y < $y1) {	2518	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2519	$layout->set_foreground (@{ $par->[2] });
		2520	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2521	$layout->set_markup ($par->[4]);
2262		2522
2263	my ($W, $H) = $layout->size;	2523	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2524
		2525	glRasterPos $par->[3], $y - $y0;
		2526	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2527	}
2266		2528
2267	$y += $h;	2529	$y += $h;
2268	}	2530	}
2269		2531
2270	glDisable GL_TEXTURE_2D;	2532	glDisable GL_BLEND;
2271	};	2533	};
2272	});	2534	});
2273	}	2535	}
2274		2536
2275	sub _draw {	2537	sub _draw {
2276	my ($self) = @_;	2538	my ($self) = @_;
2277		2539
2278	glEnable GL_TEXTURE_2D;	2540	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2542	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2543	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2544	glDisable GL_TEXTURE_2D;
2283		2545
2284	$self->{children}[1]->draw;	2546	$self->{children}[1]->draw;
2285		2547
2286	}	2548	}
…		…
2335		2597
2336	sub new {	2598	sub new {
2337	my $class = shift;	2599	my $class = shift;
2338		2600
2339	my $self = $class->SUPER::new (	2601	my $self = $class->SUPER::new (
2340	state => 0,	2602	state => 0,
2341	connect_activate => \&toggle_flopper,	2603	on_activate => \&toggle_flopper,
2342	@_	2604	@_
2343	);	2605	);
2344		2606
2345	if ($self->{state}) {
2346	$self->{state} = 0;
2347	$self->toggle_flopper;
2348	}
2349
2350	$self	2607	$self
2351	}	2608	}
2352		2609
2353	sub toggle_flopper {	2610	sub toggle_flopper {
2354	my ($self) = @_;	2611	my ($self) = @_;
2355		2612
2356	# TODO: use animation	2613	$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	}	2614	}
2368		2615
2369	#############################################################################	2616	#############################################################################
2370		2617
2371	package CFClient::UI::Tooltip;	2618	package CFClient::UI::Tooltip;
…		…
2385		2632
2386	sub set_tooltip_from {	2633	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2634	my ($self, $widget) = @_;
2388		2635
2389	$self->add (new CFClient::UI::Label	2636	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2637	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2639	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2640	fg => [0, 0, 0, 1],
		2641	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2642	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2643	);
2396	}	2644	}
2397		2645
2398	sub size_request {	2646	sub size_request {
2399	my ($self) = @_;	2647	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2693	use CFClient::OpenGL;
2446		2694
2447	sub new {	2695	sub new {
2448	my $class = shift;	2696	my $class = shift;
2449		2697
2450	$class->SUPER::new (	2698	my $self = $class->SUPER::new (
2451	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2452	@_,	2701	@_,
2453	)	2702	);
		2703
		2704	if ($self->{anim} && $self->{animspeed}) {
		2705	Scalar::Util::weaken (my $widget = $self);
		2706
		2707	$self->{timer} = Event->timer (
		2708	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2709	hard => 1,
		2710	interval => $self->{animspeed},
		2711	cb => sub {
		2712	++$widget->{frame};
		2713	$widget->update;
		2714	},
		2715	);
		2716	}
		2717
		2718	$self
2454	}	2719	}
2455		2720
2456	sub size_request {	2721	sub size_request {
2457	(32, 8)	2722	(32, 8)
2458	}	2723	}
2459		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
2460	sub _draw {	2733	sub _draw {
2461	my ($self) = @_;	2734	my ($self) = @_;
2462		2735
2463	return unless $::CONN;#d# manage and cache textures differently	2736	return unless $::CONN;
		2737
		2738	my $face;
		2739
		2740	if ($self->{frame}) {
		2741	my $anim = $::CONN->{anim}[$self->{anim}];
		2742
		2743	$face = $anim->[ $self->{frame} % @$anim ]
		2744	if $anim && @$anim;
		2745	}
		2746
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2748
2466	# TODO animation
2467	if ($tex) {	2749	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2752	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2473	}	2755	}
2474	}	2756	}
2475		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
		2765	}
		2766
2476	#############################################################################	2767	#############################################################################
2477		2768
2478	package CFClient::UI::InventoryItem;	2769	package CFClient::UI::Inventory;
2479		2770
2480	our @ISA = CFClient::UI::HBox::;	2771	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2772
2482	sub new {	2773	sub new {
2483	my $class = shift;	2774	my $class = shift;
2484		2775
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 (	2776	my $self = $class->SUPER::new (
2495	can_hover => 1,	2777	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	@_,	2778	@_,
2554	);	2779	);
2555		2780
2556	$self	2781	$self
2557	}	2782	}
…		…
2567	or ($a->{name} cmp $b->{name})	2792	or ($a->{name} cmp $b->{name})
2568	} @$items;	2793	} @$items;
2569		2794
2570	$self->{real_items} = \@items;	2795	$self->{real_items} = \@items;
2571		2796
		2797	my $row = 0;
2572	for my $item (@items) {	2798	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2799	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2800
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2804
2580	$self->{scrolled}->add (@items);	2805	$row++;
2581		2806	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2807	}
2584		2808
2585	sub size_request {	2809	sub size_request {
2586	my ($self) = @_;	2810	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});	2811	($self->{req_w}, $self->{req_h});
…		…
2627		2851
2628	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2853	sub popup {
2630	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2631		2855
2632	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2633		2857
2634	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2859	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2637		2861
…		…
2652		2876
2653	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2878	undef $GRAB;
2655	$self->hide;	2879	$self->hide;
2656		2880
2657	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2659	}	2883	}
2660	}	2884	}
2661		2885
2662	#############################################################################	2886	#############################################################################
2663		2887
2664	package CFClient::UI::Statusbox;	2888	package CFClient::UI::Statusbox;
2665		2889
2666	our @ISA = CFClient::UI::VBox::;	2890	our @ISA = CFClient::UI::VBox::;
		2891
		2892	sub new {
		2893	my $class = shift;
		2894
		2895	$class->SUPER::new (
		2896	fontsize => 0.8,
		2897	@_,
		2898	)
		2899	}
2667		2900
2668	sub reorder {	2901	sub reorder {
2669	my ($self) = @_;	2902	my ($self) = @_;
2670	my $NOW = time;	2903	my $NOW = time;
2671		2904
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2923	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2924	: $item->{text};
2692		2925
2693	for ($short) {	2926	for ($short) {
2694	s/^\s+//;	2927	s/^\s+//;
2695	s/\012.*/…/s;	2928	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2929	}
2699		2930
2700	new CFClient::UI::Label	2931	new CFClient::UI::Label
2701	markup => $short,	2932	markup => $short,
2702	tooltip => $item->{tooltip},	2933	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2934	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2935	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2936	fontsize => $item->{fontsize} || $self->{fontsize},
		2937	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2938	fg => $item->{fg},
2707	can_events => 1,	2939	can_events => 1,
2708	can_hover => 1	2940	can_hover => 1
2709	};	2941	};
2710	}	2942	}
2711		2943
…		…
2716	sub add {	2948	sub add {
2717	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2718		2950
2719	$text =~ s/^\s+//;	2951	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2721		2955
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2957
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2959
…		…
2737	$self->{item}{$group} = {	2971	$self->{item}{$group} = {
2738	id => ++$self->{id},	2972	id => ++$self->{id},
2739	text => $text,	2973	text => $text,
2740	timeout => $timeout,	2974	timeout => $timeout,
2741	tooltip => $text,	2975	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2976	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2977	pri => 0,
2745	count => 1,	2978	count => 1,
2746	%arg,	2979	%arg,
2747	};	2980	};
2748	}	2981	}
2749		2982
2750	$self->reorder;	2983	$self->reorder;
2751	}	2984	}
2752		2985
		2986	sub reconfigure {
		2987	my ($self) = @_;
		2988
		2989	delete $_->{label}
		2990	for values %{ $self->{item} || {} };
		2991
		2992	$self->reorder;
		2993	$self->SUPER::reconfigure;
		2994	}
		2995
2753	#############################################################################	2996	#############################################################################
2754		2997
2755	package CFClient::UI::Root;	2998	package CFClient::UI::Root;
2756		2999
2757	our @ISA = CFClient::UI::Container::;	3000	our @ISA = CFClient::UI::Container::;
…		…
2760		3003
2761	sub new {	3004	sub new {
2762	my $class = shift;	3005	my $class = shift;
2763		3006
2764	$class->SUPER::new (	3007	$class->SUPER::new (
		3008	visible => 1,
2765	@_,	3009	@_,
2766	)	3010	)
2767	}	3011	}
2768		3012
2769	sub configure {	3013	sub configure {
…		…
2787	}	3031	}
2788		3032
2789	sub size_allocate {	3033	sub size_allocate {
2790	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h) = @_;
2791		3035
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) {	3036	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3038
		3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3040	if exists $child->{req_x};
		3041
		3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3043	if exists $child->{req_y};
		3044
		3045	$X = $self->{user_x} if exists $self->{user_x};
		3046	$Y = $self->{user_y} if exists $self->{user_y};
		3047
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3048	$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;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3050
2803	$child->configure ($X, $Y, $W, $H);	3051	$child->configure ($X, $Y, $W, $H);
2804	}	3052	}
2805	}	3053	}
2806		3054
2807	sub coord2local {	3055	sub coord2local {
…		…
2824	}	3072	}
2825		3073
2826	sub add {	3074	sub add {
2827	my ($self, @children) = @_;	3075	my ($self, @children) = @_;
2828		3076
		3077	for (my @widgets = @children; my $w = pop @widgets; ) {
		3078	push @widgets, $w->children;
		3079	$w->{root} = $self;
		3080	$w->{visible} = $self->{visible} + 1;
		3081	}
		3082
2829	for my $child (@children) {	3083	for my $child (@children) {
2830	$child->{toplevel} = 1;	3084	$child->{is_toplevel} = 1;
2831		3085
2832	# integerise window positions	3086	# integerise window positions
2833	$child->{x} = int $child->{x};	3087	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3088	$child->{y} = int $child->{y};
2835	}	3089	}
2836		3090
2837	$self->SUPER::add (@children);	3091	$self->SUPER::add (@children);
2838	}	3092	}
2839		3093
		3094	sub remove {
		3095	my ($self, @children) = @_;
		3096
		3097	$self->SUPER::remove (@children);
		3098
		3099	while (@children) {
		3100	my $w = pop @children;
		3101	push @children, $w->children;
		3102	$w->set_invisible;
		3103	}
		3104	}
		3105
2840	sub on_refresh {	3106	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2842		3108
2843	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2844	}	3110	}
…		…
2856	$_->()	3122	$_->()
2857	for values %{delete $self->{refresh_hook}};	3123	for values %{delete $self->{refresh_hook}};
2858	}	3124	}
2859		3125
2860	if ($self->{check_size}) {	3126	if ($self->{check_size}) {
2861	my @queue = ([], []);	3127	my @queue;
2862		3128
2863	for (;;) {	3129	for (;;) {
2864	if ($self->{check_size}) {	3130	if ($self->{check_size}) {
2865	# heuristic: check containers last	3131	#TODO use array-of-depth approach
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3132
		3133	@queue = sort { $a->{visible} <=> $b->{visible} }
2867	for values %{delete $self->{check_size}}	3134	@queue, values %{delete $self->{check_size}};
2868	}	3135	}
2869		3136
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3137	my $widget = pop @queue || last;
		3138
		3139	defined $widget->{visible} or last; # do not resize invisible widgets
2871		3140
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2873	? @$widget{qw(user_w user_h)}	3142	? @$widget{qw(user_w user_h)}
2874	: $widget->size_request;	3143	: $widget->size_request;
2875		3144
…		…
2895	$w = 0 if $w < 0;	3164	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3165	$h = 0 if $h < 0;
2897		3166
2898	$widget->{w} = $w;	3167	$widget->{w} = $w;
2899	$widget->{h} = $h;	3168	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3169	$widget->emit (size_allocate => $w, $h);
2902	}	3170	}
2903	}	3171	}
2904		3172
2905	while ($self->{post_alloc_hook}) {	3173	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3180	glClear GL_COLOR_BUFFER_BIT;
2913		3181
2914	glMatrixMode GL_PROJECTION;	3182	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3183	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3185	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3186	glLoadIdentity;
2919		3187
2920	$self->_draw;	3188	$self->_draw;
2921	}	3189	}
…		…
2923	#############################################################################	3191	#############################################################################
2924		3192
2925	package CFClient::UI;	3193	package CFClient::UI;
2926		3194
2927	$ROOT = new CFClient::UI::Root;	3195	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3196	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3197
2930	1	3198	1
2931		3199

Diff Legend

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