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.185 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
8	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
9		11
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		13
		14	our $LAYOUT;
12	our $ROOT;	15	our $ROOT;
13	our $TOOLTIP;	16	our $TOOLTIP;
14	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
15		38
16	sub check_tooltip {	39	sub check_tooltip {
17	if (!$GRAB) {	40	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
23		46
24	my $tip = $widget->{tooltip};	47	my $tip = $widget->{tooltip};
25		48
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	49	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		50
28	$TOOLTIP->set_markup ($widget->{tooltip});	51	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	52	$TOOLTIP->show;
31		53
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		55
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
37		58
38	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
		60	$TOOLTIP->check_size;
		61	$TOOLTIP->update;
39	}	62	}
40		63
41	return;	64	return;
42	}	65	}
43	}	66	}
…		…
47	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
48	}	71	}
49		72
50	# class methods for events	73	# class methods for events
51	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	76	if $FOCUS;
54	}	77	}
55		78
56	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	81	if $FOCUS;
59	}	82	}
60		83
61	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	85	my ($ev) = @_;
…		…
71	check_tooltip;	94	check_tooltip;
72	}	95	}
73		96
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		98
76	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	101	}
81		102
82	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	104	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
85		106
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		108
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		110
90	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		113
95	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	116	$grab->update if $grab;
98	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		134
116	check_tooltip;	135	check_tooltip;
117	}	136	}
118		137
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	139	if $HOVER;
123	}	140	}
124		141
125	# convert position array to integers	142	# convert position array to integers
126	sub harmonize {	143	sub harmonize {
127	my ($vals) = @_;	144	my ($vals) = @_;
…		…
131	for (@$vals) {	148	for (@$vals) {
132	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
133	$rem += $_ - $i;	150	$rem += $_ - $i;
134	$_ = $i;	151	$_ = $i;
135	}	152	}
		153	}
		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		183	}
		184	}
		185
		186	reconfigure_widgets;
136	}	187	}
137		188
138	#############################################################################	189	#############################################################################
139		190
140	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
153	can_events => 1,	204	can_events => 1,
154	@_	205	@_
155	}, $class;	206	}, $class;
156		207
157	for (keys %$self) {	208	for (keys %$self) {
158	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
160	}	211	}
161	}	212	}
162		213
		214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		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
163	$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	}
164	}	234	}
165		235
166	sub destroy {	236	sub destroy {
167	my ($self) = @_;	237	my ($self) = @_;
168		238
…		…
170	%$self = ();	240	%$self = ();
171	}	241	}
172		242
173	sub show {	243	sub show {
174	my ($self) = @_;	244	my ($self) = @_;
175
176	return if $self->{parent};	245	return if $self->{parent};
177		246
178	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
179	}	248	}
180		249
181	sub hide {	250	sub show_centered {
182	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1)
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
183		283
184	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
186		299
187	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
188	if $self->{parent};	301	if $self->{parent};
189	}	302	}
190		303
…		…
199	}	312	}
200		313
201	sub set_size {	314	sub set_size {
202	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
203		316
204	$self->{user_w} = $w;	317	$self->{def_w} = $w;
205	$self->{user_h} = $h;	318	$self->{def_h} = $h;
206		319
207	$self->check_size;	320	$self->check_size;
208	}	321	}
209		322
210	sub size_request {	323	sub size_request {
…		…
232	$self->{y} = $y;	345	$self->{y} = $y;
233	$self->update;	346	$self->update;
234	}	347	}
235		348
236	if ($self->{w} != $w || $self->{h} != $h) {	349	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	350	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	351	}
244	}	352	}
245		353
246	sub size_allocate {	354	sub size_allocate {
247	# nothing to be done	355	# nothing to be done
248	}	356	}
249		357
		358	sub reconfigure {
		359	my ($self) = @_;
		360
		361	$self->check_size (1);
		362	$self->update;
		363	}
		364
250	sub children {	365	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}	366	}
262		367
263	sub set_max_size {	368	sub set_max_size {
264	my ($self, $w, $h) = @_;	369	my ($self, $w, $h) = @_;
265		370
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}	373	}
269		374
270	# return top left coordinates	375	sub set_tooltip {
271	sub _topleft {
272	my ($self, $x, $y) = @_;	376	my ($self, $tooltip) = @_;
273		377
274	$self->{parent}	378	$tooltip =~ s/^\s+//;
275	or Carp::confess "no parent widget in _topleft\n";#d#	379	$tooltip =~ s/\s+$//;
276		380
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	381	return if $self->{tooltip} eq $tooltip;
		382
		383	$self->{tooltip} = $tooltip;
		384
		385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		386	delete $CFClient::UI::TOOLTIP->{owner};
		387	CFClient::UI::check_tooltip;
		388	}
278	}	389	}
279		390
280	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
281	sub coord2local {	392	sub coord2local {
282	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
283		394
284	my ($X, $Y) = $self->_topleft;	395	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	396	}
287		397
288	# translate local coordinates to global coordinate system	398	# translate local coordinates to global coordinate system
289	sub coord2global {	399	sub coord2global {
290	my ($self, $x, $y) = @_;	400	my ($self, $x, $y) = @_;
291		401
292	my ($X, $Y) = $self->_topleft;	402	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	403	}
295		404
296	sub focus_in {	405	sub focus_in {
297	my ($self) = @_;	406	my ($self) = @_;
298		407
299	return if $FOCUS == $self;	408	return if $FOCUS == $self;
300	return unless $self->{can_focus};	409	return unless $self->{can_focus};
301		410
302	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
303		412
304	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
305		414
306	$focus->update if $focus;	415	$focus->update if $focus;
307	$FOCUS->update;	416	$FOCUS->update;
308	}	417	}
309		418
…		…
312		421
313	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
314		423
315	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
316		425
317	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
318		427
319	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
320	}	432	}
321		433
322	sub mouse_motion { }	434	sub mouse_motion { }
323	sub button_up { }	435	sub button_up { }
324	sub key_down { }	436	sub key_down { }
325	sub key_up { }	437	sub key_up { }
326		438
327	sub button_down {	439	sub button_down {
328	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
329		441
330	$self->focus_in;	442	$self->focus_in;
…		…
364	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
365	glPushMatrix;	477	glPushMatrix;
366	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
367	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
369	glVertex 0 , 0;	481	glVertex 0 , 0;
370	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
371	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
372	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
373	glEnd;	485	glEnd;
374	glPopMatrix;	486	glPopMatrix;
375	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376	}	488	}
377	}	489	}
378		490
379	sub _draw {	491	sub _draw {
380	my ($self) = @_;	492	my ($self) = @_;
…		…
396		508
397	sub set_parent {	509	sub set_parent {
398	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
399		511
400	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
		513
		514	$self->set_visible;
		515
		516	$self->check_size;
		517	$self->show;
401	}	518	}
402		519
403	sub check_size {	520	sub check_size {
404	my ($self) = @_;	521	my ($self, $forced) = @_;
405		522
406	$self->{parent}	523	$self->{force_alloc} = 1 if $forced;
407	or return 1;	524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} || $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}	525	}
428		526
429	sub update {	527	sub update {
430	my ($self) = @_;	528	my ($self) = @_;
431		529
…		…
437	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
438		536
439	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
440	}	538	}
441		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
442	sub emit {	546	sub emit {
443	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
444		548
445	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) = @_;
446	}	555	}
447		556
448	sub DESTROY {	557	sub DESTROY {
449	my ($self) = @_;	558	my ($self) = @_;
450		559
		560	delete $WIDGET{$self+0};
451	#$self->deactivate;	561	#$self->deactivate;
452	}	562	}
453		563
454	#############################################################################	564	#############################################################################
455		565
…		…
464	my $class = shift;	574	my $class = shift;
465		575
466	# range [value, low, high, page]	576	# range [value, low, high, page]
467		577
468	$class->SUPER::new (	578	$class->SUPER::new (
469	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
470	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
471	@_	581	@_
472	)	582	)
473	}	583	}
474		584
475	sub _draw {	585	sub _draw {
476	my ($self) = @_;	586	my ($self) = @_;
477		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
478	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
479		594
480	glEnable GL_BLEND;	595	glEnable GL_BLEND;
481	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
483		598
484	glBegin GL_QUADS;	599	glBegin GL_QUADS;
485	glVertex 0 , 0;	600	glVertex 0 , 0;
486	glVertex 0 , $h;	601	glVertex 0 , $h;
487	glVertex $w, $h;	602	glVertex $w, $h;
488	glVertex $w, 0;	603	glVertex $w, 0;
489	glEnd;	604	glEnd;
490		605
491	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
492	}	608	}
493		609
494	#############################################################################	610	#############################################################################
495		611
496	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
528		644
529	$self	645	$self
530	}	646	}
531		647
532	sub add {	648	sub add {
533	my ($self, $child) = @_;	649	my ($self, @widgets) = @_;
534		650
535	$child->set_parent ($self);	651	$_->set_parent ($self)
		652	for @widgets;
536		653
537	use sort 'stable';	654	use sort 'stable';
538		655
539	$self->{children} = [	656	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	657	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	658	@{$self->{children}}, @widgets
542	];	659	];
543		660
544	$child->check_size;	661	$self->check_size (1);
545	$self->update;	662	$self->update;
546	}	663	}
547		664
548	sub children {	665	sub children {
549	@{ $_[0]{children} }	666	@{ $_[0]{children} }
…		…
555	delete $child->{parent};	672	delete $child->{parent};
556	$child->hide;	673	$child->hide;
557		674
558	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559		676
560	$self->check_size;	677	$self->check_size (1);
561	$self->update;	678	$self->update;
562	}	679	}
563		680
564	sub clear {	681	sub clear {
565	my ($self) = @_;	682	my ($self) = @_;
…		…
656	}	773	}
657		774
658	sub update {	775	sub update {
659	my ($self) = @_;	776	my ($self) = @_;
660		777
661	$ROOT->on_refresh ($self => sub { $self->render_child });	778	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	779	$self->SUPER::update;
663	}	780	}
664		781
665	sub size_allocate {	782	sub size_allocate {
666	my ($self, $w, $h) = @_;	783	my ($self, $w, $h) = @_;
…		…
679	$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 {
680	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
681	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
682		799
683	$self->_render;	800	$self->_render;
684	# glColorMask 1, 1, 1, 0;
685	# glEnable GL_BLEND;
686	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687	# glRasterPos 0, 0;
688	# glCopyPixels 0, 0, $self->{w}, $self->{h};
689	# glDisable GL_BLEND;
690	# glColorMask 1, 1, 1, 1;
691	};	801	};
692	}	802	}
693		803
694	sub _draw {	804	sub _draw {
695	my ($self) = @_;	805	my ($self) = @_;
…		…
697	my ($w, $h) = ($self->w, $self->h);	807	my ($w, $h) = ($self->w, $self->h);
698		808
699	my $tex = $self->{texture}	809	my $tex = $self->{texture}
700	or return;	810	or return;
701		811
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
707		815
708	$tex->draw_quad (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		817
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
712	}	819	}
713		820
714	#############################################################################	821	#############################################################################
715		822
716	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
717		824
718	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
719		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
720	sub size_request {	837	sub size_request {
721	my ($self) = @_;	838	my ($self) = @_;
722		839
723	@$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)};
724	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
725		841
726	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
727	}	843	}
728		844
729	sub size_allocate {	845	sub size_allocate {
730	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
731		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);
732	$self->update;	852	$self->update;
733	}	853	}
734		854
735	sub set_offset {	855	sub set_offset {
736	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
739	$self->{view_y} = int $y;	859	$self->{view_y} = int $y;
740		860
741	$self->update;	861	$self->update;
742	}	862	}
743		863
744	# hmm, this does not work for topleft of $self... but we should not aks for that	864	# hmm, this does not work for topleft of $self... but we should not ask for that
745	sub _topleft {	865	sub coord2local {
746	my ($self, $x, $y) = @_;	866	my ($self, $x, $y) = @_;
747		867
748	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	868	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		869	}
		870
		871	sub coord2global {
		872	my ($self, $x, $y) = @_;
		873
		874	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		875	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		876
		877	$self->SUPER::coord2global ($x, $y)
749	}	878	}
750		879
751	sub find_widget {	880	sub find_widget {
752	my ($self, $x, $y) = @_;	881	my ($self, $x, $y) = @_;
753		882
…		…
778	my $class = shift;	907	my $class = shift;
779		908
780	my $self;	909	my $self;
781		910
782	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
783	vertical => 1,	912	vertical => 1,
784	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
785	connect_changed => sub {	914	on_changed => sub {
786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
787	},	916	},
788	;	917	;
789		918
790	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
791	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
792	slider => $slider,	921	slider => $slider,
793	@_,	922	@_,
794	);	923	);
795		924
796	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
…		…
798	$self->add ($self->{slider});	927	$self->add ($self->{slider});
799		928
800	$self	929	$self
801	}	930	}
802		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]);
		949	}
		950
803	#TODO# update range on size_allocate depeneing on child	951	#TODO# update range on size_allocate depending on child
804	# update viewport offset on scroll	952	# update viewport offset on scroll
805		953
806	#############################################################################	954	#############################################################################
807		955
808	package CFClient::UI::Frame;	956	package CFClient::UI::Frame;
…		…
812	use CFClient::OpenGL;	960	use CFClient::OpenGL;
813		961
814	sub new {	962	sub new {
815	my $class = shift;	963	my $class = shift;
816		964
817	my $self = $class->SUPER::new (	965	$class->SUPER::new (
818	bg => [1, 1, 1, 1],	966	bg => undef,
819	border_bg => [1, 1, 1, 1],
820	border => 0.8,
821	@_	967	@_,
822	);	968	)
823
824	$self
825	}	969	}
826		970
827	sub _draw {	971	sub _draw {
828	my ($self) = @_;	972	my ($self) = @_;
829		973
830	my ($w, $h) = ($self->{w}, $self->{h});	974	if ($self->{bg}) {
		975	my ($w, $h) = @$self{qw(w h)};
831		976
832	glEnable GL_BLEND;	977	glEnable GL_BLEND;
833	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	978	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834	glEnable GL_TEXTURE_2D;	979	glColor @{ $self->{bg} };
835	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836		980
837	# glBegin GL_QUADS;	981	glBegin GL_QUADS;
838	# glColor 0, 0, 0, 0;
839	# glVertex 0 , 0;	982	glVertex 0 , 0;
840	# glVertex 0 , $h;	983	glVertex 0 , $h;
841	# glVertex $w, $h;	984	glVertex $w, $h;
842	# glVertex $w, 0;	985	glVertex $w, 0;
843	# glEnd;	986	glEnd;
844		987
845
846	$self->child->draw;
847	glDisable GL_BLEND;	988	glDisable GL_BLEND;
848	glDisable GL_TEXTURE_2D;	989	}
		990
		991	$self->SUPER::_draw;
849	}	992	}
850		993
851	#############################################################################	994	#############################################################################
852		995
853	package CFClient::UI::FancyFrame;	996	package CFClient::UI::FancyFrame;
…		…
861	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
862		1005
863	sub new {	1006	sub new {
864	my $class = shift;	1007	my $class = shift;
865		1008
866	# TODO: user_x, user_y, overwrite moveto?
867
868	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
869	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
870	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
871	border => 0.6,	1012	border => 0.6,
		1013	is_toplevel => 1,
872	can_events => 1,	1014	can_events => 1,
873	@_	1015	@_
874	);	1016	);
875		1017
876	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
877	align => 0,	1019	align => 0,
…		…
901	my ($self, $w, $h) = @_;	1043	my ($self, $w, $h) = @_;
902		1044
903	$h -= List::Util::max 0, $self->border * 2;	1045	$h -= List::Util::max 0, $self->border * 2;
904	$w -= List::Util::max 0, $self->border * 2;	1046	$w -= List::Util::max 0, $self->border * 2;
905		1047
906	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
907	if $self->{title};	1049	if $self->{title};
908		1050
909	$self->child->configure ($self->border, $self->border, $w, $h);	1051	$self->child->configure ($self->border, $self->border, $w, $h);
910	}	1052	}
911		1053
…		…
930	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
931		1073
932	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
933	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
934		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
935	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
936	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
937	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
938	$self->check_size;	1082	$self->check_size;
939	};	1083	};
940		1084
941	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
942	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
945	$self->{motion} = sub {	1089	$self->{motion} = sub {
946	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
947		1091
948	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
949		1093
950	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
951	$self->update;	1098	$self->update;
952	};	1099	};
953	}	1100	}
954	}	1101	}
955		1102
…		…
969	my ($self) = @_;	1116	my ($self) = @_;
970		1117
971	my ($w, $h ) = ($self->{w}, $self->{h});	1118	my ($w, $h ) = ($self->{w}, $self->{h});
972	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1119	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973		1120
974	glEnable GL_BLEND;
975	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976	glEnable GL_TEXTURE_2D;	1121	glEnable GL_TEXTURE_2D;
977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978		1123
979	my $border = $self->border;	1124	my $border = $self->border;
980		1125
981	glColor @{ $self->{border_bg} };	1126	glColor @{ $self->{border_bg} };
982	$tex[1]->draw_quad (0, 0, $w, $border);	1127	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
983	$tex[3]->draw_quad (0, $border, $border, $ch);	1128	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
984	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1129	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1130	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
986		1131
987	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1132	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988	my $bg = $tex[0];	1133	my $bg = $tex[0];
989		1134
990	# TODO: repeat texture not scale	1135	# TODO: repeat texture not scale
…		…
994	glColor @{ $self->{bg} };	1139	glColor @{ $self->{bg} };
995		1140
996	$bg->{s} = $rep_x;	1141	$bg->{s} = $rep_x;
997	$bg->{t} = $rep_y;	1142	$bg->{t} = $rep_y;
998	$bg->{wrap_mode} = 1;	1143	$bg->{wrap_mode} = 1;
999	$bg->draw_quad ($border, $border, $cw, $ch);	1144	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1145	}
1000		1146
1001	glDisable GL_TEXTURE_2D;	1147	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;
1003	}
1004		1148
1005	$self->{title}->draw if $self->{title};	1149	$self->{title}->draw if $self->{title};
1006		1150
1007	$self->child->draw;	1151	$self->child->draw;
1008	}	1152	}
…		…
1020	sub new {	1164	sub new {
1021	my $class = shift;	1165	my $class = shift;
1022		1166
1023	$class->SUPER::new (	1167	$class->SUPER::new (
1024	col_expand => [],	1168	col_expand => [],
1025	@_	1169	@_,
1026	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1027	}	1175	}
1028		1176
1029	sub add {	1177	sub add {
1030	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1031		1179
1032	$child->set_parent ($self);	1180	$child->set_parent ($self);
1033	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1034		1182
1035	$child->check_size;	1183	$self->check_size (1);
1036	}	1184	}
1037		1185
1038	sub children {
1039	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}
1041
1042	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
1043	sub clear {	1187	sub clear {
1044	my ($self) = @_;	1188	my ($self) = @_;
1045		1189
1046	my @children = $self->children;	1190	my @children = $self->children;
1047	delete $self->{children};	1191	delete $self->{children};
…		…
1049	for (@children) {	1193	for (@children) {
1050	delete $_->{parent};	1194	delete $_->{parent};
1051	$_->hide;	1195	$_->hide;
1052	}	1196	}
1053		1197
		1198	$self->check_size (1);
1054	$self->update;	1199	$self->update;
1055	}	1200	}
1056		1201
1057	sub get_wh {	1202	sub get_wh {
1058	my ($self) = @_;	1203	my ($self) = @_;
…		…
1090	sub size_allocate {	1235	sub size_allocate {
1091	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1092		1237
1093	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1094		1239
1095	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1096	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1097		1242
1098	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1099	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1100	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1101	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1155	}	1300	}
1156	}	1301	}
1157		1302
1158	#############################################################################	1303	#############################################################################
1159		1304
1160	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1161
1162	# TODO: wrap into common Box base class
1163		1306
1164	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1165		1308
1166	sub size_request {	1309	sub size_request {
1167	my ($self) = @_;	1310	my ($self) = @_;
1168		1311
1169	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1170		1313	? (
1171	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1172	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1173	(List::Util::max map $_->[1], @alloc),	1316	)
1174	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1175	}	1321	}
1176		1322
1177	sub size_allocate {	1323	sub size_allocate {
1178	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1179		1325
1180	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1181
1182	my $children = $self->{children};	1327	my $children = $self->{children};
1183		1328
1184	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1185
1186	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1187		1331
1188	if ($req_h > $h) {	1332	if ($req > $space) {
1189	# ah well, not enough space	1333	# ah well, not enough space
1190	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1191	} else {	1335	} else {
1192	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1193	$exp ||= 1;
1194		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1195	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1196	my $child = $children->[$_];
1197
1198	my $alloc_h = $h[$_];
1199	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1200	$h[$_] = $alloc_h;
1201	}
1202	}	1340	}
1203		1341
1204	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1205		1343
1206	my $y = 0;	1344	my $pos = 0;
1207	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1208	my $child = $children->[$_];
1209	my $h = $h[$_];	1346	my $alloc = $req[$_];
1210	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1211		1348
1212	$y += $h;	1349	$pos += $alloc;
1213	}	1350	}
1214		1351
1215	1	1352	1
1216	}	1353	}
1217		1354
1218	#############################################################################	1355	#############################################################################
1219		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1220	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1221		1373
1222	# TODO: wrap into common Box base class
1223
1224	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1225		1375
1226	sub size_request {	1376	sub new {
1227	my ($self) = @_;	1377	my $class = shift;
1228		1378
1229	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1230		1380	vertical => 1,
1231	(	1381	@_,
1232	(List::Util::max map $_->[0], @alloc),
1233	(List::Util::sum map $_->[1], @alloc),
1234	)	1382	)
1235	}	1383	}
1236		1384
1237	sub size_allocate {
1238	my ($self, $w, $h) = @_;
1239
1240	my $children = $self->{children};
1241
1242	my @h = map $_->{req_h}, @$children;
1243
1244	my $req_h = List::Util::sum @h;
1245
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;
1251	$exp ||= 1;
1252
1253	for (0 .. $#$children) {
1254	my $child = $children->[$_];
1255
1256	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1257	}
1258	}
1259
1260	CFClient::UI::harmonize \@h;
1261
1262	my $y = 0;
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265	my $h = $h[$_];
1266	$child->configure (0, $y, $w, $h);
1267
1268	$y += $h;
1269	}
1270
1271	1
1272	}
1273
1274	#############################################################################	1385	#############################################################################
1275		1386
1276	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
1277		1388
1278	our @ISA = CFClient::UI::Base::;	1389	our @ISA = CFClient::UI::DrawBG::;
1279		1390
1280	use CFClient::OpenGL;	1391	use CFClient::OpenGL;
1281		1392
1282	sub new {	1393	sub new {
1283	my ($class, %arg) = @_;	1394	my ($class, %arg) = @_;
1284		1395
1285	my $self = $class->SUPER::new (	1396	my $self = $class->SUPER::new (
1286	fg => [1, 1, 1],	1397	fg => [1, 1, 1],
		1398	#bg => none
		1399	#active_bg => none
1287	#font => default_font	1400	#font => default_font
		1401	#text => initial text
		1402	#markup => initial narkup
		1403	#max_w => maximum pixel width
		1404	ellipsise => 3, # end
		1405	layout => (new CFClient::Layout),
1288	fontsize => 1,	1406	fontsize => 1,
1289	text => "",
1290	align => -1,	1407	align => -1,
1291	valign => -1,	1408	valign => -1,
1292	padding => 2,	1409	padding => 2,
1293	layout => new CFClient::Layout,
1294	can_events => 0,	1410	can_events => 0,
1295	%arg	1411	%arg
1296	);	1412	);
1297		1413
1298	if (exists $self->{template}) {	1414	if (exists $self->{template}) {
1299	my $layout = new CFClient::Layout;	1415	my $layout = new CFClient::Layout;
1300	$layout->set_text (delete $self->{template});	1416	$layout->set_text (delete $self->{template});
1301	$self->{template} = $layout;	1417	$self->{template} = $layout;
1302	}	1418	}
1303		1419
1304	$self->set_text (delete $self->{text}) if exists $self->{text};	1420	if (exists $self->{markup}) {
1305	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1421	$self->set_markup (delete $self->{markup});
		1422	} else {
		1423	$self->set_text (delete $self->{text});
		1424	}
1306		1425
1307	$self	1426	$self
1308	}	1427	}
1309		1428
1310	sub escape {	1429	sub escape($) {
1311	local $_ = $_[1];	1430	local $_ = $_[0];
1312		1431
1313	s/&/&amp;/g;	1432	s/&/&amp;/g;
1314	s/>/&gt;/g;	1433	s/>/&gt;/g;
1315	s/</&lt;/g;	1434	s/</&lt;/g;
1316		1435
1317	$_[1]	1436	$_
1318	}	1437	}
1319		1438
1320	sub update {	1439	sub update {
1321	my ($self) = @_;	1440	my ($self) = @_;
1322		1441
1323	delete $self->{texture};	1442	delete $self->{texture};
1324	$self->SUPER::update;	1443	$self->SUPER::update;
1325	}	1444	}
1326		1445
1327	sub reconfigure {
1328	my ($self) = @_;
1329
1330	delete $self->{texture};
1331	}
1332
1333	sub set_text {	1446	sub set_text {
1334	my ($self, $text) = @_;	1447	my ($self, $text) = @_;
1335		1448
1336	return if $self->{text} eq "T$text";	1449	return if $self->{text} eq "T$text";
1337	$self->{text} = "T$text";	1450	$self->{text} = "T$text";
1338		1451
		1452	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339	$self->{layout}->set_text ($text);	1453	$self->{layout}->set_text ($text);
1340		1454
1341	delete $self->{texture};
1342	$self->update;	1455	$self->update;
1343	$self->check_size;	1456	$self->check_size;
1344	}	1457	}
1345		1458
1346	sub set_markup {	1459	sub set_markup {
1347	my ($self, $markup) = @_;	1460	my ($self, $markup) = @_;
1348		1461
1349	return if $self->{text} eq "M$markup";	1462	return if $self->{text} eq "M$markup";
1350	$self->{text} = "M$markup";	1463	$self->{text} = "M$markup";
1351		1464
		1465	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1466
		1467	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352	$self->{layout}->set_markup ($markup);	1468	$self->{layout}->set_markup ($markup);
1353		1469
1354	delete $self->{texture};
1355	$self->update;	1470	$self->update;
1356	$self->check_size;	1471	$self->check_size;
1357	}	1472	}
1358		1473
1359	sub size_request {	1474	sub size_request {
1360	my ($self) = @_;	1475	my ($self) = @_;
1361		1476
1362	$self->{layout}->set_font ($self->{font}) if $self->{font};	1477	$self->{layout}->set_font ($self->{font}) if $self->{font};
1363	$self->{layout}->set_width ($self->{max_w} || -1);	1478	$self->{layout}->set_width ($self->{max_w} || -1);
		1479	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1480	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1364	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365		1482
1366	my ($w, $h) = $self->{layout}->size;	1483	my ($w, $h) = $self->{layout}->size;
1367		1484
1368	if (exists $self->{template}) {	1485	if (exists $self->{template}) {
…		…
1390	sub set_fontsize {	1507	sub set_fontsize {
1391	my ($self, $fontsize) = @_;	1508	my ($self, $fontsize) = @_;
1392		1509
1393	$self->{fontsize} = $fontsize;	1510	$self->{fontsize} = $fontsize;
1394	delete $self->{texture};	1511	delete $self->{texture};
		1512
		1513	$self->update;
1395	$self->check_size;	1514	$self->check_size;
1396	$self->update;
1397	}	1515	}
1398		1516
1399	sub _draw {	1517	sub _draw {
1400	my ($self) = @_;	1518	my ($self) = @_;
1401		1519
		1520	$self->SUPER::_draw; # draw background, if applicable
		1521
1402	my $tex = $self->{texture} ||= do {	1522	my $tex = $self->{texture} ||= do {
		1523	$self->{layout}->set_foreground (@{$self->{fg}});
1403	$self->{layout}->set_font ($self->{font}) if $self->{font};	1524	$self->{layout}->set_font ($self->{font}) if $self->{font};
1404	$self->{layout}->set_width ($self->{w});	1525	$self->{layout}->set_width ($self->{w});
		1526	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1529
1406	new_from_layout CFClient::Texture $self->{layout}	1530	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1531
		1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1534	: ($self->{w} - $tex->{w}) * 0.5);
		1535
		1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1538	: ($self->{h} - $tex->{h}) * 0.5);
		1539
		1540	$tex
1407	};	1541	};
1408		1542
1409	glEnable GL_BLEND;
1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411	glEnable GL_TEXTURE_2D;	1543	glEnable GL_TEXTURE_2D;
1412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413		1545
		1546	if ($tex->{format} == GL_ALPHA) {
1414	glColor @{$self->{fg}};	1547	glColor @{$self->{fg}};
1415
1416	$self->{ox} = int (
1417	$self->{align} < 0 ? $self->{padding}
1418	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419	: ($self->{w} - $tex->{w}) * 0.5
1420	);
1421
1422	$self->{oy} = int (
1423	$self->{valign} < 0 ? $self->{padding}
1424	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425	: ($self->{h} - $tex->{h}) * 0.5
1426	);
1427
1428	$tex->draw_quad ($self->{ox}, $self->{oy});	1548	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1549	} else {
		1550	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1551	}
1429		1552
1430	glDisable GL_TEXTURE_2D;	1553	glDisable GL_TEXTURE_2D;
1431	glDisable GL_BLEND;
1432	}	1554	}
1433		1555
1434	#############################################################################	1556	#############################################################################
1435		1557
1436	package CFClient::UI::EntryBase;	1558	package CFClient::UI::EntryBase;
…		…
1449	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1450	can_hover => 1,	1572	can_hover => 1,
1451	can_focus => 1,	1573	can_focus => 1,
1452	valign => 0,	1574	valign => 0,
1453	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1454	@_	1577	@_
1455	)	1578	)
1456	}	1579	}
1457		1580
1458	sub _set_text {	1581	sub _set_text {
…		…
1468	$self->{text} = $text;	1591	$self->{text} = $text;
1469		1592
1470	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1471	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1472		1595
1473	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1474	}
1475
1476	sub get_text {
1477	$_[0]{text}
1478	}
1479
1480	sub size_request {
1481	my ($self) = @_;
1482
1483	my ($w, $h) = $self->SUPER::size_request;
1484
1485	($w + 1, $h) # add 1 for cursor
1486	}
1487
1488	sub size_allocate {
1489	my ($self, $w, $h) = @_;
1490
1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492	}	1597	}
1493		1598
1494	sub set_text {	1599	sub set_text {
1495	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1496		1601
1497	$self->{cursor} = length $text;	1602	$self->{cursor} = length $text;
1498	$self->_set_text ($text);	1603	$self->_set_text ($text);
1499	$self->update;	1604	$self->update;
		1605	$self->check_size;
		1606	}
		1607
		1608	sub get_text {
		1609	$_[0]{text}
		1610	}
		1611
		1612	sub size_request {
		1613	my ($self) = @_;
		1614
		1615	my ($w, $h) = $self->SUPER::size_request;
		1616
		1617	($w + 1, $h) # add 1 for cursor
1500	}	1618	}
1501		1619
1502	sub key_down {	1620	sub key_down {
1503	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1504		1622
…		…
1506	my $sym = $ev->{sym};	1624	my $sym = $ev->{sym};
1507	my $uni = $ev->{unicode};	1625	my $uni = $ev->{unicode};
1508		1626
1509	my $text = $self->get_text;	1627	my $text = $self->get_text;
1510		1628
1511	if ($sym == 8) {	1629	if ($uni == 8) {
1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1630	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513	} elsif ($sym == 127) {	1631	} elsif ($uni == 127) {
1514	substr $text, $self->{cursor}, 1, "";	1632	substr $text, $self->{cursor}, 1, "";
1515	} elsif ($sym == CFClient::SDLK_LEFT) {	1633	} elsif ($sym == CFClient::SDLK_LEFT) {
1516	--$self->{cursor} if $self->{cursor};	1634	--$self->{cursor} if $self->{cursor};
1517	} elsif ($sym == CFClient::SDLK_RIGHT) {	1635	} elsif ($sym == CFClient::SDLK_RIGHT) {
1518	++$self->{cursor} if $self->{cursor} < length $self->{text};	1636	++$self->{cursor} if $self->{cursor} < length $self->{text};
1519	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1520	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1521	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1522	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1523	} elsif ($sym == 27) {	1641	} elsif ($uni == 27) {
1524	$self->emit ('escape');	1642	$self->_emit ('escape');
1525	} elsif ($uni) {	1643	} elsif ($uni) {
1526	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1527	}	1645	}
1528		1646
1529	$self->_set_text ($text);	1647	$self->_set_text ($text);
1530	$self->update;	1648	$self->update;
		1649	$self->check_size;
1531	}	1650	}
1532		1651
1533	sub focus_in {	1652	sub focus_in {
1534	my ($self) = @_;	1653	my ($self) = @_;
1535		1654
…		…
1615	if ($sym == 13) {	1734	if ($sym == 13) {
1616	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1617	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1618	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1619	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1620	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1621	$self->update;	1740	$self->update;
1622		1741
1623	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1624	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1625	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1664	my $class = shift;	1783	my $class = shift;
1665		1784
1666	$class->SUPER::new (	1785	$class->SUPER::new (
1667	padding => 4,	1786	padding => 4,
1668	fg => [1, 1, 1],	1787	fg => [1, 1, 1],
1669	bg => [1, 1, 1, 0.2],
1670	active_fg => [0, 0, 1],	1788	active_fg => [0, 0, 1],
1671	can_hover => 1,	1789	can_hover => 1,
1672	align => 0,	1790	align => 0,
1673	valign => 0,	1791	valign => 0,
1674	can_events => 1,	1792	can_events => 1,
1675	@_	1793	@_
1676	)	1794	)
1677	}	1795	}
1678		1796
		1797	sub activate { }
		1798
1679	sub button_up {	1799	sub button_up {
1680	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1681		1801
		1802	$self->emit ("activate")
1682	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1683	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1684	$self->emit ("activate");
1685	}
1686	}	1805	}
1687		1806
1688	sub _draw {	1807	sub _draw {
1689	my ($self) = @_;	1808	my ($self) = @_;
1690		1809
…		…
1692		1811
1693	if ($GRAB == $self) {	1812	if ($GRAB == $self) {
1694	$self->{fg} = $self->{active_fg};	1813	$self->{fg} = $self->{active_fg};
1695	}	1814	}
1696		1815
1697	glEnable GL_BLEND;
1698	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699	glEnable GL_TEXTURE_2D;	1816	glEnable GL_TEXTURE_2D;
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1817	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	glColor 0, 0, 0, 1;	1818	glColor 0, 0, 0, 1;
1702		1819
1703	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1820	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704		1821
1705	glDisable GL_TEXTURE_2D;	1822	glDisable GL_TEXTURE_2D;
1706	glDisable GL_BLEND;
1707		1823
1708	$self->SUPER::_draw;	1824	$self->SUPER::_draw;
1709	}	1825	}
1710		1826
1711	#############################################################################	1827	#############################################################################
…		…
1725		1841
1726	$class->SUPER::new (	1842	$class->SUPER::new (
1727	padding => 2,	1843	padding => 2,
1728	fg => [1, 1, 1],	1844	fg => [1, 1, 1],
1729	active_fg => [1, 1, 0],	1845	active_fg => [1, 1, 0],
		1846	bg => [0, 0, 0, 0.2],
		1847	active_bg => [1, 1, 1, 0.5],
1730	state => 0,	1848	state => 0,
1731	can_hover => 1,	1849	can_hover => 1,
1732	@_	1850	@_
1733	)	1851	)
1734	}	1852	}
…		…
1743	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1744		1862
1745	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1748	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1749	}	1867	}
1750	}	1868	}
1751		1869
1752	sub _draw {	1870	sub _draw {
1753	my ($self) = @_;	1871	my ($self) = @_;
…		…
1758		1876
1759	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1877	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760		1878
1761	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1879	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762		1880
1763	glEnable GL_BLEND;	1881	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1882
1764	glEnable GL_TEXTURE_2D;	1883	glEnable GL_TEXTURE_2D;
1765	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767	my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769	$tex->draw_quad (0, 0, $s, $s);	1884	$tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771	glDisable GL_TEXTURE_2D;	1885	glDisable GL_TEXTURE_2D;
1772	glDisable GL_BLEND;
1773	}	1886	}
1774		1887
1775	#############################################################################	1888	#############################################################################
1776		1889
1777	package CFClient::UI::Image;	1890	package CFClient::UI::Image;
…		…
1820	glTranslate 0, -$self->{w}, 0;	1933	glTranslate 0, -$self->{w}, 0;
1821		1934
1822	($w, $h) = ($h, $w);	1935	($w, $h) = ($h, $w);
1823	}	1936	}
1824		1937
1825	glEnable GL_BLEND;
1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827	glEnable GL_TEXTURE_2D;	1938	glEnable GL_TEXTURE_2D;
1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1939	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829		1940
1830	$tex->draw_quad (0, 0, $w, $h);	1941	$tex->draw_quad_alpha (0, 0, $w, $h);
1831		1942
1832	glDisable GL_BLEND;
1833	glDisable GL_TEXTURE_2D;	1943	glDisable GL_TEXTURE_2D;
1834	}	1944	}
1835		1945
1836	#############################################################################	1946	#############################################################################
1837		1947
…		…
2026	qw(s1_slider.png s1_slider_bg.png);	2136	qw(s1_slider.png s1_slider_bg.png);
2027		2137
2028	sub new {	2138	sub new {
2029	my $class = shift;	2139	my $class = shift;
2030		2140
2031	# range [value, low, high, page]	2141	# range [value, low, high, page, unit]
2032		2142
2033	# TODO: 0-width page	2143	# TODO: 0-width page
2034	# TODO: req_w/h are wrong with vertical	2144	# TODO: req_w/h are wrong with vertical
2035	# TODO: calculations are off	2145	# TODO: calculations are off
2036	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2037	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2038	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
		2149	bg => [0, 0, 0, 0.2],
		2150	active_bg => [1, 1, 1, 0.5],
2039	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2040	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2041	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2042	vertical => 0,	2154	vertical => 0,
2043	can_hover => 1,	2155	can_hover => 1,
2044	inner_pad => 5,	2156	inner_pad => 0.02,
2045	@_	2157	@_
2046	);	2158	);
2047		2159
		2160	$self->set_value ($self->{range}[0]);
		2161	$self->update;
		2162
2048	$self	2163	$self
		2164	}
		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
		2175	sub set_value {
		2176	my ($self, $value) = @_;
		2177
		2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2179
		2180	$hi = $lo + 1 if $hi <= $lo;
		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
		2184	$value = $lo if $value < $lo;
		2185	$value = $hi - $page if $value > $hi - $page;
		2186
		2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2188	if $unit;
		2189
		2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2191
		2192	if ($value != $old_value) {
		2193	$self->_emit (changed => $value);
		2194	$self->update;
		2195	}
2049	}	2196	}
2050		2197
2051	sub size_request {	2198	sub size_request {
2052	my ($self) = @_;	2199	my ($self) = @_;
2053		2200
…		…
2059		2206
2060	sub button_down {	2207	sub button_down {
2061	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2062		2209
2063	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
2064	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2065	}	2215	}
2066		2216
2067	sub mouse_motion {	2217	sub mouse_motion {
2068	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2069		2219
2070	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
		2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2222
		2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2224
		2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2226
		2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2228	}
		2229	}
		2230
		2231	sub update {
		2232	my ($self) = @_;
		2233
		2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2235	$self->set_value ($self->{range}[0]);
		2236
2071	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2072		2239
2073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074		2241
2075	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077		2244
2078	$x -= $inner_pad_px; # substract the padding	2245	$value = ($value - $lo) / $range;
2079	$x = $x * ($hi - $lo) / $inner_w + $lo;	2246	$value = $value * $self->{scale} + $self->{offset};
2080	$x = $lo if $x < $lo;
2081	$x = $hi - $page if $x > $hi - $page;
2082	$self->{range}[0] = $x;
2083		2247
2084	$self->emit (changed => $x);	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2085	$self->update;	2249	$self->{knob_w} = $knob_w;
2086	}	2250	});
2087	}
2088		2251
2089	# the inner_* stuff is for generating a padding for the slider handle,	2252	$self->SUPER::update;
2090	# so that the handle doesn't leave the texture. This calculation isn't 100%
2091	# correct propably, but it does the job for now
2092	sub _calc_inner_pad_px {
2093	my ($self, $w) = @_;
2094	($w / 100) * $self->{inner_pad} # % to pixels
2095	}	2253	}
2096		2254
2097	sub _draw {	2255	sub _draw {
2098	my ($self) = @_;	2256	my ($self) = @_;
2099		2257
2100	$self->SUPER::_draw ();	2258	$self->SUPER::_draw ();
2101		2259
2102	my ($w, $h) = @$self{qw(w h)};	2260	glScale $self->{w}, $self->{h};
2103		2261
2104	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2105	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2106		2264
		2265	glTranslate 1, 0, 0;
2107	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2108	glTranslate 0, -$self->{w}, 0;
2109
2110	($w, $h) = ($h, $w);
2111	}	2267	}
2112		2268
2113	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115		2271
2116	my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118	$hi = $value + 1 if $lo == $hi;
2119
2120	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123	$page = int $page * $inner_w / ($hi - $lo);
2124	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126	$w -= $page;
2127	$page &= ~1;
2128	glTranslate $page * 0.5, 0, 0;
2129	$page ||= 2;
2130
2131	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134	glEnable GL_BLEND;
2135	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136	glEnable GL_TEXTURE_2D;	2272	glEnable GL_TEXTURE_2D;
2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138		2274
2139	# draw background	2275	# draw background
2140	$tex[1]->draw_quad (0, 0, $w, $h);	2276	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141		2277
2142	# draw handle	2278	# draw handle
2143	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2280
2145	glDisable GL_BLEND;
2146	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2147	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2148		2324
2149	#############################################################################	2325	#############################################################################
2150		2326
2151	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2152		2328
…		…
2161	fontsize => 1,	2337	fontsize => 1,
2162	can_events => 0,	2338	can_events => 0,
2163	#font => default_font	2339	#font => default_font
2164	@_,	2340	@_,
2165		2341
2166	layout => (new CFClient::Layout),	2342	layout => (new CFClient::Layout 1),
2167	par => [],	2343	par => [],
2168	height => 0,	2344	height => 0,
2169	children => [	2345	children => [
2170	(new CFClient::UI::Empty expand => 1),	2346	(new CFClient::UI::Empty expand => 1),
2171	(new CFClient::UI::Slider vertical => 1),	2347	(new CFClient::UI::Slider vertical => 1),
…		…
2182		2358
2183	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2184	$self->reflow;	2360	$self->reflow;
2185	}	2361	}
2186		2362
2187	sub text_height {
2188	my ($self, $text) = @_;
2189
2190	my $layout = $self->{layout};
2191
2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193	$layout->set_width ($self->{children}[0]{w});
2194	$layout->set_text ($text);
2195
2196	($layout->size)[1]
2197	}
2198
2199	sub reflow {
2200	my ($self) = @_;
2201
2202	$self->{need_reflow}++;
2203	$self->update;
2204	}
2205
2206	sub size_allocate {	2363	sub size_allocate {
2207	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2208		2365
2209	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2210		2367
…		…
2213	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2214		2371
2215	$self->reflow;	2372	$self->reflow;
2216	}	2373	}
2217		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2218	sub add_paragraph {	2409	sub add_paragraph {
2219	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2220		2411
2221	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2222		2413	my ($w, $h) = $self->text_size ($line);
2223	my $height = $self->text_height ($text);
2224
2225	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2226		2417
2227	push @{$self->{par}}, [$height, $color, $text];
2228
2229	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230	$self->{children}[1]->update;
2231	}	2419	}
2232		2420
2233	sub update {	2421	sub update {
2234	my ($self) = @_;	2422	my ($self) = @_;
2235		2423
…		…
2237		2425
2238	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2239		2427
2240	delete $self->{texture};	2428	delete $self->{texture};
2241		2429
2242	$ROOT->on_refresh ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2243	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2244	my $height = 0;	2434	my $height = 0;
2245		2435
2246	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2247	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2248		2451
2249	$self->{height} = $height;	2452	$self->{height} = $height;
2250		2453
2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252		2455
2253	delete $self->{texture};	2456	delete $self->{texture};
2254	}	2457	}
2255		2458
2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2258	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2259		2462
		2463	my $top = int $self->{children}[1]{range}[0];
		2464
		2465	my $y0 = $top;
		2466	my $y1 = $top + $H;
		2467
		2468	my $y = 0;
		2469
		2470	my $layout = $self->{layout};
		2471
		2472	$layout->set_font ($self->{font}) if $self->{font};
		2473
2260	glEnable GL_BLEND;	2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262	glEnable GL_TEXTURE_2D;
2263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265	my $top = int $self->{children}[1]{range}[0];
2266
2267	my $y0 = $top;
2268	my $y1 = $top + $self->{h};
2269
2270	my $y = 0;
2271
2272	my $layout = $self->{layout};
2273
2274	$layout->set_font ($self->{font}) if $self->{font};
2275		2477
2276	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2277	my $h = $par->[0];	2479	my $h = $par->[1];
2278		2480
2279	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
		2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2280	$layout->set_text ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2281		2485
2282	glColor @{ $par->[1] };	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283	my ($W, $H) = $layout->size;	2487
2284	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285	}	2490	}
2286		2491
2287	$y += $h;	2492	$y += $h;
2288	}	2493	}
2289		2494
2290	glDisable GL_TEXTURE_2D;
2291	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2292	};	2496	};
2293	});	2497	});
2294	}	2498	}
2295		2499
2296	sub _draw {	2500	sub _draw {
2297	my ($self) = @_;	2501	my ($self) = @_;
2298		2502
2299	glEnable GL_BLEND;
2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2506	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2306	glDisable GL_BLEND;
2307		2508
2308	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2309		2510
2310	}	2511	}
2311		2512
…		…
2359		2560
2360	sub new {	2561	sub new {
2361	my $class = shift;	2562	my $class = shift;
2362		2563
2363	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2364	state => 0,	2565	state => 0,
2365	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2366	@_	2567	@_
2367	);	2568	);
2368		2569
2369	if ($self->{state}) {
2370	$self->{state} = 0;
2371	$self->toggle_flopper;
2372	}
2373
2374	$self	2570	$self
2375	}	2571	}
2376		2572
2377	sub toggle_flopper {	2573	sub toggle_flopper {
2378	my ($self) = @_;	2574	my ($self) = @_;
2379		2575
2380	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2381	if ($self->{state} = !$self->{state}) {
2382	$CFClient::UI::ROOT->add ($self->{other});
2383	$self->{other}->move ($self->coord2global (0, $self->{h}));
2384	$self->emit ("open");
2385	} else {
2386	$CFClient::UI::ROOT->remove ($self->{other});
2387	$self->emit ("close");
2388	}
2389
2390	$self->emit (changed => $self->{state});
2391	}	2577	}
2392		2578
2393	#############################################################################	2579	#############################################################################
2394		2580
2395	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2405	@_,	2591	@_,
2406	can_events => 0,	2592	can_events => 0,
2407	)	2593	)
2408	}	2594	}
2409		2595
2410	sub set_markup {	2596	sub set_tooltip_from {
2411	my ($self, $text) = @_;	2597	my ($self, $widget) = @_;
2412		2598
2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2599	$self->add (new CFClient::UI::Label
2414	$self->{label}->set_markup ($text);	2600	markup => $widget->{tooltip},
2415	$self->add ($self->{label});	2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2602	fontsize => 0.8,
		2603	fg => [0, 0, 0, 1],
		2604	ellipsise => 0,
		2605	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2606	);
2416	}	2607	}
2417		2608
2418	sub size_request {	2609	sub size_request {
2419	my ($self) = @_;	2610	my ($self) = @_;
2420
2421	$self->child->set_max_size ($::WIDTH * 0.3);
2422		2611
2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2612	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424		2613
2425	($w + 4, $h + 4)	2614	($w + 4, $h + 4)
2426	}	2615	}
…		…
2432	}	2621	}
2433		2622
2434	sub _draw {	2623	sub _draw {
2435	my ($self) = @_;	2624	my ($self) = @_;
2436		2625
2437	glPushMatrix;
2438	glTranslate 0.375, 0.375;	2626	glTranslate 0.375, 0.375;
2439		2627
2440	my ($w, $h) = @$self{qw(w h)};	2628	my ($w, $h) = @$self{qw(w h)};
2441		2629
2442	glColor 1, 0.8, 0.4;	2630	glColor 1, 0.8, 0.4;
…		…
2453	glVertex 0 , $h;	2641	glVertex 0 , $h;
2454	glVertex $w, $h;	2642	glVertex $w, $h;
2455	glVertex $w, 0;	2643	glVertex $w, 0;
2456	glEnd;	2644	glEnd;
2457		2645
2458	glPopMatrix;	2646	glTranslate 2 - 0.375, 2 - 0.375;
2459
2460	glTranslate 2, 2;
2461	$self->SUPER::_draw;	2647	$self->SUPER::_draw;
2462	}	2648	}
2463		2649
2464	#############################################################################	2650	#############################################################################
2465		2651
…		…
2470	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2471		2657
2472	sub new {	2658	sub new {
2473	my $class = shift;	2659	my $class = shift;
2474		2660
2475	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2476	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2477	@_,	2664	@_,
2478	)	2665	);
		2666
		2667	if ($self->{anim} && $self->{animspeed}) {
		2668	Scalar::Util::weaken (my $widget = $self);
		2669
		2670	$self->{timer} = Event->timer (
		2671	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2672	hard => 1,
		2673	interval => $self->{animspeed},
		2674	cb => sub {
		2675	++$widget->{frame};
		2676	$widget->update;
		2677	},
		2678	);
		2679	}
		2680
		2681	$self
2479	}	2682	}
2480		2683
2481	sub size_request {	2684	sub size_request {
2482	(32, 8)	2685	(32, 8)
2483	}	2686	}
2484		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2485	sub _draw {	2696	sub _draw {
2486	my ($self) = @_;	2697	my ($self) = @_;
2487		2698
2488	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
		2700
		2701	my $face;
		2702
		2703	if ($self->{frame}) {
		2704	my $anim = $::CONN->{anim}[$self->{anim}];
		2705
		2706	$face = $anim->[ $self->{frame} % @$anim ]
		2707	if $anim && @$anim;
		2708	}
		2709
2489	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490		2711
2491	# TODO animation
2492	if ($tex) {	2712	if ($tex) {
2493	glEnable GL_BLEND;
2494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2498	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2500	glDisable GL_BLEND;	2718	}
		2719	}
		2720
		2721	sub DESTROY {
		2722	my ($self) = @_;
		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
		2732	package CFClient::UI::Inventory;
		2733
		2734	our @ISA = CFClient::UI::ScrolledWindow::;
		2735
		2736	sub new {
		2737	my $class = shift;
		2738
		2739	my $self = $class->SUPER::new (
		2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2741	@_,
		2742	);
		2743
		2744	$self
		2745	}
		2746
		2747	sub set_items {
		2748	my ($self, $items) = @_;
		2749
		2750	$self->{scrolled}->clear;
		2751	return unless $items;
		2752
		2753	my @items = sort {
		2754	($a->{type} <=> $b->{type})
		2755	or ($a->{name} cmp $b->{name})
		2756	} @$items;
		2757
		2758	$self->{real_items} = \@items;
		2759
		2760	my $row = 0;
		2761	for my $item (@items) {
		2762	CFClient::Item::update_widgets $item;
		2763
		2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2767
		2768	$row++;
2501	}	2769	}
2502	}	2770	}
2503		2771
2504	#############################################################################	2772	#############################################################################
2505		2773
…		…
2541		2809
2542	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2543	sub popup {	2811	sub popup {
2544	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2545		2813
2546	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2547		2815
2548	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2549	$GRAB = $self;	2817	$GRAB = $self;
2550	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2551		2819
…		…
2566		2834
2567	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2568	undef $GRAB;	2836	undef $GRAB;
2569	$self->hide;	2837	$self->hide;
2570		2838
2571	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2572	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2573	}	2841	}
2574	}	2842	}
2575		2843
2576	#############################################################################	2844	#############################################################################
2577		2845
		2846	package CFClient::UI::Statusbox;
		2847
		2848	our @ISA = CFClient::UI::VBox::;
		2849
		2850	sub new {
		2851	my $class = shift;
		2852
		2853	$class->SUPER::new (
		2854	fontsize => 0.8,
		2855	@_,
		2856	)
		2857	}
		2858
		2859	sub reorder {
		2860	my ($self) = @_;
		2861	my $NOW = time;
		2862
		2863	while (my ($k, $v) = each %{ $self->{item} }) {
		2864	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2865	}
		2866
		2867	my @widgets;
		2868
		2869	my @items = sort {
		2870	$a->{pri} <=> $b->{pri}
		2871	or $b->{id} <=> $a->{id}
		2872	} values %{ $self->{item} };
		2873
		2874	my $count = 10 + 1;
		2875	for my $item (@items) {
		2876	last unless --$count;
		2877
		2878	push @widgets, $item->{label} ||= do {
		2879	# TODO: doesn't handle markup well (read as: at all)
		2880	my $short = $item->{count} > 1
		2881	? "<b>$item->{count} ×</b> $item->{text}"
		2882	: $item->{text};
		2883
		2884	for ($short) {
		2885	s/^\s+//;
		2886	s/\s+/ /g;
		2887	}
		2888
		2889	new CFClient::UI::Label
		2890	markup => $short,
		2891	tooltip => $item->{tooltip},
		2892	tooltip_font => $::FONT_PROP,
		2893	tooltip_width => 0.67,
		2894	fontsize => $item->{fontsize} || $self->{fontsize},
		2895	max_w => $::WIDTH * 0.44,
		2896	fg => $item->{fg},
		2897	can_events => 1,
		2898	can_hover => 1
		2899	};
		2900	}
		2901
		2902	$self->clear;
		2903	$self->SUPER::add (reverse @widgets);
		2904	}
		2905
		2906	sub add {
		2907	my ($self, $text, %arg) = @_;
		2908
		2909	$text =~ s/^\s+//;
		2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
		2913
		2914	my $timeout = time + ((delete $arg{timeout}) || 60);
		2915
		2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2917
		2918	if (my $item = $self->{item}{$group}) {
		2919	if ($item->{text} eq $text) {
		2920	$item->{count}++;
		2921	} else {
		2922	$item->{count} = 1;
		2923	$item->{text} = $item->{tooltip} = $text;
		2924	}
		2925	$item->{id} = ++$self->{id};
		2926	$item->{timeout} = $timeout;
		2927	delete $item->{label};
		2928	} else {
		2929	$self->{item}{$group} = {
		2930	id => ++$self->{id},
		2931	text => $text,
		2932	timeout => $timeout,
		2933	tooltip => $text,
		2934	fg => [0.8, 0.8, 0.8, 0.8],
		2935	pri => 0,
		2936	count => 1,
		2937	%arg,
		2938	};
		2939	}
		2940
		2941	$self->reorder;
		2942	}
		2943
		2944	sub reconfigure {
		2945	my ($self) = @_;
		2946
		2947	delete $_->{label}
		2948	for values %{ $self->{item} || {} };
		2949
		2950	$self->reorder;
		2951	$self->SUPER::reconfigure;
		2952	}
		2953
		2954	#############################################################################
		2955
2578	package CFClient::UI::Root;	2956	package CFClient::UI::Root;
2579		2957
2580	our @ISA = CFClient::UI::Container::;	2958	our @ISA = CFClient::UI::Container::;
2581		2959
2582	use CFClient::OpenGL;	2960	use CFClient::OpenGL;
2583		2961
2584	sub check_size {	2962	sub new {
2585	my ($self) = @_;	2963	my $class = shift;
2586		2964
2587	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2965	$class->SUPER::new (
2588	}	2966	visible => 1,
2589		2967	@_,
2590	sub size_request {	2968	)
2591	($::WIDTH, $::HEIGHT)
2592	}	2969	}
2593		2970
2594	sub configure {	2971	sub configure {
2595	my ($self, $x, $y, $w, $h) = @_;	2972	my ($self, $x, $y, $w, $h) = @_;
2596		2973
2597	$self->SUPER::configure ($x, $y, $w, $h);	2974	$self->{w} = $w;
		2975	$self->{h} = $h;
		2976	}
2598		2977
		2978	sub check_size {
		2979	my ($self) = @_;
		2980
		2981	$self->size_allocate ($self->{w}, $self->{h})
		2982	if $self->{w};
		2983	}
		2984
		2985	sub size_request {
		2986	my ($self) = @_;
		2987
		2988	($self->{w}, $self->{h})
		2989	}
		2990
		2991	sub size_allocate {
		2992	my ($self, $w, $h) = @_;
		2993
2599	for my $child (@{$self->{children}}) {	2994	for my $child ($self->children) {
2600	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2601		2996
		2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2998	if exists $child->{req_x};
		2999
		3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3001	if exists $child->{req_y};
		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2602	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2603	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2604	$child->configure ($X, $Y, $W,$H);	3008	$child->configure ($X, $Y, $W, $H);
2605	}	3009	}
2606	}	3010	}
2607		3011
2608	sub _topleft {	3012	sub coord2local {
2609	my ($self, $x, $y) = @_;	3013	my ($self, $x, $y) = @_;
2610		3014
2611	($x, $y)	3015	($x, $y)
2612	}	3016	}
2613		3017
		3018	sub coord2global {
		3019	my ($self, $x, $y) = @_;
		3020
		3021	($x, $y)
		3022	}
		3023
2614	sub update {	3024	sub update {
2615	my ($self) = @_;	3025	my ($self) = @_;
2616		3026
2617	$self->check_size;	3027	$self->check_size;
2618	::refresh ();	3028	$::WANT_REFRESH++;
2619	}	3029	}
2620		3030
2621	sub add {	3031	sub add {
2622	my ($self, $child) = @_;	3032	my ($self, @children) = @_;
2623		3033
		3034	for my $child (@children) {
		3035	$child->{is_toplevel} = 1;
		3036
2624	# integerize window positions	3037	# integerise window positions
2625	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2626	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
		3040	}
2627		3041
2628	$self->SUPER::add ($child);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2629	}	3061	}
2630		3062
2631	sub on_refresh {	3063	sub on_refresh {
2632	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2633		3065
2634	$self->{refresh_hook}{$id} = $cb;	3066	$self->{refresh_hook}{$id} = $cb;
2635	}	3067	}
2636		3068
		3069	sub on_post_alloc {
		3070	my ($self, $id, $cb) = @_;
		3071
		3072	$self->{post_alloc_hook}{$id} = $cb;
		3073	}
		3074
2637	sub draw {	3075	sub draw {
2638	my ($self) = @_;	3076	my ($self) = @_;
2639		3077
2640	while (my $rcb = delete $self->{refresh_hook}) {	3078	while ($self->{refresh_hook}) {
2641	$_->() for values %$rcb;	3079	$_->()
		3080	for values %{delete $self->{refresh_hook}};
		3081	}
		3082
		3083	if ($self->{check_size}) {
		3084	my @queue;
		3085
		3086	for (;;) {
		3087	if ($self->{check_size}) {
		3088	#TODO use array-of-depth approach
		3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
		3091	@queue, values %{delete $self->{check_size}};
		3092	}
		3093
		3094	my $widget = pop @queue || last;
		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
		3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
		3099	? @$widget{qw(def_w def_h)}
		3100	: $widget->size_request;
		3101
		3102	if (delete $widget->{force_alloc}
		3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3105
		3106	$widget->{req_w} = $w;
		3107	$widget->{req_h} = $h;
		3108
		3109	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3110
		3111	$widget->{parent}->check_size
		3112	if $widget->{parent};
		3113	}
		3114	}
		3115	}
		3116
		3117	while ($self->{size_alloc}) {
		3118	for (values %{delete $self->{size_alloc}}) {
		3119	my ($widget, $w, $h) = @$_;
		3120
		3121	$w = 0 if $w < 0;
		3122	$h = 0 if $h < 0;
		3123
		3124	$widget->{w} = $w;
		3125	$widget->{h} = $h;
		3126	$widget->emit (size_allocate => $w, $h);
		3127	}
		3128	}
		3129
		3130	while ($self->{post_alloc_hook}) {
		3131	$_->()
		3132	for values %{delete $self->{post_alloc_hook}};
2642	}	3133	}
2643		3134
2644	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2645	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2646	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
2647		3138
2648	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
2649	glLoadIdentity;	3140	glLoadIdentity;
2650	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2651	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
2652	glLoadIdentity;	3143	glLoadIdentity;
2653		3144
2654	$self->_draw;	3145	$self->_draw;
2655	}	3146	}
2656		3147
2657	#############################################################################	3148	#############################################################################
2658		3149
2659	package CFClient::UI::InventoryItem;
2660
2661	our @ISA = CFClient::UI::HBox::;
2662
2663	sub new {
2664	my $class = shift;
2665
2666	my %args = @_;
2667
2668	my $item = $args{item};
2669
2670	my $desc = $item->{nrof} < 2
2671	? $item->{name}
2672	: "$item->{nrof} $item->{name_pl}";
2673
2674
2675	my $self = $class->SUPER::new (
2676	can_hover => 1,
2677	can_events => 1,
2678	tooltip => (CFClient::UI::Label->escape ($desc)
2679	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2680	connect_button_down => sub {
2681	my ($self, $ev, $x, $y) = @_;
2682
2683	# todo: maybe put examine on 1? but should just be a tooltip :(
2684	if ($ev->{button} == 1) {
2685	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2686	} elsif ($ev->{button} == 2) {
2687	$::CONN->send ("apply $item->{tag}");
2688	} elsif ($ev->{button} == 3) {
2689	CFClient::UI::Menu->new (
2690	items => [
2691	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2692	[
2693	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2694	sub { $::CONN->send ("lock $item->{tag}") },
2695	],
2696	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2697	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2698	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2699	],
2700	)->popup ($ev);
2701	}
2702
2703	1
2704	},
2705	%args
2706	);
2707	$self->add(new CFClient::UI::Face
2708	can_events => 0,
2709	face => $item->{face},
2710	anim => $item->{anim},
2711	animspeed => $item->{animspeed});
2712	$self->add(new CFClient::UI::Label
2713	can_events => 0,
2714	text => $desc);
2715
2716	$self
2717	}
2718
2719	#############################################################################
2720
2721	package CFClient::UI::Inventory;
2722
2723	our @ISA = CFClient::UI::ScrolledWindow::;
2724
2725	sub new {
2726	my $class = shift;
2727
2728	my $self = $class->SUPER::new (
2729	scrolled => (new CFClient::UI::VBox),
2730	@_,
2731	);
2732
2733	$self
2734	}
2735
2736	sub set_items {
2737	my ($self, $items) = @_;
2738
2739	$self->{scrolled}->clear;
2740	return unless $items;
2741
2742	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2743
2744	$self->{real_items} = \@items;
2745
2746	for my $item (@items) {
2747	my $desc = $item->{nrof} < 2
2748	? $item->{name}
2749	: "$item->{nrof} $item->{name_pl}";
2750
2751	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2752	}
2753
2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755	}
2756
2757	sub size_request {
2758	my ($self) = @_;
2759	($self->{req_w}, $self->{req_h});
2760	}
2761
2762	#############################################################################
2763
2764	package CFClient::UI;	3150	package CFClient::UI;
2765		3151
2766	$ROOT = new CFClient::UI::Root;	3152	$ROOT = new CFClient::UI::Root;
2767	$TOOLTIP = new CFClient::UI::Tooltip;	3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2768		3154
2769	1	3155	1
2770		3156

Diff Legend

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