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.306 by root, Sun Jun 18 17:39:36 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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