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

Diff Legend

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