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.247 by root, Sun May 28 01:16:04 2006 UTC

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

Diff Legend

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