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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
393		431
394	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
395		433
396	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
397		435
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	439	}
402	}	440	}
403		441
404	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
405	sub coord2local {	443	sub coord2local {
406	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
407		445
		446	Carp::confess unless $self->{parent};#d#
		447
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	449	}
410		450
411	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
412	sub coord2global {	452	sub coord2global {
413	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
414		454
		455	Carp::confess unless $self->{parent};#d#
		456
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	458	}
417		459
418	sub invoke_focus_in {	460	sub invoke_focus_in {
419	my ($self) = @_;	461	my ($self) = @_;
420		462
421	return if $FOCUS == $self;	463	return if $FOCUS == $self;
422	return unless $self->{can_focus};	464	return unless $self->{can_focus};
423		465
424	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
425		467
426	$focus->update if $focus;	468	$self->update;
427	$FOCUS->update;
428		469
429	0	470	0
430	}	471	}
431		472
432	sub invoke_focus_out {	473	sub invoke_focus_out {
433	my ($self) = @_;	474	my ($self) = @_;
434		475
435	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
436		477
437	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
438		479
439	$focus->update if $focus; #?	480	$self->update;
440		481
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	483	unless $FOCUS;
443		484
444	0	485	0
445	}	486	}
446		487
447	sub grab_focus {	488	sub grab_focus {
448	my ($self) = @_;	489	my ($self) = @_;
449		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	492	$self->emit ("focus_in");
451	}	493	}
452		494
453	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
457		500
458	sub invoke_button_down {	501	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
460		503
461	$self->grab_focus;	504	$self->grab_focus;
462		505
463	1	506	0
464	}	507	}
465		508
466	sub connect {	509	sub connect {
467	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
468		511
469	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
470	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
471		532
472	sub emit {	533	sub emit {
473	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
474		535
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	554	}
479		555
480	sub find_widget {	556	#sub find_widget {
481	my ($self, $x, $y) = @_;	557	# in .xs
482
483	return () unless $self->{can_events};
484
485	return $self
486	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489	()
490	}
491		558
492	sub set_parent {	559	sub set_parent {
493	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
494		561
495	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
497	}	564	}
498		565
499	sub realloc {	566	sub realloc {
500	my ($self) = @_;	567	my ($self) = @_;
…		…
534	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
535		602
536	# update screen rectangle	603	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		606
542	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		610
…		…
568	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
571	glEnd;	636	glEnd;
572	glPopMatrix;	637	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	639	}
575		640
576	$self->_draw;	641	$self->_draw;
577	glPopMatrix;	642	glPopMatrix;
578	}	643	}
…		…
584	}	649	}
585		650
586	sub DESTROY {	651	sub DESTROY {
587	my ($self) = @_;	652	my ($self) = @_;
588		653
589	delete $WIDGET{$self+0};	654	return if CFPlus::in_destruct;
590		655
591	eval { $self->destroy };	656	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	657	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		658
		659	delete $WIDGET{$self+0};
593	}	660	}
594		661
595	#############################################################################	662	#############################################################################
596		663
597	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
598		665
599	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
600		667
601	use strict;	668	use strict;
602	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
603		670
604	sub new {	671	sub new {
605	my $class = shift;	672	my $class = shift;
606		673
607	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
638	}	705	}
639	}	706	}
640		707
641	#############################################################################	708	#############################################################################
642		709
643	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
644		711
645	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
646		713
647	sub new {	714	sub new {
648	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
650	}	717	}
…		…
657		724
658	sub draw { }	725	sub draw { }
659		726
660	#############################################################################	727	#############################################################################
661		728
662	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
663		730
664	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
665		732
666	sub new {	733	sub new {
667	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
668		735
669	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
673	can_events => 0,	740	can_events => 0,
674	%arg,	741	%arg,
675	);	742	);
676		743
677	$self->add (@$children)	744	$self->add (@$children)
678	if $children;	745	if $children && @$children;
679		746
680	$self	747	$self
		748	}
		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
681	}	756	}
682		757
683	sub add {	758	sub add {
684	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
685		760
686	$_->set_parent ($self)	761	$_->set_parent ($self)
687	for @widgets;	762	for @widgets;
688		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
689	use sort 'stable';	765	use sort 'stable';
690		766
691	$self->{children} = [	767	$self->{children} = [
692	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
693	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
694	];	770	];
695		771
696	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
697	}	775	}
698		776
699	sub children {	777	sub children {
700	@{ $_[0]{children} }	778	@{ $_[0]{children} }
701	}	779	}
…		…
712	}	790	}
713		791
714	sub clear {	792	sub clear {
715	my ($self) = @_;	793	my ($self) = @_;
716		794
717	my $children = delete $self->{children};	795	my $children = $self->{children};
718	$self->{children} = [];	796	$self->{children} = [];
719		797
720	for (@$children) {	798	for (@$children) {
721	delete $_->{parent};	799	delete $_->{parent};
722	$_->hide;	800	$_->hide;
…		…
747	$_->draw for @{$self->{children}};	825	$_->draw for @{$self->{children}};
748	}	826	}
749		827
750	#############################################################################	828	#############################################################################
751		829
752	package CFClient::UI::Bin;	830	package CFPlus::UI::Bin;
753		831
754	our @ISA = CFClient::UI::Container::;	832	our @ISA = CFPlus::UI::Container::;
755		833
756	sub new {	834	sub new {
757	my ($class, %arg) = @_;	835	my ($class, %arg) = @_;
758		836
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	837	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		838
761	$class->SUPER::new (children => [$child], %arg)	839	$class->SUPER::new (children => [$child], %arg)
762	}	840	}
763		841
764	sub add {	842	sub add {
…		…
771	sub remove {	849	sub remove {
772	my ($self, $widget) = @_;	850	my ($self, $widget) = @_;
773		851
774	$self->SUPER::remove ($widget);	852	$self->SUPER::remove ($widget);
775		853
776	$self->{children} = [new CFClient::UI::Empty]	854	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	855	unless @{$self->{children}};
778	}	856	}
779		857
780	sub child { $_[0]->{children}[0] }	858	sub child { $_[0]->{children}[0] }
781		859
…		…
793		871
794	#############################################################################	872	#############################################################################
795		873
796	# back-buffered drawing area	874	# back-buffered drawing area
797		875
798	package CFClient::UI::Window;	876	package CFPlus::UI::Window;
799		877
800	our @ISA = CFClient::UI::Bin::;	878	our @ISA = CFPlus::UI::Bin::;
801		879
802	use CFClient::OpenGL;	880	use CFPlus::OpenGL;
803		881
804	sub new {	882	sub new {
805	my ($class, %arg) = @_;	883	my ($class, %arg) = @_;
806		884
807	my $self = $class->SUPER::new (%arg);	885	my $self = $class->SUPER::new (%arg);
…		…
829	}	907	}
830		908
831	sub render_child {	909	sub render_child {
832	my ($self) = @_;	910	my ($self) = @_;
833		911
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	912	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	913	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	914	glClear GL_COLOR_BUFFER_BIT;
837		915
838	{	916	{
839	package CFClient::UI::Base;	917	package CFPlus::UI::Base;
840		918
841	($draw_x, $draw_y, $draw_w, $draw_h) =	919	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	920	(0, 0, $self->{w}, $self->{h});
		921
		922	$self->_render;
843	}	923	}
844
845	$self->_render;
846	};	924	};
847	}	925	}
848		926
849	sub _draw {	927	sub _draw {
850	my ($self) = @_;	928	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		929
854	my $tex = $self->{texture}	930	my $tex = $self->{texture}
855	or return;	931	or return;
856		932
857	glEnable GL_TEXTURE_2D;	933	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	935	glColor 0, 0, 0, 1;
860		936
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	937	$tex->draw_quad_alpha_premultiplied (0, 0);
862		938
863	glDisable GL_TEXTURE_2D;	939	glDisable GL_TEXTURE_2D;
864	}	940	}
865		941
866	#############################################################################	942	#############################################################################
867		943
868	package CFClient::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
869		945
		946	use List::Util qw(min max);
		947
870	our @ISA = CFClient::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
871		949
872	sub new {	950	sub new {
873	my $class = shift;	951	my $class = shift;
874		952
875	$class->SUPER::new (	953	$class->SUPER::new (
…		…
882	sub size_request {	960	sub size_request {
883	my ($self) = @_;	961	my ($self) = @_;
884		962
885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886		964
887	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
888	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
889		967
890	($w, $h)	968	($w, $h)
891	}	969	}
892		970
893	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
905	}	983	}
906		984
907	sub set_offset {	985	sub set_offset {
908	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
909		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
910	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
911	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
912		994
		995	$self->emit (changed => $x, $y);
913	$self->update;	996	$self->update;
		997	}
914	}	998	}
915		999
916	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
917	sub coord2local {	1001	sub coord2local {
918	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
933	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
934		1018
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1021	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	1023	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1025	}
942	}	1026	}
943		1027
944	sub _render {	1028	sub _render {
945	my ($self) = @_;	1029	my ($self) = @_;
946		1030
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1031	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1032	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1033
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1034	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1035
952	$self->SUPER::_render;	1036	$self->SUPER::_render;
953	}	1037	}
954		1038
955	#############################################################################	1039	#############################################################################
956		1040
957	package CFClient::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
958		1042
959	our @ISA = CFClient::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
960		1044
961	sub new {	1045	sub new {
962	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
963		1047
964	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
965		1049
966	my $self;	1050	my $self;
967		1051
968	my $slider = new CFClient::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
969	vertical => 1,	1066	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1068	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973	},	1071	},
974	;	1072	;
975		1073
976	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
		1077	can_events => 1,
978	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
979	%arg,	1082	%arg,
980	);	1083	);
981		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
983	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
984		1109
985	$self	1110	$self
986	}	1111	}
987		1112
…		…
989	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
990		1115
991	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
992	}	1117	}
993		1118
994	sub update {	1119	sub update_slider {
		1120	my ($self) = @_;
		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1127
		1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
995	my ($self) = @_;	1150	my ($self, $ev) = @_;
996		1151
997	$self->SUPER::update;	1152	$self->grab_focus;
998		1153
999	# todo: overwrite size_allocate of child	1154	my $ox = $self->{vp}{view_x};
1000	my $child = $self->{vp}->child;	1155	my $oy = $self->{vp}{view_y};
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
		1167	sub invoke_mouse_wheel {
		1168	my ($self, $ev) = @_;
		1169
		1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1172
		1173	1
		1174	}
		1175
		1176	sub invoke_button_down {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if ($ev->{button} == 2) {
		1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
		1183
		1184	0
		1185	}
		1186
		1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if (delete $self->{motion}) {
		1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
		1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
		1199
		1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1002	}	1206	}
1003		1207
1004	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1006		1210
1007	my $child = $self->{vp}->child;	1211	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1213	}
1012		1214
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1215	#############################################################################
1017		1216
1018	package CFClient::UI::Frame;	1217	package CFPlus::UI::Frame;
1019		1218
1020	our @ISA = CFClient::UI::Bin::;	1219	our @ISA = CFPlus::UI::Bin::;
1021		1220
1022	use CFClient::OpenGL;	1221	use CFPlus::OpenGL;
1023		1222
1024	sub new {	1223	sub new {
1025	my $class = shift;	1224	my $class = shift;
1026		1225
1027	$class->SUPER::new (	1226	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1252	$self->SUPER::_draw;
1054	}	1253	}
1055		1254
1056	#############################################################################	1255	#############################################################################
1057		1256
1058	package CFClient::UI::FancyFrame;	1257	package CFPlus::UI::FancyFrame;
1059		1258
1060	our @ISA = CFClient::UI::Bin::;	1259	our @ISA = CFPlus::UI::Bin::;
1061		1260
1062	use CFClient::OpenGL;	1261	use CFPlus::OpenGL;
		1262
		1263	sub new {
		1264	my ($class, %arg) = @_;
		1265
		1266	if ((exists $arg{label}) && !ref $arg{label}) {
		1267	$arg{label} = new CFPlus::UI::Label
		1268	align => 1,
		1269	valign => 0,
		1270	text => $arg{label},
		1271	fontsize => ($arg{border} || 0.8) * 0.75;
		1272	}
		1273
		1274	my $self = $class->SUPER::new (
		1275	# label => "",
		1276	fg => [0.6, 0.3, 0.1],
		1277	border => 0.8,
		1278	style => 'single',
		1279	%arg,
		1280	);
		1281
		1282	$self
		1283	}
		1284
		1285	sub add {
		1286	my ($self, @widgets) = @_;
		1287
		1288	$self->SUPER::add (@widgets);
		1289	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1290	}
		1291
		1292	sub border {
		1293	int $_[0]{border} * $::FONTSIZE
		1294	}
		1295
		1296	sub size_request {
		1297	my ($self) = @_;
		1298
		1299	($self->{label_w}, undef) = $self->{label}->size_request
		1300	if $self->{label};
		1301
		1302	my ($w, $h) = $self->SUPER::size_request;
		1303
		1304	(
		1305	$w + $self->border * 2,
		1306	$h + $self->border * 2,
		1307	)
		1308	}
		1309
		1310	sub invoke_size_allocate {
		1311	my ($self, $w, $h) = @_;
		1312
		1313	my $border = $self->border;
		1314
		1315	$w -= List::Util::max 0, $border * 2;
		1316	$h -= List::Util::max 0, $border * 2;
		1317
		1318	if (my $label = $self->{label}) {
		1319	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1320	$label->{h} = List::Util::min $h, $border;
		1321	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1322	}
		1323
		1324	$self->child->configure ($border, $border, $w, $h);
		1325
		1326	1
		1327	}
		1328
		1329	sub _draw {
		1330	my ($self) = @_;
		1331
		1332	my $child = $self->{children}[0];
		1333
		1334	my $border = $self->border;
		1335	my ($w, $h) = ($self->{w}, $self->{h});
		1336
		1337	$child->draw;
		1338
		1339	glColor @{$self->{fg}};
		1340	glBegin GL_LINE_STRIP;
		1341	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1342	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1343	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1344	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1345	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1346	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1347	glEnd;
		1348
		1349	if ($self->{label}) {
		1350	glTranslate $border * 2, 0;
		1351	$self->{label}->_draw;
		1352	}
		1353	}
		1354
		1355	#############################################################################
		1356
		1357	package CFPlus::UI::Toplevel;
		1358
		1359	our @ISA = CFPlus::UI::Bin::;
		1360
		1361	use CFPlus::OpenGL;
1063		1362
1064	my $bg =	1363	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1364	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1365	mipmap => 1, wrap => 1;
1067		1366
1068	my @border =	1367	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
1071		1374
1072	sub new {	1375	sub new {
1073	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1074		1377
1075	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1380	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1381	border => 0.6,
1079	can_events => 1,	1382	can_events => 1,
1080	min_w => 16,	1383	min_w => 64,
1081	min_h => 16,	1384	min_h => 32,
1082	%arg,	1385	%arg,
1083	);	1386	);
1084		1387
1085	$self->{title_widget} = new CFClient::UI::Label	1388	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1389	align => 0,
1087	valign => 1,	1390	valign => 1,
1088	text => $self->{title},	1391	text => $self->{title},
1089	fontsize => $self->{border},	1392	fontsize => $self->{border},
1090	if exists $self->{title};	1393	if exists $self->{title};
1091		1394
1092	if ($self->{has_close_button}) {	1395	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1396	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1397	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1398	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1399	on_activate => sub { $self->emit ("delete") };
1097		1400
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1401	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1402	}
1100		1403
1101	$self	1404	$self
1102	}	1405	}
1103		1406
1104	sub add {	1407	sub add {
1105	my ($self, @widgets) = @_;	1408	my ($self, @widgets) = @_;
1106		1409
1107	$self->SUPER::add (@widgets);	1410	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1411	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1412	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1413	}
1111		1414
1112	sub border {	1415	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1416	int $_[0]{border} * $::FONTSIZE
1114	}	1417	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1450	$self->child->configure ($border, $border, $w, $h);
1148		1451
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1452	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1453	if $self->{close_button};
1151		1454
		1455	1
		1456	}
		1457
		1458	sub invoke_delete {
		1459	my ($self) = @_;
		1460
		1461	$self->hide;
		1462
1152	1	1463	1
1153	}	1464	}
1154		1465
1155	sub invoke_button_down {	1466	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1467	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1525	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1526
1216	! ! $self->{motion}	1527	! ! $self->{motion}
1217	}	1528	}
1218		1529
		1530	sub invoke_visibility_change {
		1531	my ($self, $visible) = @_;
		1532
		1533	delete $self->{motion} unless $visible;
		1534
		1535	0
		1536	}
		1537
1219	sub _draw {	1538	sub _draw {
1220	my ($self) = @_;	1539	my ($self) = @_;
1221		1540
1222	my $child = $self->{children}[0];	1541	my $child = $self->{children}[0];
1223		1542
…		…
1228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229		1548
1230	my $border = $self->border;	1549	my $border = $self->border;
1231		1550
1232	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1233	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1237		1570
1238	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1240		1573
1241	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1260	if $self->{close_button};	1593	if $self->{close_button};
1261	}	1594	}
1262		1595
1263	#############################################################################	1596	#############################################################################
1264		1597
1265	package CFClient::UI::Table;	1598	package CFPlus::UI::Table;
1266		1599
1267	our @ISA = CFClient::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1268		1601
1269	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1270		1603
1271	use CFClient::OpenGL;	1604	use CFPlus::OpenGL;
1272		1605
1273	sub new {	1606	sub new {
1274	my $class = shift;	1607	my $class = shift;
1275		1608
1276	$class->SUPER::new (	1609	$class->SUPER::new (
1277	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1278	@_,	1612	@_,
1279	)	1613	)
1280	}	1614	}
1281		1615
1282	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}
1285
1286	sub add {	1616	sub add {
1287	my ($self, $x, $y, $child) = @_;	1617	my ($self, @widgets) = @_;
1288		1618
1289	$child->set_parent ($self);	1619	for my $child (@widgets) {
1290	$self->{children}[$y][$x] = $child;	1620	$child->{rowspan} ||= 1;
		1621	$child->{colspan} ||= 1;
		1622	}
1291		1623
1292	$self->realloc;	1624	$self->SUPER::add (@widgets);
1293	}	1625	}
1294		1626
1295	sub remove {	1627	sub add_at {
		1628	my $self = shift;
		1629
		1630	my @widgets;
		1631
		1632	while (@_) {
		1633	my ($col, $row, $child) = splice @_, 0, 3, ();
		1634
		1635	$child->{row} = $row;
		1636	$child->{col} = $col;
		1637
		1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1296	my ($self, $child) = @_;	1645	my ($self) = @_;
1297		1646
1298	# TODO: not yet implemented	1647	my (@w, @h);
1299	}
1300
1301	# TODO: move to container class maybe? send children a signal on removal?
1302	sub clear {
1303	my ($self) = @_;
1304		1648
1305	my @children = $self->children;	1649	my @children = $self->children;
1306	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1307		1660	}
1308	for (@children) {
1309	delete $_->{parent};
1310	$_->hide;
1311	}
1312		1661
1313	$self->realloc;	1662	# second pass, rows
1314	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1315
1316	sub get_wh {
1317	my ($self) = @_;
1318
1319	my (@w, @h);
1320
1321	for my $y (0 .. $#{$self->{children}}) {
1322	my $row = $self->{children}[$y]
1323	or next;
1324
1325	for my $x (0 .. $#$row) {
1326	my $widget = $row->[$x]
1327	or next;
1328	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1329		1665
1330	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1331	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1332	}	1670	}
1333	}	1671	}
1334		1672
1335	(\@w, \@h)	1673	(\@w, \@h)
1336	}	1674	}
…		…
1352	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1353		1691
1354	my $req_w = (sum @$ws) || 1;	1692	my $req_w = (sum @$ws) || 1;
1355	my $req_h = (sum @$hs) || 1;	1693	my $req_h = (sum @$hs) || 1;
1356		1694
1357	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1358	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1359	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1360	my $col_expand = (sum @col_expand) || 1;	1698	my $col_expand = (sum @col_expand) || 1;
1361		1699
1362	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1701
1366	CFClient::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) || 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1367	CFClient::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1368		1711
1369	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1370		1714
1371	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1372	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1373	or next;
1374		1717
1375	my $x = 0;	1718	$widget->configure (
1376	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1377		1721	);
1378	for my $c (0 .. $#$row) {	1722	}
1379	my $col_w = $ws->[$c];
1380		1723
1381	if (my $widget = $row->[$c]) {	1724	1
1382	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1383	}
1384		1726
1385	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1386	}	1765	}
		1766	}
1387		1767
1388	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $child->{req_w};
		1801	$h = _scale $size, $h, $child->{req_h};
		1802
		1803	$child->configure ($x, $y, $w, $h);
1389	}	1804	}
1390		1805
1391	1	1806	1
1392	}	1807	}
1393		1808
1394	sub find_widget {
1395	my ($self, $x, $y) = @_;
1396
1397	$x -= $self->{x};
1398	$y -= $self->{y};
1399
1400	my $res;
1401
1402	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1403	$res = $_->find_widget ($x, $y)
1404	and return $res;
1405	}
1406
1407	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1408	}
1409
1410	sub _draw {
1411	my ($self) = @_;
1412
1413	for (grep $_, @{$self->{children}}) {
1414	$_->draw for grep $_, @$_;
1415	}
1416	}
1417
1418	#############################################################################	1809	#############################################################################
1419		1810
1420	package CFClient::UI::Box;	1811	package CFPlus::UI::Box;
1421		1812
1422	our @ISA = CFClient::UI::Container::;	1813	our @ISA = CFPlus::UI::Container::;
1423		1814
1424	sub size_request {	1815	sub size_request {
1425	my ($self) = @_;	1816	my ($self) = @_;
1426		1817
1427	$self->{vertical}	1818	$self->{vertical}
…		…
1437		1828
1438	sub invoke_size_allocate {	1829	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1830	my ($self, $w, $h) = @_;
1440		1831
1441	my $space = $self->{vertical} ? $h : $w;	1832	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1833	my @children = $self->visible_children;
1443		1834
1444	my @req;	1835	my @req;
1445		1836
1446	if ($self->{homogeneous}) {	1837	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1838	@req = ($space / (@children || 1)) x @children;
1448	} else {	1839	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1840	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1841	my $req = List::Util::sum @req;
1451		1842
1452	if ($req > $space) {	1843	if ($req > $space) {
1453	# ah well, not enough space	1844	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1845	$_ *= $space / $req for @req;
1455	} else {	1846	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1847	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1848
1458	$space = ($space - $req) / $expand; # remaining space to give away	1849	$space = ($space - $req) / $expand; # remaining space to give away
1459		1850
1460	$req[$_] += $space * $children->[$_]{expand}	1851	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1852	for 0 .. $#children;
1462	}	1853	}
1463	}	1854	}
1464		1855
1465	CFClient::UI::harmonize \@req;	1856	CFPlus::UI::harmonize \@req;
1466		1857
1467	my $pos = 0;	1858	my $pos = 0;
1468	for (0 .. $#$children) {	1859	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1860	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1861	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1862
1472	$pos += $alloc;	1863	$pos += $alloc;
1473	}	1864	}
1474		1865
1475	1	1866	1
1476	}	1867	}
1477		1868
1478	#############################################################################	1869	#############################################################################
1479		1870
1480	package CFClient::UI::HBox;	1871	package CFPlus::UI::HBox;
1481		1872
1482	our @ISA = CFClient::UI::Box::;	1873	our @ISA = CFPlus::UI::Box::;
1483		1874
1484	sub new {	1875	sub new {
1485	my $class = shift;	1876	my $class = shift;
1486		1877
1487	$class->SUPER::new (	1878	$class->SUPER::new (
…		…
1490	)	1881	)
1491	}	1882	}
1492		1883
1493	#############################################################################	1884	#############################################################################
1494		1885
1495	package CFClient::UI::VBox;	1886	package CFPlus::UI::VBox;
1496		1887
1497	our @ISA = CFClient::UI::Box::;	1888	our @ISA = CFPlus::UI::Box::;
1498		1889
1499	sub new {	1890	sub new {
1500	my $class = shift;	1891	my $class = shift;
1501		1892
1502	$class->SUPER::new (	1893	$class->SUPER::new (
…		…
1505	)	1896	)
1506	}	1897	}
1507		1898
1508	#############################################################################	1899	#############################################################################
1509		1900
1510	package CFClient::UI::Label;	1901	package CFPlus::UI::Label;
1511		1902
1512	our @ISA = CFClient::UI::DrawBG::;	1903	our @ISA = CFPlus::UI::DrawBG::;
1513		1904
1514	use CFClient::OpenGL;	1905	use CFPlus::OpenGL;
1515		1906
1516	sub new {	1907	sub new {
1517	my ($class, %arg) = @_;	1908	my ($class, %arg) = @_;
1518		1909
1519	my $self = $class->SUPER::new (	1910	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1913	#active_bg => none
1523	#font => default_font	1914	#font => default_font
1524	#text => initial text	1915	#text => initial text
1525	#markup => initial narkup	1916	#markup => initial narkup
1526	#max_w => maximum pixel width	1917	#max_w => maximum pixel width
		1918	#style => 0, # render flags
1527	ellipsise => 3, # end	1919	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1920	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1921	fontsize => 1,
1530	align => -1,	1922	align => -1,
1531	valign => -1,	1923	valign => -1,
1532	padding_x => 2,	1924	padding_x => 2,
1533	padding_y => 2,	1925	padding_y => 2,
1534	can_events => 0,	1926	can_events => 0,
1535	%arg	1927	%arg
1536	);	1928	);
1537		1929
1538	if (exists $self->{template}) {	1930	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1931	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1932	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1933	$self->{template} = $layout;
1542	}	1934	}
1543		1935
1544	if (exists $self->{markup}) {	1936	if (exists $self->{markup}) {
…		…
1548	}	1940	}
1549		1941
1550	$self	1942	$self
1551	}	1943	}
1552		1944
1553	sub escape($) {
1554	local $_ = $_[0];
1555
1556	s/&/&amp;/g;
1557	s/>/&gt;/g;
1558	s/</&lt;/g;
1559
1560	$_
1561	}
1562
1563	sub update {	1945	sub update {
1564	my ($self) = @_;	1946	my ($self) = @_;
1565		1947
1566	delete $self->{texture};	1948	delete $self->{texture};
1567	$self->SUPER::update;	1949	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1960	my ($self, $text) = @_;
1579		1961
1580	return if $self->{text} eq "T$text";	1962	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1963	$self->{text} = "T$text";
1582		1964
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1965	$self->{layout}->set_text ($text);
1585		1966
1586	delete $self->{size_req};	1967	delete $self->{size_req};
1587	$self->realloc;	1968	$self->realloc;
1588	$self->update;	1969	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1975	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1976	$self->{text} = "M$markup";
1596		1977
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1978	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1979
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1980	$self->{layout}->set_markup ($markup);
1601		1981
1602	delete $self->{size_req};	1982	delete $self->{size_req};
1603	$self->realloc;	1983	$self->realloc;
1604	$self->update;	1984	$self->update;
…		…
1616		1996
1617	my ($w, $h) = $self->{layout}->size;	1997	my ($w, $h) = $self->{layout}->size;
1618		1998
1619	if (exists $self->{template}) {	1999	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	2000	$self->{template}->set_font ($self->{font}) if $self->{font};
		2001	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2002	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		2003
1623	my ($w2, $h2) = $self->{template}->size;	2004	my ($w2, $h2) = $self->{template}->size;
1624		2005
1625	$w = List::Util::max $w, $w2;	2006	$w = List::Util::max $w, $w2;
…		…
1630	};	2011	};
1631		2012
1632	@{ $self->{size_req} }	2013	@{ $self->{size_req} }
1633	}	2014	}
1634		2015
		2016	sub baseline_shift {
		2017	$_[0]{layout}->descent
		2018	}
		2019
1635	sub invoke_size_allocate {	2020	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	2021	my ($self, $w, $h) = @_;
1637		2022
1638	delete $self->{ox};	2023	delete $self->{ox};
1639		2024
…		…
1645		2030
1646	sub set_fontsize {	2031	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	2032	my ($self, $fontsize) = @_;
1648		2033
1649	$self->{fontsize} = $fontsize;	2034	$self->{fontsize} = $fontsize;
		2035	delete $self->{size_req};
1650	delete $self->{texture};	2036	delete $self->{texture};
1651		2037
1652	$self->realloc;	2038	$self->realloc;
1653	}	2039	}
1654		2040
1655	sub reconfigure {	2041	sub reconfigure {
1656	my ($self) = @_;	2042	my ($self) = @_;
1657		2043
1658	delete $self->{size_req};	2044	delete $self->{size_req};
		2045	delete $self->{texture};
1659		2046
1660	$self->SUPER::reconfigure;	2047	$self->SUPER::reconfigure;
1661	}	2048	}
1662		2049
1663	sub _draw {	2050	sub _draw {
1664	my ($self) = @_;	2051	my ($self) = @_;
1665		2052
1666	$self->SUPER::_draw; # draw background, if applicable	2053	$self->SUPER::_draw; # draw background, if applicable
1667		2054
1668	my $tex = $self->{texture} ||= do {	2055	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	2056	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	2057	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	2058	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	2059	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2060	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2061	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		2062
1676	new_from_layout CFClient::Texture $self->{layout}	2063	[$self->{layout}->size]
1677	};	2064	};
1678		2065
1679	unless (exists $self->{ox}) {	2066	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2067	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2068	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	2069	: ($self->{w} - $size->[0]) * 0.5);
1683		2070
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2071	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2072	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	2073	: ($self->{h} - $size->[1]) * 0.5);
1687	};	2074	};
1688		2075
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2076	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2077	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		2078
1694	if ($tex->{format} == GL_ALPHA) {	2079	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696	glColor @{$self->{fg}};
1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698	} else {
1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	2080	}
1705		2081
1706	#############################################################################	2082	#############################################################################
1707		2083
1708	package CFClient::UI::EntryBase;	2084	package CFPlus::UI::EntryBase;
1709		2085
1710	our @ISA = CFClient::UI::Label::;	2086	our @ISA = CFPlus::UI::Label::;
1711		2087
1712	use CFClient::OpenGL;	2088	use CFPlus::OpenGL;
1713		2089
1714	sub new {	2090	sub new {
1715	my $class = shift;	2091	my $class = shift;
1716		2092
1717	$class->SUPER::new (	2093	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	2097	active_fg => [0, 0, 0],
1722	can_hover => 1,	2098	can_hover => 1,
1723	can_focus => 1,	2099	can_focus => 1,
1724	valign => 0,	2100	valign => 0,
1725	can_events => 1,	2101	can_events => 1,
		2102	ellipsise => 0,
1726	#text => ...	2103	#text => ...
1727	#hidden => "*",	2104	#hidden => "*",
1728	@_	2105	@_
1729	)	2106	)
1730	}	2107	}
…		…
1775	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1776	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1777		2154
1778	my $text = $self->get_text;	2155	my $text = $self->get_text;
1779		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2158
1780	if ($uni == 8) {	2159	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
		2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
		2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
		2179	} elsif ($uni == 21) { # ctrl-u
		2180	$text = "";
1789	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1793	$self->emit ('escape');	2183	$self->emit ('escape');
1794	} elsif ($uni) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2188	} else {
1797	return 0;	2189	return 0;
1798	}	2190	}
1799		2191
1800	$self->_set_text ($text);	2192	$self->_set_text ($text);
1801		2193
1802	$self->realloc;	2194	$self->realloc;
		2195	$self->update;
1803		2196
1804	1	2197	1
1805	}	2198	}
1806		2199
1807	sub invoke_focus_in {	2200	sub invoke_focus_in {
…		…
1819		2212
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2213	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2214
1822	# byte-index to char-index	2215	# byte-index to char-index
1823	my $text = $self->{text};	2216	my $text = $self->{text};
1824	utf8::encode $text;	2217	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2218	$self->{cursor} = length $text;
1826		2219
1827	$self->_set_text ($self->{text});	2220	$self->_set_text ($self->{text});
1828	$self->update;	2221	$self->update;
1829		2222
1830	1	2223	1
…		…
1869	utf8::encode $text;	2262	utf8::encode $text;
1870		2263
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2264	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2265	}
1873		2266
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2267	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2268	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2269	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2270	glEnd;
1879	}	2271	}
1880	}	2272	}
1881		2273
		2274	#############################################################################
		2275
1882	package CFClient::UI::Entry;	2276	package CFPlus::UI::Entry;
1883		2277
1884	our @ISA = CFClient::UI::EntryBase::;	2278	our @ISA = CFPlus::UI::EntryBase::;
1885		2279
1886	use CFClient::OpenGL;	2280	use CFPlus::OpenGL;
1887		2281
1888	sub invoke_key_down {	2282	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2283	my ($self, $ev) = @_;
1890		2284
1891	my $sym = $ev->{sym};	2285	my $sym = $ev->{sym};
1892		2286
1893	if ($sym == 13) {	2287	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2288	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2289	my $txt = $self->get_text;
		2290
1896	$self->{history_pointer} = -1;	2291	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2292	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2293	$self->emit (activate => $txt);
1899	$self->update;	2294	$self->update;
1900		2295
1901	} elsif ($sym == CFClient::SDLK_UP) {	2296	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2297	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2298	$self->{history_saveback} = $self->get_text;
1904	}	2299	}
1905	if (@{$self->{history} || []} > 0) {	2300	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2301	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2303	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2304	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2306	}
1912		2307
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2309	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2310	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2311
1917	if ($self->{history_pointer} >= 0) {	2312	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2322	1
1928	}	2323	}
1929		2324
1930	#############################################################################	2325	#############################################################################
1931		2326
		2327	package CFPlus::UI::TextEdit;
		2328
		2329	our @ISA = CFPlus::UI::EntryBase::;
		2330
		2331	use CFPlus::OpenGL;
		2332
		2333	sub move_cursor_ver {
		2334	my ($self, $dy) = @_;
		2335
		2336	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2337
		2338	$y += $dy;
		2339
		2340	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2341	$self->{cursor} = $index;
		2342	delete $self->{cur_h};
		2343	$self->update;
		2344	return;
		2345	}
		2346	}
		2347
		2348	sub invoke_key_down {
		2349	my ($self, $ev) = @_;
		2350
		2351	my $sym = $ev->{sym};
		2352
		2353	if ($sym == CFPlus::SDLK_UP) {
		2354	$self->move_cursor_ver (-1);
		2355	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2356	$self->move_cursor_ver (+1);
		2357	} else {
		2358	return $self->SUPER::invoke_key_down ($ev)
		2359	}
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
1932	package CFClient::UI::Button;	2366	package CFPlus::UI::Button;
1933		2367
1934	our @ISA = CFClient::UI::Label::;	2368	our @ISA = CFPlus::UI::Label::;
1935		2369
1936	use CFClient::OpenGL;	2370	use CFPlus::OpenGL;
1937		2371
1938	my @tex =	2372	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
1941		2375
1942	sub new {	2376	sub new {
1943	my $class = shift;	2377	my $class = shift;
1944		2378
1945	$class->SUPER::new (	2379	$class->SUPER::new (
1946	padding_x => 4,	2380	padding_x => 4,
1947	padding_y => 4,	2381	padding_y => 4,
1948	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
1949	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
1950	can_hover => 1,	2384	can_hover => 1,
1951	align => 0,	2385	align => 0,
1952	valign => 0,	2386	valign => 0,
1953	can_events => 1,	2387	can_events => 1,
1954	@_	2388	@_
…		…
1972		2406
1973	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
1974	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1975	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
1976		2410
		2411	my $tex = $tex[$GRAB == $self];
1977	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1978		2413
1979	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
1980		2415
1981	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
1982	}	2417	}
1983		2418
1984	#############################################################################	2419	#############################################################################
1985		2420
		2421	package CFPlus::UI::CheckBox;
		2422
		2423	our @ISA = CFPlus::UI::DrawBG::;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2428
		2429	use CFPlus::OpenGL;
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 2,
		2436	padding_y => 2,
		2437	fg => [1, 1, 1],
		2438	active_fg => [1, 1, 0],
		2439	bg => [0, 0, 0, 0.2],
		2440	active_bg => [1, 1, 1, 0.5],
		2441	state => 0,
		2442	can_hover => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub size_request {
		2448	my ($self) = @_;
		2449
		2450	(6) x 2
		2451	}
		2452
		2453	sub toggle {
		2454	my ($self) = @_;
		2455
		2456	$self->{state} = !$self->{state};
		2457	$self->emit (changed => $self->{state});
		2458	$self->update;
		2459	}
		2460
		2461	sub invoke_button_down {
		2462	my ($self, $ev, $x, $y) = @_;
		2463
		2464	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2465	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2466	$self->toggle;
		2467	} else {
		2468	return 0
		2469	}
		2470
		2471	1
		2472	}
		2473
		2474	sub _draw {
		2475	my ($self) = @_;
		2476
		2477	$self->SUPER::_draw;
		2478
		2479	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2480
		2481	my ($w, $h) = @$self{qw(w h)};
		2482
		2483	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2484
		2485	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2486
		2487	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2488
		2489	glEnable GL_TEXTURE_2D;
		2490	$tex->draw_quad_alpha (0, 0, $s, $s);
		2491	glDisable GL_TEXTURE_2D;
		2492	}
		2493
		2494	#############################################################################
		2495
		2496	package CFPlus::UI::Image;
		2497
		2498	our @ISA = CFPlus::UI::Base::;
		2499
		2500	use CFPlus::OpenGL;
		2501
		2502	our %texture_cache;
		2503
		2504	sub new {
		2505	my $class = shift;
		2506
		2507	my $self = $class->SUPER::new (
		2508	can_events => 0,
		2509	@_,
		2510	);
		2511
		2512	$self->{path} || $self->{tex}
		2513	or Carp::croak "'path' or 'tex' attributes required";
		2514
		2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2516	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2517
		2518	CFPlus::weaken $texture_cache{$self->{path}};
		2519
		2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2521
		2522	$self
		2523	}
		2524
		2525	sub STORABLE_freeze {
		2526	my ($self, $cloning) = @_;
		2527
		2528	$self->{path}
		2529	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2530
		2531	$self->{path}
		2532	}
		2533
		2534	sub STORABLE_attach {
		2535	my ($self, $cloning, $path) = @_;
		2536
		2537	$self->new (path => $path)
		2538	}
		2539
		2540	sub size_request {
		2541	my ($self) = @_;
		2542
		2543	($self->{tex}{w}, $self->{tex}{h})
		2544	}
		2545
		2546	sub _draw {
		2547	my ($self) = @_;
		2548
		2549	my $tex = $self->{tex};
		2550
		2551	my ($w, $h) = ($self->{w}, $self->{h});
		2552
		2553	if ($self->{rot90}) {
		2554	glRotate 90, 0, 0, 1;
		2555	glTranslate 0, -$self->{w}, 0;
		2556
		2557	($w, $h) = ($h, $w);
		2558	}
		2559
		2560	glEnable GL_TEXTURE_2D;
		2561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2562
		2563	$tex->draw_quad (0, 0, $w, $h);
		2564
		2565	glDisable GL_TEXTURE_2D;
		2566	}
		2567
		2568	#############################################################################
		2569
1986	package CFClient::UI::ImageButton;	2570	package CFPlus::UI::ImageButton;
1987		2571
1988	our @ISA = CFClient::UI::Image::;	2572	our @ISA = CFPlus::UI::Image::;
1989		2573
1990	use CFClient::OpenGL;	2574	use CFPlus::OpenGL;
1991		2575
1992	my %textures;	2576	my %textures;
1993		2577
1994	sub new {	2578	sub new {
1995	my $class = shift;	2579	my $class = shift;
…		…
2017	1	2601	1
2018	}	2602	}
2019		2603
2020	#############################################################################	2604	#############################################################################
2021		2605
2022	package CFClient::UI::CheckBox;
2023
2024	our @ISA = CFClient::UI::DrawBG::;
2025
2026	my @tex =
2027	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030	use CFClient::OpenGL;
2031
2032	sub new {
2033	my $class = shift;
2034
2035	$class->SUPER::new (
2036	padding_x => 2,
2037	padding_y => 2,
2038	fg => [1, 1, 1],
2039	active_fg => [1, 1, 0],
2040	bg => [0, 0, 0, 0.2],
2041	active_bg => [1, 1, 1, 0.5],
2042	state => 0,
2043	can_hover => 1,
2044	@_
2045	)
2046	}
2047
2048	sub size_request {
2049	my ($self) = @_;
2050
2051	(6) x 2
2052	}
2053
2054	sub invoke_button_down {
2055	my ($self, $ev, $x, $y) = @_;
2056
2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059	$self->{state} = !$self->{state};
2060	$self->emit (changed => $self->{state});
2061	} else {
2062	return 0
2063	}
2064
2065	1
2066	}
2067
2068	sub _draw {
2069	my ($self) = @_;
2070
2071	$self->SUPER::_draw;
2072
2073	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075	my ($w, $h) = @$self{qw(w h)};
2076
2077	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081	my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083	glEnable GL_TEXTURE_2D;
2084	$tex->draw_quad_alpha (0, 0, $s, $s);
2085	glDisable GL_TEXTURE_2D;
2086	}
2087
2088	#############################################################################
2089
2090	package CFClient::UI::Image;	2606	package CFPlus::UI::VGauge;
2091		2607
2092	our @ISA = CFClient::UI::Base::;	2608	our @ISA = CFPlus::UI::Base::;
2093
2094	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096
2097	our %loaded_images;
2098
2099	sub new {
2100	my $class = shift;
2101
2102	my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106	$loaded_images{$self->{image}} ||=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111	Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114
2115	$self
2116	}
2117
2118	sub size_request {
2119	my ($self) = @_;
2120
2121	($self->{tex}->{w}, $self->{tex}->{h})
2122	}
2123
2124	sub _draw {
2125	my ($self) = @_;
2126
2127	my $tex = $self->{tex};
2128
2129	my ($w, $h) = ($self->{w}, $self->{h});
2130
2131	if ($self->{rot90}) {
2132	glRotate 90, 0, 0, 1;
2133	glTranslate 0, -$self->{w}, 0;
2134
2135	($w, $h) = ($h, $w);
2136	}
2137
2138	glEnable GL_TEXTURE_2D;
2139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141	$tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::VGauge;
2149
2150	our @ISA = CFClient::UI::Base::;
2151		2609
2152	use List::Util qw(min max);	2610	use List::Util qw(min max);
2153		2611
2154	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
2155		2613
2156	my %tex = (	2614	my %tex = (
2157	food => [	2615	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2617	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2618	],
2161	grace => [	2619	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2621	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2622	],
2165	hp => [	2623	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2625	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2626	],
2169	mana => [	2627	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2628	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2629	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2630	],
2173	);	2631	);
2174		2632
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2633	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2693	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2694	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2695
2238	my $h1 = $self->{h} * (1 - $ycut1);	2696	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2697	my $h2 = $self->{h} * (1 - $ycut2);
		2698	my $h3 = $self->{h};
		2699
		2700	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2701
2241	glEnable GL_BLEND;	2702	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2703	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2704	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2705	glEnable GL_TEXTURE_2D;
…		…
2263		2724
2264	if ($t3) {	2725	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2726	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2727	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2728	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2729	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2730	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2731	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2732	glEnd;
2272	}	2733	}
2273		2734
2274	glDisable GL_BLEND;	2735	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2736	glDisable GL_TEXTURE_2D;
2276	}	2737	}
2277		2738
2278	#############################################################################	2739	#############################################################################
2279		2740
2280	package CFClient::UI::Gauge;	2741	package CFPlus::UI::Gauge;
2281		2742
2282	our @ISA = CFClient::UI::VBox::;	2743	our @ISA = CFPlus::UI::VBox::;
2283		2744
2284	sub new {	2745	sub new {
2285	my ($class, %arg) = @_;	2746	my ($class, %arg) = @_;
2286		2747
2287	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2750	can_hover => 1,
2290	can_events => 1,	2751	can_events => 1,
2291	%arg,	2752	%arg,
2292	);	2753	);
2293		2754
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2755	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2756	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2757	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2758
2298	$self	2759	$self
2299	}	2760	}
2300		2761
2301	sub set_fontsize {	2762	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2783	$self->{value}->set_text ($val);
2323	}	2784	}
2324		2785
2325	#############################################################################	2786	#############################################################################
2326		2787
2327	package CFClient::UI::Slider;	2788	package CFPlus::UI::Slider;
2328		2789
2329	use strict;	2790	use strict;
2330		2791
2331	use CFClient::OpenGL;	2792	use CFPlus::OpenGL;
2332		2793
2333	our @ISA = CFClient::UI::DrawBG::;	2794	our @ISA = CFPlus::UI::DrawBG::;
2334		2795
2335	my @tex =	2796	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2797	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2798	qw(s1_slider.png s1_slider_bg.png);
2338		2799
2339	sub new {	2800	sub new {
2340	my $class = shift;	2801	my $class = shift;
2341		2802
…		…
2409		2870
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2871	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2872
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2873	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2874
2414	$self->mouse_motion ($ev, $x, $y)	2875	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2876	}
2416		2877
2417	sub invoke_mouse_motion {	2878	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2879	my ($self, $ev, $x, $y) = @_;
2419		2880
…		…
2428	} else {	2889	} else {
2429	return 0;	2890	return 0;
2430	}	2891	}
2431		2892
2432	1	2893	1
		2894	}
		2895
		2896	sub invoke_mouse_wheel {
		2897	my ($self, $ev) = @_;
		2898
		2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
		2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2904
		2905	! ! $delta
2433	}	2906	}
2434		2907
2435	sub update {	2908	sub update {
2436	my ($self) = @_;	2909	my ($self) = @_;
2437		2910
…		…
2486	glDisable GL_TEXTURE_2D;	2959	glDisable GL_TEXTURE_2D;
2487	}	2960	}
2488		2961
2489	#############################################################################	2962	#############################################################################
2490		2963
2491	package CFClient::UI::ValSlider;	2964	package CFPlus::UI::ValSlider;
2492		2965
2493	our @ISA = CFClient::UI::HBox::;	2966	our @ISA = CFPlus::UI::HBox::;
2494		2967
2495	sub new {	2968	sub new {
2496	my ($class, %arg) = @_;	2969	my ($class, %arg) = @_;
2497		2970
2498	my $range = delete $arg{range};	2971	my $range = delete $arg{range};
2499		2972
2500	my $self = $class->SUPER::new (	2973	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2974	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2975	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	2976	to_value => sub { shift },
2504	from_value => sub { shift },	2977	from_value => sub { shift },
2505	%arg,	2978	%arg,
2506	);	2979	);
2507		2980
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	3000	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	3001	sub set_value { shift->{slider}->set_value (@_) }
2529		3002
2530	#############################################################################	3003	#############################################################################
2531		3004
2532	package CFClient::UI::TextScroller;	3005	package CFPlus::UI::TextScroller;
2533		3006
2534	our @ISA = CFClient::UI::HBox::;	3007	our @ISA = CFPlus::UI::HBox::;
2535		3008
2536	use CFClient::OpenGL;	3009	use CFPlus::OpenGL;
2537		3010
2538	sub new {	3011	sub new {
2539	my $class = shift;	3012	my $class = shift;
2540		3013
2541	my $self = $class->SUPER::new (	3014	my $self = $class->SUPER::new (
2542	fontsize => 1,	3015	fontsize => 1,
2543	can_events => 0,	3016	can_events => 1,
2544	indent => 0,	3017	indent => 0,
2545	#font => default_font	3018	#font => default_font
2546	@_,	3019	@_,
2547		3020
2548	layout => (new CFClient::Layout 1),	3021	layout => (new CFPlus::Layout),
2549	par => [],	3022	par => [],
		3023	max_par => 0,
2550	height => 0,	3024	height => 0,
2551	children => [	3025	children => [
2552	(new CFClient::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2554	],	3028	],
2555	);	3029	);
2556		3030
2557	$self->{children}[1]->connect (changed => sub { $self->update });	3031	$self->{children}[1]->connect (changed => sub { $self->update });
2558		3032
…		…
2564		3038
2565	$self->{fontsize} = $fontsize;	3039	$self->{fontsize} = $fontsize;
2566	$self->reflow;	3040	$self->reflow;
2567	}	3041	}
2568		3042
		3043	sub size_request {
		3044	my ($self) = @_;
		3045
		3046	my ($empty, $slider) = @{ $self->{children} };
		3047
		3048	local $self->{children} = [$empty, $slider];
		3049	$self->SUPER::size_request
		3050	}
		3051
2569	sub invoke_size_allocate {	3052	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	3053	my ($self, $w, $h) = @_;
2571		3054
		3055	my ($empty, $slider, @other) = @{ $self->{children} };
		3056	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3057
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	3058	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3059	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	3060	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3061	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		3062
2577	$self->reflow;	3063	$self->reflow;
2578		3064
		3065	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	3066	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	3067	}
2581		3068
2582	sub text_size {	3069	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	3070	my ($self, $ev) = @_;
		3071
		3072	return 0 unless $ev->{dy}; # only vertical movements
		3073
		3074	$self->{children}[1]->emit (mouse_wheel => $ev);
		3075
		3076	1
		3077	}
		3078
		3079	sub get_layout {
		3080	my ($self, $para) = @_;
2584		3081
2585	my $layout = $self->{layout};	3082	my $layout = $self->{layout};
2586		3083
		3084	$layout->set_font ($self->{font}) if $self->{font};
		3085	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3086	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	3087	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3088	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	3089	$layout->set_markup ($para->{markup});
		3090
		3091	$layout->set_shapes (
		3092	map
		3093	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3094	@{$para->{widget}}
2591		3095	);
		3096
2592	$layout->size	3097	$layout
2593	}	3098	}
2594		3099
2595	sub reflow {	3100	sub reflow {
2596	my ($self) = @_;	3101	my ($self) = @_;
2597		3102
…		…
2604		3109
2605	# todo: base offset on lines or so, not on pixels	3110	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	3111	$self->{children}[1]->set_value ($offset);
2607	}	3112	}
2608		3113
		3114	sub current_paragraph {
		3115	my ($self) = @_;
		3116
		3117	$self->{top_paragraph} - 1
		3118	}
		3119
		3120	sub scroll_to {
		3121	my ($self, $para) = @_;
		3122
		3123	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3124
		3125	$self->{scroll_to} = $para;
		3126	$self->update;
		3127	}
		3128
2609	sub clear {	3129	sub clear {
2610	my ($self) = @_;	3130	my ($self) = @_;
		3131
		3132	my (undef, undef, @other) = @{ $self->{children} };
		3133	$self->remove ($_) for @other;
2611		3134
2612	$self->{par} = [];	3135	$self->{par} = [];
2613	$self->{height} = 0;	3136	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3137	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	3138	}
2616		3139
2617	sub add_paragraph {	3140	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	3141	my $self = shift;
2619		3142
2620	for my $line (split /\n/, $text) {	3143	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	3144	$para = {
		3145	fg => [1, 1, 1, 1],
		3146	indent => 0,
		3147	markup => "",
		3148	widget => [],
		3149	ref $para ? %$para : (markup => $para),
		3150	w => 1e10,
		3151	wrapped => 1,
		3152	};
		3153
		3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3155	push @{$self->{par}}, $para;
		3156	}
		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
		3160	}
		3161
		3162	$self->{need_reflow}++;
		3163	$self->update;
		3164	}
		3165
		3166	sub scroll_to_bottom {
		3167	my ($self) = @_;
		3168
		3169	$self->{scroll_to} = $#{$self->{par}};
		3170	$self->update;
		3171	}
		3172
		3173	sub force_uptodate {
		3174	my ($self) = @_;
		3175
		3176	if (delete $self->{need_reflow}) {
		3177	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3178
		3179	my $height = 0;
		3180
		3181	for my $para (@{$self->{par}}) {
		3182	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3183	my $layout = $self->get_layout ($para);
		3184	my ($w, $h) = $layout->size;
		3185
		3186	$para->{w} = $w + $para->{indent};
		3187	$para->{h} = $h;
		3188	$para->{wrapped} = $layout->has_wrapped;
		3189	}
		3190
		3191	$para->{y} = $height;
		3192	$height += $para->{h};
		3193	}
		3194
2622	$self->{height} += $h;	3195	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3196	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3197
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3198	delete $self->{texture};
		3199	}
		3200
		3201	if (my $paridx = delete $self->{scroll_to}) {
		3202	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3203	}
2627	}	3204	}
2628		3205
2629	sub update {	3206	sub update {
2630	my ($self) = @_;	3207	my ($self) = @_;
2631		3208
…		…
2634	return unless $self->{h} > 0;	3211	return unless $self->{h} > 0;
2635		3212
2636	delete $self->{texture};	3213	delete $self->{texture};
2637		3214
2638	$ROOT->on_post_alloc ($self => sub {	3215	$ROOT->on_post_alloc ($self => sub {
		3216	$self->force_uptodate;
		3217
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3218	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3219
2641	if (delete $self->{need_reflow}) {
2642	my $height = 0;
2643
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {
2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650	$layout->set_width ($W - $_->[3]);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];
2655	$_->[1] = $h;
2656	}
2657
2658	$height += $_->[1];
2659	}
2660
2661	$self->{height} = $height;
2662
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665	delete $self->{texture};
2666	}
2667
2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3220	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3221	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3222	glClear GL_COLOR_BUFFER_BIT;
2671		3223
		3224	package CFPlus::UI::Base;
		3225	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3226	(0, 0, $self->{w}, $self->{h});
		3227
		3228	my $top = int $self->{children}[1]{range}[0];
		3229
		3230	my $paridx = 0;
		3231	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3232	my $top = int $self->{children}[1]{range}[0];
2673		3233
2674	my $y0 = $top;	3234	my $y0 = $top;
2675	my $y1 = $top + $H;	3235	my $y1 = $top + $H;
2676		3236
2677	my $y = 0;
2678
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687	for my $par (@{$self->{par}}) {	3237	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3238	my $h = $para->{h};
		3239	my $y = $para->{y};
2689		3240
2690	if ($y0 < $y + $h && $y < $y1) {	3241	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3242	my $layout = $self->get_layout ($para);
2692	$layout->set_width ($W - $par->[3]);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		3243
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3244	$layout->render ($para->{indent}, $y - $y0);
2697		3245
2698	glRasterPos $par->[3], $y - $y0;	3246	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3247	my @s = $layout->get_shapes;
		3248
		3249	for (@w) {
		3250	my ($dx, $dy) = splice @s, 0, 2, ();
		3251
		3252	$_->{x} = $dx + $para->{indent};
		3253	$_->{y} = $dy + $y - $y0;
		3254
		3255	$_->draw;
		3256	}
		3257	}
2700	}	3258	}
2701		3259
2702	$y += $h;	3260	$paridx++;
		3261	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3262	}
2704		3263
2705	glDisable GL_BLEND;	3264	$self->{top_paragraph} = $top_paragraph;
2706	};	3265	};
2707	});	3266	});
		3267	}
		3268
		3269	sub reconfigure {
		3270	my ($self) = @_;
		3271
		3272	$self->SUPER::reconfigure;
		3273
		3274	$_->{w} = 1e10 for @{ $self->{par} };
		3275	$self->reflow;
2708	}	3276	}
2709		3277
2710	sub _draw {	3278	sub _draw {
2711	my ($self) = @_;	3279	my ($self) = @_;
2712		3280
…		…
2715	glColor 0, 0, 0, 1;	3283	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3284	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3285	glDisable GL_TEXTURE_2D;
2718		3286
2719	$self->{children}[1]->draw;	3287	$self->{children}[1]->draw;
2720
2721	}	3288	}
2722		3289
2723	#############################################################################	3290	#############################################################################
2724		3291
2725	package CFClient::UI::Animator;	3292	package CFPlus::UI::Animator;
2726		3293
2727	use CFClient::OpenGL;	3294	use CFPlus::OpenGL;
2728		3295
2729	our @ISA = CFClient::UI::Bin::;	3296	our @ISA = CFPlus::UI::Bin::;
2730		3297
2731	sub moveto {	3298	sub moveto {
2732	my ($self, $x, $y) = @_;	3299	my ($self, $x, $y) = @_;
2733		3300
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3301	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3329	glPopMatrix;
2763	}	3330	}
2764		3331
2765	#############################################################################	3332	#############################################################################
2766		3333
2767	package CFClient::UI::Flopper;	3334	package CFPlus::UI::Flopper;
2768		3335
2769	our @ISA = CFClient::UI::Button::;	3336	our @ISA = CFPlus::UI::Button::;
2770		3337
2771	sub new {	3338	sub new {
2772	my $class = shift;	3339	my $class = shift;
2773		3340
2774	my $self = $class->SUPER::new (	3341	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3353	$self->{other}->toggle_visibility;
2787	}	3354	}
2788		3355
2789	#############################################################################	3356	#############################################################################
2790		3357
2791	package CFClient::UI::Tooltip;	3358	package CFPlus::UI::Tooltip;
2792		3359
2793	our @ISA = CFClient::UI::Bin::;	3360	our @ISA = CFPlus::UI::Bin::;
2794		3361
2795	use CFClient::OpenGL;	3362	use CFPlus::OpenGL;
2796		3363
2797	sub new {	3364	sub new {
2798	my $class = shift;	3365	my $class = shift;
2799		3366
2800	$class->SUPER::new (	3367	$class->SUPER::new (
…		…
2803	)	3370	)
2804	}	3371	}
2805		3372
2806	sub set_tooltip_from {	3373	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3374	my ($self, $widget) = @_;
		3375
		3376	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3377	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3378
2809	my $tooltip = $widget->{tooltip};	3379	my $tooltip = $widget->{tooltip};
2810		3380
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3381	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3382	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3386	}
2817		3387
2818	$tooltip =~ s/^\n+//;	3388	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3389	$tooltip =~ s/\n+$//;
2820		3390
2821	$self->add (new CFClient::UI::Label	3391	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3392	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3393	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3394	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3395	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3396	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3397	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3398	);
2829	}	3399	}
2830		3400
…		…
2849		3419
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3420	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3421	my $widget = $self->{owner}
2852	or return;	3422	or return;
2853		3423
		3424	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3425	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3426
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3427	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3428	if $x + $self->{w} > $self->{root}{w};
2858		3429
2859	$self->move_abs ($x, $y);	3430	$self->move_abs ($x, $y);
		3431	} else {
		3432	$self->hide;
		3433	}
2860	});	3434	});
2861	}	3435	}
2862		3436
2863	sub _draw {	3437	sub _draw {
2864	my ($self) = @_;	3438	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3462	$self->SUPER::_draw;
2889	}	3463	}
2890		3464
2891	#############################################################################	3465	#############################################################################
2892		3466
2893	package CFClient::UI::Face;	3467	package CFPlus::UI::Face;
2894		3468
2895	our @ISA = CFClient::UI::Base::;	3469	our @ISA = CFPlus::UI::DrawBG::;
2896		3470
2897	use CFClient::OpenGL;	3471	use CFPlus::OpenGL;
2898		3472
2899	sub new {	3473	sub new {
2900	my $class = shift;	3474	my $class = shift;
2901		3475
2902	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
2903	aspect => 1,	3479	aspect => 1,
2904	can_events => 0,	3480	can_events => 0,
2905	@_,	3481	@_,
2906	);	3482	);
2907		3483
2908	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
2910		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2911	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3490	parked => 1,
2914	interval => $self->{animspeed},
2915	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
2916	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
2917	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
2918	},	3499	},
2919	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
2920	}	3504	}
2921		3505
2922	$self	3506	$self
2923	}	3507	}
2924		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	}
		3536	}
		3537	}
		3538
2925	sub size_request {	3539	sub size_request {
2926	(32, 8)	3540	my ($self) = @_;
		3541
		3542	if ($::CONN) {
		3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3544	if (my $tex = $::CONN->{texture}[$faceid]) {
		3545	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3546	} else {
		3547	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3548	$self->realloc;
		3549	});
		3550	}
		3551	}
		3552	}
		3553
		3554	($self->{size_w} || 8, $self->{size_h} || 8)
2927	}	3555	}
2928		3556
2929	sub update {	3557	sub update {
2930	my ($self) = @_;	3558	my ($self) = @_;
2931		3559
2932	return unless $self->{visible};	3560	return unless $self->{visible};
2933		3561
2934	$self->SUPER::update;	3562	$self->SUPER::update;
2935	}	3563	}
2936		3564
		3565	sub invoke_visibility_change {
		3566	my ($self) = @_;
		3567
		3568	$self->update_timer;
		3569
		3570	0
		3571	}
		3572
2937	sub _draw {	3573	sub _draw {
2938	my ($self) = @_;	3574	my ($self) = @_;
2939		3575
2940	return unless $::CONN;	3576	return unless $::CONN;
2941		3577
2942	my $face;	3578	$self->SUPER::_draw;
2943		3579
2944	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3580	my $faceid = $::CONN->{faceid}[$self->{face}]
2946		3581	or return;
2947	$face = $anim->[ $self->{frame} % @$anim ]
2948	if $anim && @$anim;
2949	}
2950		3582
2951	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3583	my $tex = $::CONN->{texture}[$faceid];
2952		3584
2953	if ($tex) {	3585	if ($tex) {
2954	glEnable GL_TEXTURE_2D;	3586	glEnable GL_TEXTURE_2D;
2955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2956	glColor 0, 0, 0, 1;	3588	glColor 0, 0, 0, 1;
…		…
2960	}	3592	}
2961		3593
2962	sub destroy {	3594	sub destroy {
2963	my ($self) = @_;	3595	my ($self) = @_;
2964		3596
2965	$self->{timer}->cancel	3597	(delete $self->{timer})->cancel
2966	if $self->{timer};	3598	if $self->{timer};
2967		3599
2968	$self->SUPER::destroy;	3600	$self->SUPER::destroy;
2969	}	3601	}
2970		3602
2971	#############################################################################	3603	#############################################################################
2972		3604
2973	package CFClient::UI::Buttonbar;	3605	package CFPlus::UI::Buttonbar;
2974		3606
2975	our @ISA = CFClient::UI::HBox::;	3607	our @ISA = CFPlus::UI::HBox::;
2976		3608
2977	# TODO: should actualyl wrap buttons and other goodies.	3609	# TODO: should actually wrap buttons and other goodies.
2978		3610
2979	#############################################################################	3611	#############################################################################
2980		3612
2981	package CFClient::UI::Menu;	3613	package CFPlus::UI::Menu;
2982		3614
2983	our @ISA = CFClient::UI::FancyFrame::;	3615	our @ISA = CFPlus::UI::Toplevel::;
2984		3616
2985	use CFClient::OpenGL;	3617	use CFPlus::OpenGL;
2986		3618
2987	sub new {	3619	sub new {
2988	my $class = shift;	3620	my $class = shift;
2989		3621
2990	my $self = $class->SUPER::new (	3622	my $self = $class->SUPER::new (
2991	items => [],	3623	items => [],
2992	z => 100,	3624	z => 100,
2993	@_,	3625	@_,
2994	);	3626	);
2995		3627
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3628	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3629
2998	for my $item (@{ $self->{items} }) {	3630	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3631	my ($widget, $cb, $tooltip) = @$item;
3000		3632
3001	# handle various types of items, only text for now	3633	# handle various types of items, only text for now
3002	if (!ref $widget) {	3634	if (!ref $widget) {
		3635	if ($widget =~ /\t/) {
		3636	my ($left, $right) = split /\t/, $widget, 2;
		3637
3003	$widget = new CFClient::UI::Label	3638	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3639	can_hover => 1,
3005	can_events => 1,	3640	can_events => 1,
		3641	tooltip => $tooltip,
		3642	children => [
		3643	(new CFPlus::UI::Label markup => $left, expand => 1),
		3644	(new CFPlus::UI::Label markup => $right, align => +1),
		3645	],
		3646	;
		3647
		3648	} else {
		3649	$widget = new CFPlus::UI::Label
		3650	can_hover => 1,
		3651	can_events => 1,
3006	markup => $widget,	3652	markup => $widget,
3007	tooltip => $tooltip	3653	tooltip => $tooltip;
		3654	}
3008	}	3655	}
3009		3656
3010	$self->{item}{$widget} = $item;	3657	$self->{item}{$widget} = $item;
3011		3658
3012	$self->{vbox}->add ($widget);	3659	$self->{vbox}->add ($widget);
…		…
3055	1	3702	1
3056	}	3703	}
3057		3704
3058	#############################################################################	3705	#############################################################################
3059		3706
3060	package CFClient::UI::Multiplexer;	3707	package CFPlus::UI::Multiplexer;
3061		3708
3062	our @ISA = CFClient::UI::Container::;	3709	our @ISA = CFPlus::UI::Container::;
3063		3710
3064	sub new {	3711	sub new {
3065	my $class = shift;	3712	my $class = shift;
3066		3713
3067	my $self = $class->SUPER::new (	3714	my $self = $class->SUPER::new (
…		…
3081		3728
3082	$self->{current} = $self->{children}[0]	3729	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3730	if @{ $self->{children} };
3084	}	3731	}
3085		3732
		3733	sub get_current_page {
		3734	my ($self) = @_;
		3735
		3736	$self->{current}
		3737	}
		3738
3086	sub set_current_page {	3739	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3740	my ($self, $page_or_widget) = @_;
3088		3741
3089	my $widget = ref $page_or_widget	3742	my $widget = ref $page_or_widget
3090	? $page_or_widget	3743	? $page_or_widget
…		…
3122	$self->{current}->draw;	3775	$self->{current}->draw;
3123	}	3776	}
3124		3777
3125	#############################################################################	3778	#############################################################################
3126		3779
3127	package CFClient::UI::Notebook;	3780	package CFPlus::UI::Notebook;
3128		3781
3129	our @ISA = CFClient::UI::VBox::;	3782	our @ISA = CFPlus::UI::VBox::;
3130		3783
3131	sub new {	3784	sub new {
3132	my $class = shift;	3785	my $class = shift;
3133		3786
3134	my $self = $class->SUPER::new (	3787	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3788	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3789	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3790	# filter => # will be put between multiplexer and $self
3138	@_,	3791	@_,
3139	);	3792	);
3140		3793
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3794	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3145	}	3798	}
3146		3799
3147	sub add {	3800	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3801	my ($self, $title, $widget, $tooltip) = @_;
3149		3802
3150	Scalar::Util::weaken $self;	3803	CFPlus::weaken $self;
3151		3804
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3805	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3806	markup => $title,
3154	tooltip => $tooltip,	3807	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3808	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3809	);
3157		3810
3158	$self->{multiplexer}->add ($widget);	3811	$self->{multiplexer}->add ($widget);
3159	}	3812	}
3160		3813
		3814	sub get_current_page {
		3815	my ($self) = @_;
		3816
		3817	$self->{multiplexer}->get_current_page
		3818	}
		3819
3161	sub set_current_page {	3820	sub set_current_page {
3162	my ($self, $page) = @_;	3821	my ($self, $page) = @_;
3163		3822
3164	$self->{multiplexer}->set_current_page ($page);	3823	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3824	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3825	}
3167		3826
3168	#############################################################################	3827	#############################################################################
3169		3828
3170	package CFClient::UI::Combobox;	3829	package CFPlus::UI::Selector;
3171		3830
3172	use utf8;	3831	use utf8;
3173		3832
3174	our @ISA = CFClient::UI::Button::;	3833	our @ISA = CFPlus::UI::Button::;
3175		3834
3176	sub new {	3835	sub new {
3177	my $class = shift;	3836	my $class = shift;
3178		3837
3179	my $self = $class->SUPER::new (	3838	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3855	my ($value, $title, $tooltip) = @$_;
3197		3856
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3857	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3858	}
3200		3859
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3860	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3861	}
3203		3862
3204	sub _set_value {	3863	sub _set_value {
3205	my ($self, $value) = @_;	3864	my ($self, $value) = @_;
3206		3865
…		…
3221	$self->emit (changed => $value);	3880	$self->emit (changed => $value);
3222	}	3881	}
3223		3882
3224	#############################################################################	3883	#############################################################################
3225		3884
3226	package CFClient::UI::Statusbox;	3885	package CFPlus::UI::Statusbox;
3227		3886
3228	our @ISA = CFClient::UI::VBox::;	3887	our @ISA = CFPlus::UI::VBox::;
3229		3888
3230	sub new {	3889	sub new {
3231	my $class = shift;	3890	my $class = shift;
3232		3891
3233	my $self = $class->SUPER::new (	3892	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	3893	fontsize => 0.8,
3235	@_,	3894	@_,
3236	);	3895	);
3237		3896
3238	Scalar::Util::weaken (my $this = $self);	3897	CFPlus::weaken (my $this = $self);
3239		3898
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3899	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		3900
3242	$self	3901	$self
3243	}	3902	}
…		…
3245	sub reorder {	3904	sub reorder {
3246	my ($self) = @_;	3905	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3906	my $NOW = Time::HiRes::time;
3248		3907
3249	# freeze display when hovering over any label	3908	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3909	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3910	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3911	values %{ $self->{item} };
3253		3912
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3913	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3914	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3915	}
…		…
3277	for ($short) {	3936	for ($short) {
3278	s/^\s+//;	3937	s/^\s+//;
3279	s/\s+/ /g;	3938	s/\s+/ /g;
3280	}	3939	}
3281		3940
3282	new CFClient::UI::Label	3941	new CFPlus::UI::Label
3283	markup => $short,	3942	markup => $short,
3284	tooltip => $item->{tooltip},	3943	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3944	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3945	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3946	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	4000	count => 1,
3342	%arg,	4001	%arg,
3343	};	4002	};
3344	}	4003	}
3345		4004
		4005	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	4006	$self->reorder;
		4007	});
3347	}	4008	}
3348		4009
3349	sub reconfigure {	4010	sub reconfigure {
3350	my ($self) = @_;	4011	my ($self) = @_;
3351		4012
…		…
3364	$self->SUPER::destroy;	4025	$self->SUPER::destroy;
3365	}	4026	}
3366		4027
3367	#############################################################################	4028	#############################################################################
3368		4029
3369	package CFClient::UI::Inventory;
3370
3371	our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373	sub new {
3374	my $class = shift;
3375
3376	my $self = $class->SUPER::new (
3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378	@_,
3379	);
3380
3381	$self
3382	}
3383
3384	sub set_items {
3385	my ($self, $items) = @_;
3386
3387	$self->{child}->clear;
3388	return unless $items;
3389
3390	my @items = sort {
3391	($a->{type} <=> $b->{type})
3392	or ($a->{name} cmp $b->{name})
3393	} @$items;
3394
3395	$self->{real_items} = \@items;
3396
3397	my $row = 0;
3398	for my $item (@items) {
3399	CFClient::Item::update_widgets $item;
3400
3401	$self->{child}->add (0, $row, $item->{face_widget});
3402	$self->{child}->add (1, $row, $item->{desc_widget});
3403	$self->{child}->add (2, $row, $item->{weight_widget});
3404
3405	$row++;
3406	}
3407	}
3408
3409	#############################################################################
3410
3411	package CFClient::UI::BindEditor;
3412
3413	our @ISA = CFClient::UI::FancyFrame::;
3414
3415	sub new {
3416	my $class = shift;
3417
3418	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420	$self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424	text => "start recording",
3425	tooltip => "Start/Stops recording of actions."
3426	."All subsequent actions after the recording started will be captured."
3427	."The actions are displayed after the record was stopped."
3428	."To bind the action you have to click on the 'Bind' button",
3429	on_activate => sub {
3430	unless ($self->{recording}) {
3431	$self->start;
3432	} else {
3433	$self->stop;
3434	}
3435	});
3436
3437	$vb->add (new CFClient::UI::Label text => "Actions:");
3438	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3441	$vb->add (my $hb = new CFClient::UI::HBox);
3442	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443	$hb->add (new CFClient::UI::Button
3444	text => "bind",
3445	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446	on_activate => sub {
3447	$self->ask_for_bind;
3448	});
3449
3450	$vb->add (my $hb = new CFClient::UI::HBox);
3451	$hb->add (new CFClient::UI::Button
3452	text => "ok",
3453	expand => 1,
3454	tooltip => "This closes the binding editor and saves the binding",
3455	on_activate => sub {
3456	$self->hide;
3457	$self->commit;
3458	});
3459
3460	$hb->add (new CFClient::UI::Button
3461	text => "cancel",
3462	expand => 1,
3463	tooltip => "This closes the binding editor without saving",
3464	on_activate => sub {
3465	$self->hide;
3466	$self->{binding_cancel}->()
3467	if $self->{binding_cancel};
3468	});
3469
3470	$self->update_binding_widgets;
3471
3472	$self
3473	}
3474
3475	sub commit {
3476	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480	."'. Don't forget 'Save Config'!");
3481	$self->{binding_change}->($mod, $sym, $cmds)
3482	if $self->{binding_change};
3483	} else {
3484	$::STATUSBOX->add ("No action bound, no key or action specified!");
3485	$self->{binding_cancel}->()
3486	if $self->{binding_cancel};
3487	}
3488	}
3489
3490	sub start {
3491	my ($self) = @_;
3492
3493	$self->{rec_btn}->set_text ("stop recording");
3494	$self->{recording} = 1;
3495	$self->clear_command_list;
3496	$::CONN->start_record if $::CONN;
3497	}
3498
3499	sub stop {
3500	my ($self) = @_;
3501
3502	$self->{rec_btn}->set_text ("start recording");
3503	$self->{recording} = 0;
3504
3505	my $rec;
3506	$rec = $::CONN->stop_record if $::CONN;
3507	return unless ref $rec eq 'ARRAY';
3508	$self->set_command_list ($rec);
3509	}
3510
3511
3512	sub ask_for_bind_and_commit {
3513	my ($self) = @_;
3514	$self->ask_for_bind (1);
3515	}
3516
3517	sub ask_for_bind {
3518	my ($self, $commit, $end_cb) = @_;
3519
3520	CFClient::Binder::open_binding_dialog (sub {
3521	my ($mod, $sym) = @_;
3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523	$self->update_binding_widgets;
3524	$self->commit if $commit;
3525	$end_cb->() if $end_cb;
3526	});
3527	}
3528
3529	# $mod and $sym are the modifiers and key symbol
3530	# $cmds is a array ref of strings (the commands)
3531	# $cb is the callback that is executed on OK
3532	# $ccb is the callback that is executed on CANCEL and
3533	# when the binding was unsuccessful on OK
3534	sub set_binding {
3535	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537	$self->clear_command_list;
3538	$self->{recording} = 0;
3539	$self->{rec_btn}->set_text ("start recording");
3540
3541	$self->{binding} = [$mod, $sym];
3542	$self->{commands} = $cmds;
3543
3544	$self->{binding_change} = $cb;
3545	$self->{binding_cancel} = $ccb;
3546
3547	$self->update_binding_widgets;
3548	}
3549
3550	# this is a shortcut method that asks for a binding
3551	# and then just binds it.
3552	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);
3558	}
3559
3560	sub update_binding_widgets {
3561	my ($self) = @_;
3562	my ($mod, $sym, $cmds) = $self->get_binding;
3563	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564	$self->set_command_list ($cmds);
3565	}
3566
3567	sub get_binding {
3568	my ($self) = @_;
3569	return (
3570	$self->{binding}->[0],
3571	$self->{binding}->[1],
3572	[ grep { defined $_ } @{$self->{commands}} ]
3573	);
3574	}
3575
3576	sub clear_command_list {
3577	my ($self) = @_;
3578	$self->{cmdbox}->clear ();
3579	}
3580
3581	sub set_command_list {
3582	my ($self, $cmds) = @_;
3583
3584	$self->{cmdbox}->clear ();
3585	$self->{commands} = $cmds;
3586
3587	my $idx = 0;
3588
3589	for (@$cmds) {
3590	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592	my $i = $idx;
3593	$hb->add (new CFClient::UI::Label text => $_);
3594	$hb->add (new CFClient::UI::Button
3595	text => "delete",
3596	tooltip => "Deletes the action from the record",
3597	on_activate => sub {
3598	$self->{cmdbox}->remove ($hb);
3599	$cmds->[$i] = undef;
3600	});
3601
3602
3603	$idx++
3604	}
3605	}
3606
3607	#############################################################################
3608
3609	package CFClient::UI::SpellList;
3610
3611	our @ISA = CFClient::UI::Table::;
3612
3613	sub new {
3614	my $class = shift;
3615
3616	my $self = $class->SUPER::new (
3617	binding => [],
3618	commands => [],
3619	@_,
3620	)
3621	}
3622
3623	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636	sub rebuild_spell_list {
3637	my ($self) = @_;
3638
3639	$CFClient::UI::ROOT->on_refresh ($self => sub {
3640	$self->clear;
3641
3642	return unless $::CONN;
3643
3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650	my $row = 0;
3651
3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653	my $spell = $self->{spell}{$_};
3654
3655	$row++;
3656
3657	my $spell_cb = sub {
3658	my ($widget, $ev) = @_;
3659
3660	if ($ev->{button} == 1) {
3661	$::CONN->user_send ("cast $spell->{name}");
3662	} elsif ($ev->{button} == 2) {
3663	$::CONN->user_send ("invoke $spell->{name}");
3664	} elsif ($ev->{button} == 3) {
3665	(new CFClient::UI::Menu
3666	items => [
3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669	],
3670	)->popup ($ev);
3671	} else {
3672	return 0;
3673	}
3674
3675	1
3676	};
3677
3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680	#TODO: add path info to tooltip
3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683	$self->add (0, $row, new CFClient::UI::Face
3684	face => $spell->{face},
3685	can_hover => 1,
3686	can_events => 1,
3687	tooltip => $tooltip,
3688	on_button_down => $spell_cb,
3689	);
3690
3691	$self->add (1, $row, new CFClient::UI::Label
3692	expand => 1,
3693	text => $spell->{name},
3694	can_hover => 1,
3695	can_events => 1,
3696	tooltip => $tooltip,
3697	on_button_down => $spell_cb,
3698	);
3699
3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704	}
3705	});
3706	}
3707
3708	sub add_spell {
3709	my ($self, $spell) = @_;
3710
3711	$self->{spell}->{$spell->{name}} = $spell;
3712	$self->rebuild_spell_list;
3713	}
3714
3715	sub remove_spell {
3716	my ($self, $spell) = @_;
3717
3718	delete $self->{spell}->{$spell->{name}};
3719	$self->rebuild_spell_list;
3720	}
3721
3722	sub clear_spells {
3723	my ($self) = @_;
3724
3725	$self->{spell} = {};
3726	$self->rebuild_spell_list;
3727	}
3728
3729	#############################################################################
3730
3731	package CFClient::UI::Root;	4030	package CFPlus::UI::Root;
3732		4031
3733	our @ISA = CFClient::UI::Container::;	4032	our @ISA = CFPlus::UI::Container::;
3734		4033
3735	use List::Util qw(min max);	4034	use List::Util qw(min max);
3736		4035
3737	use CFClient::OpenGL;	4036	use CFPlus::OpenGL;
3738		4037
3739	sub new {	4038	sub new {
3740	my $class = shift;	4039	my $class = shift;
3741		4040
3742	my $self = $class->SUPER::new (	4041	my $self = $class->SUPER::new (
3743	visible => 1,	4042	visible => 1,
3744	@_,	4043	@_,
3745	);	4044	);
3746		4045
3747	Scalar::Util::weaken ($self->{root} = $self);	4046	CFPlus::weaken ($self->{root} = $self);
3748		4047
3749	$self	4048	$self
3750	}	4049	}
3751		4050
3752	sub size_request {	4051	sub size_request {
…		…
3847	while ($self->{refresh_hook}) {	4146	while ($self->{refresh_hook}) {
3848	$_->()	4147	$_->()
3849	for values %{delete $self->{refresh_hook}};	4148	for values %{delete $self->{refresh_hook}};
3850	}	4149	}
3851		4150
3852	if ($self->{realloc}) {	4151	while ($self->{realloc}) {
3853	my %queue;	4152	my %queue;
3854	my @queue;	4153	my @queue;
3855	my $widget;	4154	my $widget;
3856		4155
3857	outer:	4156	outer:
…		…
3904	}	4203	}
3905	}	4204	}
3906		4205
3907	delete $self->{realloc}{$widget+0};	4206	delete $self->{realloc}{$widget+0};
3908	}	4207	}
3909	}
3910		4208
3911	while (my $size_alloc = delete $self->{size_alloc}) {	4209	while (my $size_alloc = delete $self->{size_alloc}) {
3912	my @queue = sort { $b->{visible} <=> $a->{visible} }	4210	my @queue = sort { $a->{visible} <=> $b->{visible} }
3913	values %$size_alloc;	4211	values %$size_alloc;
3914		4212
3915	while () {	4213	while () {
3916	my $widget = pop @queue || last;	4214	my $widget = pop @queue || last;
3917		4215
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4216	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		4217
3920	$w = 0 if $w < 0;	4218	$w = max $widget->{min_w}, $w;
3921	$h = 0 if $h < 0;	4219	$h = max $widget->{min_h}, $h;
3922		4220
		4221	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4222	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4223
		4224	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4225	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4226
3923	$w = int $w + 0.5;	4227	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	4228	$h = int $h + 0.5;
3925		4229
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4230	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	4231	$widget->{old_w} = $widget->{w};
3928	$widget->{old_h} = $widget->{h};	4232	$widget->{old_h} = $widget->{h};
3929		4233
3930	$widget->{w} = $w;	4234	$widget->{w} = $w;
3931	$widget->{h} = $h;	4235	$widget->{h} = $h;
3932		4236
3933	$widget->emit (size_allocate => $w, $h);	4237	$widget->emit (size_allocate => $w, $h);
		4238	}
3934	}	4239	}
3935	}	4240	}
3936	}	4241	}
3937		4242
3938	while ($self->{post_alloc_hook}) {	4243	while ($self->{post_alloc_hook}) {
3939	$_->()	4244	$_->()
3940	for values %{delete $self->{post_alloc_hook}};	4245	for values %{delete $self->{post_alloc_hook}};
3941	}	4246	}
3942
3943		4247
3944	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4248	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3945	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4249	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3946	glClear GL_COLOR_BUFFER_BIT;	4250	glClear GL_COLOR_BUFFER_BIT;
3947		4251
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4254	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4255	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4256	glLoadIdentity;
3953		4257
3954	{	4258	{
3955	package CFClient::UI::Base;	4259	package CFPlus::UI::Base;
3956		4260
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4262	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4263
3961	$self->_draw;	4264	$self->_draw;
		4265	}
3962	}	4266	}
3963		4267
3964	#############################################################################	4268	#############################################################################
3965		4269
3966	package CFClient::UI;	4270	package CFPlus::UI;
3967		4271
3968	$ROOT = new CFClient::UI::Root;	4272	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4273	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4274
3971	1	4275	1
3972		4276

Diff Legend

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