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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.437 by root, Wed Aug 22 22:36:26 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};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	36	$TOOLTIP->show;
39	}	37	}
40		38
41	return;	39	return;
42	}	40	}
43	}	41	}
44	}	42	}
45		43
46	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
48	});	47	});
49		48
50	sub get_layout {	49	sub get_layout {
51	my $layout;	50	my $layout;
…		…
79	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	79	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	80	if $FOCUS;
82	}	81	}
83		82
		83	sub check_hover {
		84	my ($widget) = @_;
		85
		86	if ($widget != $HOVER) {
		87	my $hover = $HOVER; $HOVER = $widget;
		88
		89	$hover->update if $hover && $hover->{can_hover};
		90	$HOVER->update if $HOVER && $HOVER->{can_hover};
		91
		92	$TOOLTIP_WATCHER->start;
		93	}
		94	}
		95
84	sub feed_sdl_button_down_event {	96	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	97	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
87		99
88	warn "button down $ev->{button}\n";#d#	100	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
89		101
90	if (!$BUTTON_STATE) {	102	unless ($GRAB) {
91	my $widget = $ROOT->find_widget ($x, $y);	103	my $widget = $ROOT->find_widget ($x, $y);
92		104
93	$GRAB = $widget;	105	$GRAB = $widget;
94	$GRAB->update if $GRAB;	106	$GRAB->update if $GRAB;
95		107
96	$TOOLTIP_WATCHER->cb->();	108	$TOOLTIP_WATCHER->cb->();
97	}	109	}
98		110
99	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	111	if ($GRAB) {
		112	if ($ev->{button} == 4 || $ev->{button} == 5) {
		113	# mousewheel
		114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
100		116
101	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	$ev->{dx} = $shift ? $delta : 0;
102	if $GRAB;	118	$ev->{dy} = $shift ? 0 : $delta;
		119
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
103	}	125	}
104		126
105	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
106	my ($ev) = @_;	128	my ($ev) = @_;
107	my ($x, $y) = ($ev->{x}, $ev->{y});
108		129
109	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110		131
111	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112		133
113	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
114	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115		136
116	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
117	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
118	$grab->update if $grab;	139	$grab->update if $grab;
119	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
120		141
		142	check_hover $widget;
121	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
122	}	144	}
123	}	145	}
124		146
125	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
126	my ($ev) = @_;	148	my ($ev) = @_;
127	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
128		150
129	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130		152
131	if ($widget != $HOVER) {	153	check_hover $widget;
132	my $hover = $HOVER; $HOVER = $widget;
133		154
134	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
135	$HOVER->update if $HOVER && $HOVER->{can_hover};
136
137	$TOOLTIP_WATCHER->start;
138	}
139
140	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141	if $HOVER;	156	if $HOVER;
142	}	157	}
143		158
144	# convert position array to integers	159	# convert position array to integers
145	sub harmonize {	160	sub harmonize {
…		…
195	reconfigure_widgets;	210	reconfigure_widgets;
196	}	211	}
197		212
198	#############################################################################	213	#############################################################################
199		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
200	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
201		224
202	use strict;	225	use strict;
203		226
204	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
205		228
206	sub new {	229	sub new {
207	my $class = shift;	230	my $class = shift;
208		231
209	my $self = bless {	232	my $self = bless {
…		…
214	h => undef,	237	h => undef,
215	can_events => 1,	238	can_events => 1,
216	@_	239	@_
217	}, $class;	240	}, $class;
218		241
219	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220		243
221	for (keys %$self) {	244	for (keys %$self) {
222	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
223	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
224	}	247	}
225	}	248	}
226		249
227	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228	$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};
229	$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};
230	$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};
231	$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};
232		255
233	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235		258
236	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
241		264
242	sub destroy {	265	sub destroy {
243	my ($self) = @_;	266	my ($self) = @_;
244		267
245	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
246	%$self = ();	270	%$self = ();
247	}	271	}
248		272
		273	sub TO_JSON {
		274	{ __w_ => $_[0]{s_id} }
		275	}
		276
249	sub show {	277	sub show {
250	my ($self) = @_;	278	my ($self) = @_;
251		279
252	return if $self->{parent};	280	return if $self->{parent};
253		281
254	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
255	}	283	}
256		284
257	sub set_visible {	285	sub set_visible {
258	my ($self) = @_;	286	my ($self) = @_;
259		287
…		…
280	delete $self->{root};	308	delete $self->{root};
281		309
282	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
283	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
284		312
285	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
286	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
287		315
288	$self->emit ("focus_out");	316	$self->emit ("focus_out");
289	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
290	}	318	}
…		…
292	sub set_visibility {	320	sub set_visibility {
293	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
294		322
295	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
296		324
297	$visible ? $self->hide	325	$visible ? $self->show
298	: $self->show;	326	: $self->hide;
299	}	327	}
300		328
301	sub toggle_visibility {	329	sub toggle_visibility {
302	my ($self) = @_;	330	my ($self) = @_;
303		331
…		…
347	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
348		376
349	if ($self->{aspect}) {	377	if ($self->{aspect}) {
350	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
351		379
352	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354		382
355	# use alignment to adjust x, y	383	# use alignment to adjust x, y
356		384
357	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
358	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
399		427
400	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
401		429
402	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
403		431
404	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
406	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
407	}	435	}
408	}	436	}
409		437
410	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
411	sub coord2local {	439	sub coord2local {
412	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
413		441
		442	Carp::confess unless $self->{parent};#d#
		443
414	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415	}	445	}
416		446
417	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
418	sub coord2global {	448	sub coord2global {
419	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
420		452
421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422	}	454	}
423		455
424	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
458		490
459	sub invoke_mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
460	sub invoke_button_up { 0 }	492	sub invoke_button_up { 0 }
461	sub invoke_key_down { 0 }	493	sub invoke_key_down { 0 }
462	sub invoke_key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
463		496
464	sub invoke_button_down {	497	sub invoke_button_down {
465	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
466		499
467	$self->grab_focus;	500	$self->grab_focus;
468		501
469	warn "button down $ev->{button} $x $y\n";#d#
470
471	0	502	0
472	}	503	}
473		504
474	sub connect {	505	sub connect {
475	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
476		507
477	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	}
478	}	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	);
479		528
480	sub emit {	529	sub emit {
481	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
482		531
483	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
484	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	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
485	|| ($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
486	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
487	}	550	}
488		551
489	sub find_widget {	552	#sub find_widget {
490	my ($self, $x, $y) = @_;	553	# in .xs
491
492	return () unless $self->{can_events};
493
494	return $self
495	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
496	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
497
498	()
499	}
500		554
501	sub set_parent {	555	sub set_parent {
502	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
503		557
504	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
505	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
506	}	560	}
507		561
508	sub realloc {	562	sub realloc {
509	my ($self) = @_;	563	my ($self) = @_;
…		…
535		589
536	# using global variables seems a bit hacky, but passing through all drawing	590	# using global variables seems a bit hacky, but passing through all drawing
537	# functions seems pointless.	591	# functions seems pointless.
538	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	592	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
539		593
540	sub draw {	594	#sub draw {
541	my ($self) = @_;	595	#CFPlus.xs
542
543	return unless $self->{h} && $self->{w};
544
545	# update screen rectangle
546	local $draw_x = $draw_x + $self->{x};
547	local $draw_y = $draw_y + $self->{y};
548
549	# skip widgets that are entirely outside the drawing area
550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552
553	glPushMatrix;
554	glTranslate $self->{x}, $self->{y}, 0;
555
556	if ($self == $HOVER && $self->{can_hover}) {
557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
558	glEnable GL_BLEND;
559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
560	glBegin GL_QUADS;
561	glVertex 0 , 0;
562	glVertex $self->{w}, 0;
563	glVertex $self->{w}, $self->{h};
564	glVertex 0 , $self->{h};
565	glEnd;
566	glDisable GL_BLEND;
567	}
568
569	if ($ENV{CFPLUS_DEBUG} & 1) {
570	glPushMatrix;
571	glColor 1, 1, 0, 1;
572	glTranslate 0.375, 0.375;
573	glBegin GL_LINE_LOOP;
574	glVertex 0 , 0;
575	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;
578	glEnd;
579	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}
582
583	$self->_draw;
584	glPopMatrix;
585	}
586		596
587	sub _draw {	597	sub _draw {
588	my ($self) = @_;	598	my ($self) = @_;
589		599
590	warn "no draw defined for $self\n";	600	warn "no draw defined for $self\n";
591	}	601	}
592		602
593	sub DESTROY {	603	sub DESTROY {
594	my ($self) = @_;	604	my ($self) = @_;
595		605
596	return if CFClient::in_destruct;	606	return if CFPlus::in_destruct;
597		607
598	delete $WIDGET{$self+0};	608	local $@;
599
600	eval { $self->destroy };	609	eval { $self->destroy };
601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	610	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		611
		612	delete $WIDGET{$self+0};
602	}	613	}
603		614
604	#############################################################################	615	#############################################################################
605		616
606	package CFClient::UI::DrawBG;	617	package CFPlus::UI::DrawBG;
607		618
608	our @ISA = CFClient::UI::Base::;	619	our @ISA = CFPlus::UI::Base::;
609		620
610	use strict;	621	use strict;
611	use CFClient::OpenGL;	622	use CFPlus::OpenGL;
612		623
613	sub new {	624	sub new {
614	my $class = shift;	625	my $class = shift;
615
616	# range [value, low, high, page]
617		626
618	$class->SUPER::new (	627	$class->SUPER::new (
619	#bg => [0, 0, 0, 0.2],	628	#bg => [0, 0, 0, 0.2],
620	#active_bg => [1, 1, 1, 0.5],	629	#active_bg => [1, 1, 1, 0.5],
621	@_	630	@_
…		…
633	my ($w, $h) = @$self{qw(w h)};	642	my ($w, $h) = @$self{qw(w h)};
634		643
635	glEnable GL_BLEND;	644	glEnable GL_BLEND;
636	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	645	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
637	glColor_premultiply @$color;	646	glColor_premultiply @$color;
638
639	glBegin GL_QUADS;
640	glVertex 0 , 0;
641	glVertex 0 , $h;
642	glVertex $w, $h;	647	glRect 0, 0, $w, $h;
643	glVertex $w, 0;
644	glEnd;
645
646	glDisable GL_BLEND;	648	glDisable GL_BLEND;
647	}	649	}
648	}	650	}
649		651
650	#############################################################################	652	#############################################################################
651		653
652	package CFClient::UI::Empty;	654	package CFPlus::UI::Empty;
653		655
654	our @ISA = CFClient::UI::Base::;	656	our @ISA = CFPlus::UI::Base::;
655		657
656	sub new {	658	sub new {
657	my ($class, %arg) = @_;	659	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	660	$class->SUPER::new (can_events => 0, %arg);
659	}	661	}
…		…
666		668
667	sub draw { }	669	sub draw { }
668		670
669	#############################################################################	671	#############################################################################
670		672
671	package CFClient::UI::Container;	673	package CFPlus::UI::Container;
672		674
673	our @ISA = CFClient::UI::Base::;	675	our @ISA = CFPlus::UI::Base::;
674		676
675	sub new {	677	sub new {
676	my ($class, %arg) = @_;	678	my ($class, %arg) = @_;
677		679
678	my $children = delete $arg{children};	680	my $children = delete $arg{children};
…		…
682	can_events => 0,	684	can_events => 0,
683	%arg,	685	%arg,
684	);	686	);
685		687
686	$self->add (@$children)	688	$self->add (@$children)
687	if $children;	689	if $children && @$children;
688		690
689	$self	691	$self
		692	}
		693
		694	sub realloc {
		695	my ($self) = @_;
		696
		697	$self->{force_realloc} = 1;
		698	$self->{force_size_alloc} = 1;
		699	$self->SUPER::realloc;
690	}	700	}
691		701
692	sub add {	702	sub add {
693	my ($self, @widgets) = @_;	703	my ($self, @widgets) = @_;
694		704
695	$_->set_parent ($self)	705	$_->set_parent ($self)
696	for @widgets;	706	for @widgets;
697		707
		708	# TODO: only do this in widgets that need it, e.g. root, fixed
698	use sort 'stable';	709	use sort 'stable';
699		710
700	$self->{children} = [	711	$self->{children} = [
701	sort { $a->{z} <=> $b->{z} }	712	sort { $a->{z} <=> $b->{z} }
702	@{$self->{children}}, @widgets	713	@{$self->{children}}, @widgets
703	];	714	];
704		715
705	$self->realloc;	716	$self->realloc;
		717
		718	$self->emit (c_add => \@widgets);
		719
		720	map $_+0, @widgets
706	}	721	}
707		722
708	sub children {	723	sub children {
709	@{ $_[0]{children} }	724	@{ $_[0]{children} }
710	}	725	}
711		726
712	sub remove {	727	sub remove {
713	my ($self, $child) = @_;	728	my ($self, @widgets) = @_;
714		729
		730	$self->emit (c_remove => \@widgets);
		731
		732	for my $child (@widgets) {
715	delete $child->{parent};	733	delete $child->{parent};
716	$child->hide;	734	$child->hide;
717
718	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	735	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		736	}
719		737
720	$self->realloc;	738	$self->realloc;
721	}	739	}
722		740
723	sub clear {	741	sub clear {
724	my ($self) = @_;	742	my ($self) = @_;
725		743
726	my $children = delete $self->{children};	744	my $children = $self->{children};
727	$self->{children} = [];	745	$self->{children} = [];
728		746
729	for (@$children) {	747	for (@$children) {
730	delete $_->{parent};	748	delete $_->{parent};
731	$_->hide;	749	$_->hide;
…		…
751	}	769	}
752		770
753	sub _draw {	771	sub _draw {
754	my ($self) = @_;	772	my ($self) = @_;
755		773
756	$_->draw for @{$self->{children}};	774	$_->draw for $self->visible_children;
757	}	775	}
758		776
759	#############################################################################	777	#############################################################################
760		778
761	package CFClient::UI::Bin;	779	package CFPlus::UI::Bin;
762		780
763	our @ISA = CFClient::UI::Container::;	781	our @ISA = CFPlus::UI::Container::;
764		782
765	sub new {	783	sub new {
766	my ($class, %arg) = @_;	784	my ($class, %arg) = @_;
767		785
768	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	786	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769		787
770	$class->SUPER::new (children => [$child], %arg)	788	$class->SUPER::new (children => [$child], %arg)
771	}	789	}
772		790
773	sub add {	791	sub add {
774	my ($self, $child) = @_;	792	my ($self, $child) = @_;
775		793
776	$self->SUPER::remove ($_) for @{ $self->{children} };	794	$self->clear;
777	$self->SUPER::add ($child);	795	$self->SUPER::add ($child);
778	}	796	}
779		797
780	sub remove {	798	sub remove {
781	my ($self, $widget) = @_;	799	my ($self, $widget) = @_;
782		800
783	$self->SUPER::remove ($widget);	801	$self->SUPER::remove ($widget);
784		802
785	$self->{children} = [new CFClient::UI::Empty]	803	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	804	unless @{$self->{children}};
787	}	805	}
788		806
789	sub child { $_[0]->{children}[0] }	807	sub child { $_[0]->{children}[0] }
790		808
…		…
802		820
803	#############################################################################	821	#############################################################################
804		822
805	# back-buffered drawing area	823	# back-buffered drawing area
806		824
807	package CFClient::UI::Window;	825	package CFPlus::UI::Window;
808		826
809	our @ISA = CFClient::UI::Bin::;	827	our @ISA = CFPlus::UI::Bin::;
810		828
811	use CFClient::OpenGL;	829	use CFPlus::OpenGL;
812		830
813	sub new {	831	sub new {
814	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
815		833
816	my $self = $class->SUPER::new (%arg);	834	my $self = $class->SUPER::new (%arg);
…		…
838	}	856	}
839		857
840	sub render_child {	858	sub render_child {
841	my ($self) = @_;	859	my ($self) = @_;
842		860
843	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	861	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844	glClearColor 0, 0, 0, 0;	862	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	863	glClear GL_COLOR_BUFFER_BIT;
846		864
847	{	865	{
848	package CFClient::UI::Base;	866	package CFPlus::UI::Base;
849		867
850	($draw_x, $draw_y, $draw_w, $draw_h) =	868	local ($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	869	(0, 0, $self->{w}, $self->{h});
		870
		871	$self->_render;
852	}	872	}
853
854	$self->_render;
855	};	873	};
856	}	874	}
857		875
858	sub _draw {	876	sub _draw {
859	my ($self) = @_;	877	my ($self) = @_;
860
861	my ($w, $h) = @$self{qw(w h)};
862		878
863	my $tex = $self->{texture}	879	my $tex = $self->{texture}
864	or return;	880	or return;
865		881
866	glEnable GL_TEXTURE_2D;	882	glEnable GL_TEXTURE_2D;
867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	883	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868	glColor 0, 0, 0, 1;	884	glColor 0, 0, 0, 1;
869		885
870	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	886	$tex->draw_quad_alpha_premultiplied (0, 0);
871		887
872	glDisable GL_TEXTURE_2D;	888	glDisable GL_TEXTURE_2D;
873	}	889	}
874		890
875	#############################################################################	891	#############################################################################
876		892
877	package CFClient::UI::ViewPort;	893	package CFPlus::UI::ViewPort;
878		894
		895	use List::Util qw(min max);
		896
879	our @ISA = CFClient::UI::Window::;	897	our @ISA = CFPlus::UI::Window::;
880		898
881	sub new {	899	sub new {
882	my $class = shift;	900	my $class = shift;
883		901
884	$class->SUPER::new (	902	$class->SUPER::new (
…		…
891	sub size_request {	909	sub size_request {
892	my ($self) = @_;	910	my ($self) = @_;
893		911
894	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	912	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
895		913
896	$w = 10 if $self->{scroll_x};	914	$w = 1 if $self->{scroll_x};
897	$h = 10 if $self->{scroll_y};	915	$h = 1 if $self->{scroll_y};
898		916
899	($w, $h)	917	($w, $h)
900	}	918	}
901		919
902	sub invoke_size_allocate {	920	sub invoke_size_allocate {
…		…
914	}	932	}
915		933
916	sub set_offset {	934	sub set_offset {
917	my ($self, $x, $y) = @_;	935	my ($self, $x, $y) = @_;
918		936
		937	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		938	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		939
		940	if ($x != $self->{view_x} or $y != $self->{view_y}) {
919	$self->{view_x} = int $x;	941	$self->{view_x} = $x;
920	$self->{view_y} = int $y;	942	$self->{view_y} = $y;
921		943
		944	$self->emit (changed => $x, $y);
922	$self->update;	945	$self->update;
		946	}
		947	}
		948
		949	sub set_center {
		950	my ($self, $x, $y) = @_;
		951
		952	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		953	}
		954
		955	sub make_visible {
		956	my ($self, $x, $y, $border) = @_;
		957
		958	if ( $x < $self->{view_x} + $self->{w} * $border
		959	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		960	|| $y < $self->{view_y} + $self->{h} * $border
		961	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		962	) {
		963	$self->set_center ($x, $y);
		964	}
923	}	965	}
924		966
925	# hmm, this does not work for topleft of $self... but we should not ask for that	967	# hmm, this does not work for topleft of $self... but we should not ask for that
926	sub coord2local {	968	sub coord2local {
927	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
…		…
942	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
943		985
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	986	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	987	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	988	) {
947	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	989	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948	} else {	990	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	991	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	992	}
951	}	993	}
952		994
953	sub _render {	995	sub _render {
954	my ($self) = @_;	996	my ($self) = @_;
955		997
956	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	998	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
957	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	999	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958		1000
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1001	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1002
961	$self->SUPER::_render;	1003	$self->SUPER::_render;
962	}	1004	}
963		1005
964	#############################################################################	1006	#############################################################################
965		1007
966	package CFClient::UI::ScrolledWindow;	1008	package CFPlus::UI::ScrolledWindow;
967		1009
968	our @ISA = CFClient::UI::HBox::;	1010	our @ISA = CFPlus::UI::Table::;
969		1011
970	sub new {	1012	sub new {
971	my ($class, %arg) = @_;	1013	my ($class, %arg) = @_;
972		1014
973	my $child = delete $arg{child};	1015	my $child = delete $arg{child};
974		1016
975	my $self;	1017	my $self;
976		1018
977	my $slider = new CFClient::UI::Slider	1019	my $hslider = new CFPlus::UI::Slider
		1020	c_col => 0,
		1021	c_row => 1,
		1022	vertical => 0,
		1023	range => [0, 0, 1, 0.01], # HACK fix
		1024	on_changed => sub {
		1025	$self->{hpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1027	},
		1028	;
		1029
		1030	my $vslider = new CFPlus::UI::Slider
		1031	c_col => 1,
		1032	c_row => 0,
978	vertical => 1,	1033	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1034	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1035	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1036	$self->{vpos} = $_[1];
		1037	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
982	},	1038	},
983	;	1039	;
984		1040
985	$self = $class->SUPER::new (	1041	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1042	scroll_x => 0,
		1043	scroll_y => 1,
		1044	can_events => 1,
987	slider => $slider,	1045	hslider => $hslider,
		1046	vslider => $vslider,
		1047	col_expand => [1, 0],
		1048	row_expand => [1, 0],
988	%arg,	1049	%arg,
989	);	1050	);
990		1051
		1052	$self->{vp} = new CFPlus::UI::ViewPort
		1053	c_col => 0,
		1054	c_row => 0,
		1055	expand => 1,
		1056	scroll_x => $self->{scroll_x},
		1057	scroll_y => $self->{scroll_y},
		1058	on_changed => sub {
		1059	my ($vp, $x, $y) = @_;
		1060
		1061	$vp->{parent}{hslider}->set_value ($x);
		1062	$vp->{parent}{vslider}->set_value ($y);
		1063
		1064	0
		1065	},
		1066	on_size_allocate => sub {
		1067	my ($vp, $w, $h) = @_;
		1068	$vp->{parent}->update_slider;
		1069	0
		1070	},
		1071	;
		1072
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1073	$self->SUPER::add ($self->{vp});
		1074
992	$self->add ($child) if $child;	1075	$self->add ($child) if $child;
993		1076
994	$self	1077	$self
995	}	1078	}
996
997	#TODO# update range on size_allocate depending on child
998		1079
999	sub add {	1080	sub add {
1000	my ($self, $widget) = @_;	1081	my ($self, $widget) = @_;
1001		1082
1002	$self->{vp}->add ($self->{child} = $widget);	1083	$self->{vp}->add ($self->{child} = $widget);
1003	}	1084	}
1004		1085
		1086	sub set_offset { shift->{vp}->set_offset (@_) }
		1087	sub set_center { shift->{vp}->set_center (@_) }
		1088	sub make_visible { shift->{vp}->make_visible (@_) }
		1089
		1090	sub update_slider {
		1091	my ($self) = @_;
		1092
		1093	my $child = ($self->{vp} or return)->child;
		1094
		1095	if ($self->{scroll_x}) {
		1096	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1097	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1098
		1099	my $visible = $w1 > $w2;
		1100	if ($visible != $self->{hslider_visible}) {
		1101	$self->{hslider_visible} = $visible;
		1102	$visible ? $self->SUPER::add ($self->{hslider})
		1103	: $self->SUPER::remove ($self->{hslider});
		1104	}
		1105	}
		1106
		1107	if ($self->{scroll_y}) {
		1108	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1109	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1110
		1111	my $visible = $h1 > $h2;
		1112	if ($visible != $self->{vslider_visible}) {
		1113	$self->{vslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{vslider})
		1115	: $self->SUPER::remove ($self->{vslider});
		1116	}
		1117	}
		1118	}
		1119
		1120	sub start_dragging {
		1121	my ($self, $ev) = @_;
		1122
		1123	$self->grab_focus;
		1124
		1125	my $ox = $self->{vp}{view_x};
		1126	my $oy = $self->{vp}{view_y};
		1127
		1128	$self->{motion} = sub {
		1129	my ($ev, $x, $y) = @_;
		1130
		1131	$ox -= $ev->{xrel};
		1132	$oy -= $ev->{yrel};
		1133
		1134	$self->{vp}->set_offset ($ox, $oy);
		1135	};
		1136	}
		1137
		1138	sub invoke_mouse_wheel {
		1139	my ($self, $ev) = @_;
		1140
		1141	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1142	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1143
		1144	1
		1145	}
		1146
1005	sub invoke_button_down {	1147	sub invoke_button_down {
1006	my ($self, $ev) = @_;	1148	my ($self, $ev, $x, $y) = @_;
1007		1149
1008	warn "button down $ev->{button}\n";#d#	1150	if ($ev->{button} == 2) {
		1151	$self->start_dragging ($ev);
		1152	return 1;
1009		1153	}
		1154
1010	0	1155	0
1011	}	1156	}
1012		1157
1013	sub update_slider {	1158	sub invoke_button_up {
1014	my ($self) = @_;	1159	my ($self, $ev, $x, $y) = @_;
1015		1160
1016	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1161	if (delete $self->{motion}) {
1017	}	1162	return 1;
		1163	}
1018		1164
1019	sub update {	1165	0
1020	my ($self) = @_;	1166	}
1021		1167
1022	$self->SUPER::update;	1168	sub invoke_mouse_motion {
		1169	my ($self, $ev, $x, $y) = @_;
1023		1170
1024	$self->update_slider;	1171	if ($self->{motion}) {
		1172	$self->{motion}->($ev, $x, $y);
		1173	return 1;
		1174	}
		1175
		1176	0
1025	}	1177	}
1026		1178
1027	sub invoke_size_allocate {	1179	sub invoke_size_allocate {
1028	my ($self, $w, $h) = @_;	1180	my ($self, $w, $h) = @_;
1029		1181
1030	$self->update_slider;	1182	$self->update_slider;
1031
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1183	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1184	}
1034		1185
1035	#############################################################################	1186	#############################################################################
1036		1187
1037	package CFClient::UI::Frame;	1188	package CFPlus::UI::Frame;
1038		1189
1039	our @ISA = CFClient::UI::Bin::;	1190	our @ISA = CFPlus::UI::Bin::;
1040		1191
1041	use CFClient::OpenGL;	1192	use CFPlus::OpenGL;
1042		1193
1043	sub new {	1194	sub new {
1044	my $class = shift;	1195	my $class = shift;
1045		1196
1046	$class->SUPER::new (	1197	$class->SUPER::new (
…		…
1056	my ($w, $h) = @$self{qw(w h)};	1207	my ($w, $h) = @$self{qw(w h)};
1057		1208
1058	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1059	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1060	glColor_premultiply @{ $self->{bg} };	1211	glColor_premultiply @{ $self->{bg} };
1061
1062	glBegin GL_QUADS;
1063	glVertex 0 , 0;
1064	glVertex 0 , $h;
1065	glVertex $w, $h;	1212	glRect 0, 0, $w, $h;
1066	glVertex $w, 0;
1067	glEnd;
1068
1069	glDisable GL_BLEND;	1213	glDisable GL_BLEND;
1070	}	1214	}
1071		1215
1072	$self->SUPER::_draw;	1216	$self->SUPER::_draw;
1073	}	1217	}
1074		1218
1075	#############################################################################	1219	#############################################################################
1076		1220
1077	package CFClient::UI::FancyFrame;	1221	package CFPlus::UI::FancyFrame;
1078		1222
1079	our @ISA = CFClient::UI::Bin::;	1223	our @ISA = CFPlus::UI::Bin::;
1080		1224
1081	use CFClient::OpenGL;	1225	use CFPlus::OpenGL;
		1226
		1227	sub new {
		1228	my ($class, %arg) = @_;
		1229
		1230	if ((exists $arg{label}) && !ref $arg{label}) {
		1231	$arg{label} = new CFPlus::UI::Label
		1232	align => 1,
		1233	valign => 0,
		1234	text => $arg{label},
		1235	fontsize => ($arg{border} || 0.8) * 0.75;
		1236	}
		1237
		1238	my $self = $class->SUPER::new (
		1239	# label => "",
		1240	fg => [0.6, 0.3, 0.1],
		1241	border => 0.8,
		1242	style => 'single',
		1243	%arg,
		1244	);
		1245
		1246	$self
		1247	}
		1248
		1249	sub add {
		1250	my ($self, @widgets) = @_;
		1251
		1252	$self->SUPER::add (@widgets);
		1253	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1254	}
		1255
		1256	sub border {
		1257	int $_[0]{border} * $::FONTSIZE
		1258	}
		1259
		1260	sub size_request {
		1261	my ($self) = @_;
		1262
		1263	($self->{label_w}, undef) = $self->{label}->size_request
		1264	if $self->{label};
		1265
		1266	my ($w, $h) = $self->SUPER::size_request;
		1267
		1268	(
		1269	$w + $self->border * 2,
		1270	$h + $self->border * 2,
		1271	)
		1272	}
		1273
		1274	sub invoke_size_allocate {
		1275	my ($self, $w, $h) = @_;
		1276
		1277	my $border = $self->border;
		1278
		1279	$w -= List::Util::max 0, $border * 2;
		1280	$h -= List::Util::max 0, $border * 2;
		1281
		1282	if (my $label = $self->{label}) {
		1283	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1284	$label->{h} = List::Util::min $h, $border;
		1285	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1286	}
		1287
		1288	$self->child->configure ($border, $border, $w, $h);
		1289
		1290	1
		1291	}
		1292
		1293	sub _draw {
		1294	my ($self) = @_;
		1295
		1296	my $child = $self->{children}[0];
		1297
		1298	my $border = $self->border;
		1299	my ($w, $h) = ($self->{w}, $self->{h});
		1300
		1301	$child->draw;
		1302
		1303	glColor @{$self->{fg}};
		1304	glBegin GL_LINE_STRIP;
		1305	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1306	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1307	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1308	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1309	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1310	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1311	glEnd;
		1312
		1313	if ($self->{label}) {
		1314	glTranslate $border * 2, 0;
		1315	$self->{label}->_draw;
		1316	}
		1317	}
		1318
		1319	#############################################################################
		1320
		1321	package CFPlus::UI::Toplevel;
		1322
		1323	our @ISA = CFPlus::UI::Bin::;
		1324
		1325	use CFPlus::OpenGL;
1082		1326
1083	my $bg =	1327	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1328	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1329	mipmap => 1, wrap => 1;
1086		1330
1087	my @border =	1331	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1332	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1333	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1334
		1335	my @icon =
		1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1337	qw(x1_move.png x1_resize.png);
1090		1338
1091	sub new {	1339	sub new {
1092	my ($class, %arg) = @_;	1340	my ($class, %arg) = @_;
1093		1341
1094	my $self = $class->SUPER::new (	1342	my $self = $class->SUPER::new (
…		…
1099	min_w => 64,	1347	min_w => 64,
1100	min_h => 32,	1348	min_h => 32,
1101	%arg,	1349	%arg,
1102	);	1350	);
1103		1351
1104	$self->{title_widget} = new CFClient::UI::Label	1352	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1353	align => 0,
1106	valign => 1,	1354	valign => 1,
1107	text => $self->{title},	1355	text => $self->{title},
1108	fontsize => $self->{border},	1356	fontsize => $self->{border},
1109	if exists $self->{title};	1357	if exists $self->{title};
1110		1358
1111	if ($self->{has_close_button}) {	1359	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1360	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1361	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1362	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1363	on_activate => sub { $self->emit ("delete") };
1116		1364
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1365	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1366	}
1119		1367
1120	$self	1368	$self
1121	}	1369	}
1122		1370
1123	sub add {	1371	sub add {
1124	my ($self, @widgets) = @_;	1372	my ($self, @widgets) = @_;
1125		1373
1126	$self->SUPER::add (@widgets);	1374	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1375	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1376	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1377	}
1130		1378
1131	sub border {	1379	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1380	int $_[0]{border} * $::FONTSIZE
1133	}	1381	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1489	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1490
1243	! ! $self->{motion}	1491	! ! $self->{motion}
1244	}	1492	}
1245		1493
		1494	sub invoke_visibility_change {
		1495	my ($self, $visible) = @_;
		1496
		1497	delete $self->{motion} unless $visible;
		1498
		1499	0
		1500	}
		1501
1246	sub _draw {	1502	sub _draw {
1247	my ($self) = @_;	1503	my ($self) = @_;
1248		1504
1249	my $child = $self->{children}[0];	1505	my $child = $self->{children}[0];
1250		1506
…		…
1255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1256		1512
1257	my $border = $self->border;	1513	my $border = $self->border;
1258		1514
1259	glColor @{ $self->{border_bg} };	1515	glColor @{ $self->{border_bg} };
1260	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1516	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1261	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1517	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1262	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1518	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1263	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1519	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1520
		1521	# move
		1522	my $w2 = ($w - $border) * .5;
		1523	my $h2 = ($h - $border) * .5;
		1524	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1525	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1526	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1527
		1528	# resize
		1529	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1531	unless $self->{has_close_button};
		1532	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1533	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1264		1534
1265	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1535	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1266	glColor @{ $self->{bg} };	1536	glColor @{ $self->{bg} };
1267		1537
1268	# TODO: repeat texture not scale	1538	# TODO: repeat texture not scale
…		…
1287	if $self->{close_button};	1557	if $self->{close_button};
1288	}	1558	}
1289		1559
1290	#############################################################################	1560	#############################################################################
1291		1561
1292	package CFClient::UI::Table;	1562	package CFPlus::UI::Table;
1293		1563
1294	our @ISA = CFClient::UI::Base::;	1564	our @ISA = CFPlus::UI::Container::;
1295		1565
1296	use List::Util qw(max sum);	1566	use List::Util qw(max sum);
1297		1567
1298	use CFClient::OpenGL;	1568	use CFPlus::OpenGL;
1299		1569
1300	sub new {	1570	sub new {
1301	my $class = shift;	1571	my $class = shift;
1302		1572
1303	$class->SUPER::new (	1573	$class->SUPER::new (
1304	col_expand => [],	1574	col_expand => [],
		1575	row_expand => [],
1305	@_,	1576	@_,
1306	)	1577	)
1307	}	1578	}
1308		1579
1309	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}
1312
1313	sub add {	1580	sub add {
1314	my ($self, $x, $y, $child) = @_;	1581	my ($self, @widgets) = @_;
1315		1582
1316	$child->set_parent ($self);	1583	for my $child (@widgets) {
1317	$self->{children}[$y][$x] = $child;	1584	$child->{c_rowspan} ||= 1;
		1585	$child->{c_colspan} ||= 1;
		1586	}
1318		1587
1319	$self->realloc;	1588	$self->SUPER::add (@widgets);
1320	}	1589	}
1321		1590
1322	sub remove {	1591	sub add_at {
		1592	my $self = shift;
		1593
		1594	my @widgets;
		1595
		1596	while (@_) {
		1597	my ($col, $row, $child) = splice @_, 0, 3, ();
		1598
		1599	$child->{c_row} = $row;
		1600	$child->{c_col} = $col;
		1601
		1602	push @widgets, $child;
		1603	}
		1604
		1605	$self->add (@widgets);
		1606	}
		1607
		1608	sub get_wh {
1323	my ($self, $child) = @_;	1609	my ($self) = @_;
1324		1610
1325	# TODO: not yet implemented	1611	my (@w, @h);
1326	}
1327
1328	# TODO: move to container class maybe? send children a signal on removal?
1329	sub clear {
1330	my ($self) = @_;
1331		1612
1332	my @children = $self->children;	1613	my @children = $self->children;
1333	delete $self->{children};	1614
		1615	# first pass, columns
		1616	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1617	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1618
		1619	my $sw = sum @w[$c .. $c + $cs - 1];
		1620
		1621	if ($w > $sw) {
		1622	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1623	}
1334		1624	}
1335	for (@children) {
1336	delete $_->{parent};
1337	$_->hide;
1338	}
1339		1625
1340	$self->realloc;	1626	# second pass, rows
1341	}	1627	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1342
1343	sub get_wh {
1344	my ($self) = @_;
1345
1346	my (@w, @h);
1347
1348	for my $y (0 .. $#{$self->{children}}) {
1349	my $row = $self->{children}[$y]
1350	or next;
1351
1352	for my $x (0 .. $#$row) {
1353	my $widget = $row->[$x]
1354	or next;
1355	my ($w, $h) = @$widget{qw(req_w req_h)};	1628	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1356		1629
1357	$w[$x] = max $w[$x], $w;	1630	my $sh = sum @h[$r .. $r + $rs - 1];
1358	$h[$y] = max $h[$y], $h;	1631
		1632	if ($h > $sh) {
		1633	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1359	}	1634	}
1360	}	1635	}
1361		1636
1362	(\@w, \@h)	1637	(\@w, \@h)
1363	}	1638	}
…		…
1379	my ($ws, $hs) = $self->get_wh;	1654	my ($ws, $hs) = $self->get_wh;
1380		1655
1381	my $req_w = (sum @$ws) || 1;	1656	my $req_w = (sum @$ws) || 1;
1382	my $req_h = (sum @$hs) || 1;	1657	my $req_h = (sum @$hs) || 1;
1383		1658
1384	# TODO: nicer code && do row_expand	1659	# now linearly scale the rows/columns to the allocated size
1385	my @col_expand = @{$self->{col_expand}};	1660	my @col_expand = @{$self->{col_expand}};
1386	@col_expand = (1) x @$ws unless @col_expand;	1661	@col_expand = (1) x @$ws unless @col_expand;
1387	my $col_expand = (sum @col_expand) || 1;	1662	my $col_expand = (sum @col_expand) || 1;
1388		1663
1389	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1664	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1665
1393	CFClient::UI::harmonize $ws;	1666	CFPlus::UI::harmonize $ws;
		1667
		1668	my @row_expand = @{$self->{row_expand}};
		1669	@row_expand = (1) x @$ws unless @row_expand;
		1670	my $row_expand = (sum @row_expand) || 1;
		1671
		1672	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1673
1394	CFClient::UI::harmonize $hs;	1674	CFPlus::UI::harmonize $hs;
1395		1675
1396	my $y;	1676	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1677	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1397		1678
1398	for my $r (0 .. $#{$self->{children}}) {	1679	for my $widget ($self->children) {
1399	my $row = $self->{children}[$r]	1680	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1400	or next;
1401		1681
1402	my $x = 0;	1682	$widget->configure (
1403	my $row_h = $hs->[$r];	1683	$x[$c], $y[$r],
		1684	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1404		1685	);
1405	for my $c (0 .. $#$row) {	1686	}
1406	my $col_w = $ws->[$c];
1407		1687
1408	if (my $widget = $row->[$c]) {	1688	1
1409	$widget->configure ($x, $y, $col_w, $row_h);	1689	}
1410	}
1411		1690
1412	$x += $col_w;	1691	#############################################################################
		1692
		1693	package CFPlus::UI::Fixed;
		1694
		1695	use List::Util qw(min max);
		1696
		1697	our @ISA = CFPlus::UI::Container::;
		1698
		1699	sub _scale($$$) {
		1700	my ($rel, $val, $max) = @_;
		1701
		1702	$rel ? $val * $max : $val
		1703	}
		1704
		1705	sub size_request {
		1706	my ($self) = @_;
		1707
		1708	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1709
		1710	# determine overall size by querying abs widgets
		1711	for my $child ($self->visible_children) {
		1712	unless ($child->{c_rel}) {
		1713	my $x = $child->{c_x};
		1714	my $y = $child->{c_y};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1413	}	1718	}
		1719	}
1414		1720
1415	$y += $row_h;	1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	if ($child->{c_rel}) {
		1727	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1728	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1729
		1730	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1731	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1732	}
		1733	}
		1734
		1735	my $W = $x2 - $x1;
		1736	my $H = $y2 - $y1;
		1737
		1738	($W, $H)
		1739	}
		1740
		1741	sub invoke_size_allocate {
		1742	my ($self, $W, $H) = @_;
		1743
		1744	for my $child ($self->visible_children) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x += $child->{c_halign} * $child->{req_w};
		1749	$y += $child->{c_valign} * $child->{req_h};
		1750
		1751	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1416	}	1752	}
1417		1753
1418	1	1754	1
1419	}	1755	}
1420		1756
1421	sub find_widget {
1422	my ($self, $x, $y) = @_;
1423
1424	$x -= $self->{x};
1425	$y -= $self->{y};
1426
1427	my $res;
1428
1429	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1430	$res = $_->find_widget ($x, $y)
1431	and return $res;
1432	}
1433
1434	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1435	}
1436
1437	sub _draw {
1438	my ($self) = @_;
1439
1440	for (grep $_, @{$self->{children}}) {
1441	$_->draw for grep $_, @$_;
1442	}
1443	}
1444
1445	#############################################################################	1757	#############################################################################
1446		1758
1447	package CFClient::UI::Box;	1759	package CFPlus::UI::Box;
1448		1760
1449	our @ISA = CFClient::UI::Container::;	1761	our @ISA = CFPlus::UI::Container::;
1450		1762
1451	sub size_request {	1763	sub size_request {
1452	my ($self) = @_;	1764	my ($self) = @_;
		1765
		1766	my @children = $self->visible_children;
1453		1767
1454	$self->{vertical}	1768	$self->{vertical}
1455	? (	1769	? (
1456	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1770	(List::Util::max map $_->{req_w}, @children),
1457	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_h}, @children),
1458	)	1772	)
1459	: (	1773	: (
1460	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::sum map $_->{req_w}, @children),
1461	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::max map $_->{req_h}, @children),
1462	)	1776	)
1463	}	1777	}
1464		1778
1465	sub invoke_size_allocate {	1779	sub invoke_size_allocate {
1466	my ($self, $w, $h) = @_;	1780	my ($self, $w, $h) = @_;
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1801	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1802	for 0 .. $#children;
1489	}	1803	}
1490	}	1804	}
1491		1805
1492	CFClient::UI::harmonize \@req;	1806	CFPlus::UI::harmonize \@req;
1493		1807
1494	my $pos = 0;	1808	my $pos = 0;
1495	for (0 .. $#children) {	1809	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1810	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1811	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1816	1
1503	}	1817	}
1504		1818
1505	#############################################################################	1819	#############################################################################
1506		1820
1507	package CFClient::UI::HBox;	1821	package CFPlus::UI::HBox;
1508		1822
1509	our @ISA = CFClient::UI::Box::;	1823	our @ISA = CFPlus::UI::Box::;
1510		1824
1511	sub new {	1825	sub new {
1512	my $class = shift;	1826	my $class = shift;
1513		1827
1514	$class->SUPER::new (	1828	$class->SUPER::new (
…		…
1517	)	1831	)
1518	}	1832	}
1519		1833
1520	#############################################################################	1834	#############################################################################
1521		1835
1522	package CFClient::UI::VBox;	1836	package CFPlus::UI::VBox;
1523		1837
1524	our @ISA = CFClient::UI::Box::;	1838	our @ISA = CFPlus::UI::Box::;
1525		1839
1526	sub new {	1840	sub new {
1527	my $class = shift;	1841	my $class = shift;
1528		1842
1529	$class->SUPER::new (	1843	$class->SUPER::new (
…		…
1532	)	1846	)
1533	}	1847	}
1534		1848
1535	#############################################################################	1849	#############################################################################
1536		1850
1537	package CFClient::UI::Label;	1851	package CFPlus::UI::Label;
1538		1852
1539	our @ISA = CFClient::UI::DrawBG::;	1853	our @ISA = CFPlus::UI::DrawBG::;
1540		1854
1541	use CFClient::OpenGL;	1855	use CFPlus::OpenGL;
1542		1856
1543	sub new {	1857	sub new {
1544	my ($class, %arg) = @_;	1858	my ($class, %arg) = @_;
1545		1859
1546	my $self = $class->SUPER::new (	1860	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1863	#active_bg => none
1550	#font => default_font	1864	#font => default_font
1551	#text => initial text	1865	#text => initial text
1552	#markup => initial narkup	1866	#markup => initial narkup
1553	#max_w => maximum pixel width	1867	#max_w => maximum pixel width
		1868	#style => 0, # render flags
1554	ellipsise => 3, # end	1869	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1870	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1871	fontsize => 1,
1557	align => -1,	1872	align => -1,
1558	valign => -1,	1873	valign => -1,
1559	padding_x => 2,	1874	padding_x => 2,
1560	padding_y => 2,	1875	padding_y => 2,
1561	can_events => 0,	1876	can_events => 0,
1562	%arg	1877	%arg
1563	);	1878	);
1564		1879
1565	if (exists $self->{template}) {	1880	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1881	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1882	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1883	$self->{template} = $layout;
1569	}	1884	}
1570		1885
1571	if (exists $self->{markup}) {	1886	if (exists $self->{markup}) {
…		…
1575	}	1890	}
1576		1891
1577	$self	1892	$self
1578	}	1893	}
1579		1894
1580	sub escape($) {
1581	local $_ = $_[0];
1582
1583	s/&/&amp;/g;
1584	s/>/&gt;/g;
1585	s/</&lt;/g;
1586
1587	$_
1588	}
1589
1590	sub update {	1895	sub update {
1591	my ($self) = @_;	1896	my ($self) = @_;
1592		1897
1593	delete $self->{texture};	1898	delete $self->{texture};
1594	$self->SUPER::update;	1899	$self->SUPER::update;
…		…
1597	sub realloc {	1902	sub realloc {
1598	my ($self) = @_;	1903	my ($self) = @_;
1599		1904
1600	delete $self->{ox};	1905	delete $self->{ox};
1601	$self->SUPER::realloc;	1906	$self->SUPER::realloc;
		1907	}
		1908
		1909	sub clear {
		1910	my ($self) = @_;
		1911
		1912	$self->set_text ("");
1602	}	1913	}
1603		1914
1604	sub set_text {	1915	sub set_text {
1605	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1606		1917
…		…
1714	: ($self->{w} - $size->[0]) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1715		2026
1716	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1717	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1718	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
		2030
		2031	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1719	};	2032	};
1720		2033
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	2034	# unless ($self->{list}) {
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	2035	# $self->{list} = CFPlus::OpenGL::glGenList;
1723		2036	# CFPlus::OpenGL::glNewList $self->{list};
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	2037	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2038	# CFPlus::OpenGL::glEndList;
		2039	# }
		2040	#
		2041	# CFPlus::OpenGL::glCallList $self->{list};
		2042
		2043	$self->{layout}->draw;
1725	}	2044	}
		2045
		2046	#sub destroy {
		2047	# my ($self) = @_;
		2048	#
		2049	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2050	#
		2051	# $self->SUPER::destroy;
		2052	#}
1726		2053
1727	#############################################################################	2054	#############################################################################
1728		2055
1729	package CFClient::UI::EntryBase;	2056	package CFPlus::UI::EntryBase;
1730		2057
1731	our @ISA = CFClient::UI::Label::;	2058	our @ISA = CFPlus::UI::Label::;
1732		2059
1733	use CFClient::OpenGL;	2060	use CFPlus::OpenGL;
1734		2061
1735	sub new {	2062	sub new {
1736	my $class = shift;	2063	my $class = shift;
1737		2064
1738	$class->SUPER::new (	2065	$class->SUPER::new (
1739	fg => [1, 1, 1],	2066	fg => [1, 1, 1],
1740	bg => [0, 0, 0, 0.2],	2067	bg => [0, 0, 0, 0.2],
		2068	outline => [0.6, 0.3, 0.1],
1741	active_bg => [1, 1, 1, 0.5],	2069	active_bg => [0, 0, 1, .2],
1742	active_fg => [0, 0, 0],	2070	active_fg => [1, 1, 1],
		2071	active_outline => [1, 1, 0],
1743	can_hover => 1,	2072	can_hover => 1,
1744	can_focus => 1,	2073	can_focus => 1,
1745	valign => 0,	2074	valign => 0,
1746	can_events => 1,	2075	can_events => 1,
		2076	ellipsise => 0,
1747	#text => ...	2077	#text => ...
1748	#hidden => "*",	2078	#hidden => "*",
1749	@_	2079	@_
1750	)	2080	)
1751	}	2081	}
…		…
1796	my $sym = $ev->{sym};	2126	my $sym = $ev->{sym};
1797	my $uni = $ev->{unicode};	2127	my $uni = $ev->{unicode};
1798		2128
1799	my $text = $self->get_text;	2129	my $text = $self->get_text;
1800		2130
		2131	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2132
1801	if ($uni == 8) {	2133	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2134	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	2135	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	2136	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	2137	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	2138	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	2139	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	2140	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	2141	} elsif ($sym == CFPlus::SDLK_HOME) {
		2142	# what a hack
		2143	$self->{cursor} =
		2144	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2145	? length $1
		2146	: 0;
		2147	} elsif ($sym == CFPlus::SDLK_END) {
		2148	# uh, again
		2149	$self->{cursor} =
		2150	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2151	? $self->{cursor} + length $1
		2152	: length $self->{text};
		2153	} elsif ($uni == 21) { # ctrl-u
		2154	$text = "";
1810	$self->{cursor} = 0;	2155	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {
1812	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	2156	} elsif ($uni == 27) {
1814	$self->emit ('escape');	2157	$self->emit ('escape');
1815	} elsif ($uni) {	2158	} elsif ($uni == 0x0d) {
		2159	substr $text, $self->{cursor}++, 0, "\012";
		2160	} elsif ($uni >= 0x20) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	2161	substr $text, $self->{cursor}++, 0, chr $uni;
1817	} else {	2162	} else {
1818	return 0;	2163	return 0;
1819	}	2164	}
1820		2165
1821	$self->_set_text ($text);	2166	$self->_set_text ($text);
1822		2167
1823	$self->realloc;	2168	$self->realloc;
		2169	$self->update;
1824		2170
1825	1	2171	1
1826	}	2172	}
1827		2173
1828	sub invoke_focus_in {	2174	sub invoke_focus_in {
…		…
1870	glColor_premultiply @{$self->{bg}};	2216	glColor_premultiply @{$self->{bg}};
1871	}	2217	}
1872		2218
1873	glEnable GL_BLEND;	2219	glEnable GL_BLEND;
1874	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1875	glBegin GL_QUADS;
1876	glVertex 0 , 0;
1877	glVertex 0 , $self->{h};
1878	glVertex $self->{w}, $self->{h};	2221	glRect 0, 0, $self->{w}, $self->{h};
1879	glVertex $self->{w}, 0;
1880	glEnd;
1881	glDisable GL_BLEND;	2222	glDisable GL_BLEND;
1882		2223
1883	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
1884		2225
1885	#TODO: force update every cursor change :(	2226	#TODO: force update every cursor change :(
…		…
1887		2228
1888	unless (exists $self->{cur_h}) {	2229	unless (exists $self->{cur_h}) {
1889	my $text = substr $self->{text}, 0, $self->{cursor};	2230	my $text = substr $self->{text}, 0, $self->{cursor};
1890	utf8::encode $text;	2231	utf8::encode $text;
1891		2232
1892	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2233	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1893	}	2234	}
1894		2235
1895	glColor @{$self->{fg}};	2236	glColor_premultiply @{$self->{active_fg}};
1896	glBegin GL_LINES;	2237	glBegin GL_LINES;
1897	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1898	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2239	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	2240	glEnd;
1900	}
1901	}
1902		2241
		2242	glLineWidth 3;
		2243	glColor @{$self->{active_outline}};
		2244	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2245	glLineWidth 1;
		2246
		2247	} else {
		2248	glColor @{$self->{outline}};
		2249	glBegin GL_LINE_STRIP;
		2250	glVertex .5, $self->{h} * .5;
		2251	glVertex .5, $self->{h} - 2.5;
		2252	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2253	glVertex $self->{w} - .5, $self->{h} * .5;
		2254	glEnd;
		2255	}
		2256	}
		2257
		2258	#############################################################################
		2259
1903	package CFClient::UI::Entry;	2260	package CFPlus::UI::Entry;
1904		2261
1905	our @ISA = CFClient::UI::EntryBase::;	2262	our @ISA = CFPlus::UI::EntryBase::;
1906		2263
1907	use CFClient::OpenGL;	2264	use CFPlus::OpenGL;
1908		2265
1909	sub invoke_key_down {	2266	sub invoke_key_down {
1910	my ($self, $ev) = @_;	2267	my ($self, $ev) = @_;
1911		2268
1912	my $sym = $ev->{sym};	2269	my $sym = $ev->{sym};
1913		2270
1914	if ($sym == 13) {	2271	if ($ev->{uni} == 0x0d || $sym == 13) {
1915	unshift @{$self->{history}},	2272	unshift @{$self->{history}},
1916	my $txt = $self->get_text;	2273	my $txt = $self->get_text;
1917		2274
1918	$self->{history_pointer} = -1;	2275	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	2276	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	2277	$self->emit (activate => $txt);
1921	$self->update;	2278	$self->update;
1922		2279
1923	} elsif ($sym == CFClient::SDLK_UP) {	2280	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	2281	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	2282	$self->{history_saveback} = $self->get_text;
1926	}	2283	}
1927	if (@{$self->{history} || []} > 0) {	2284	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	2285	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	2287	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	2288	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2289	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	2290	}
1934		2291
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	2292	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	2293	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2294	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		2295
1939	if ($self->{history_pointer} >= 0) {	2296	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2297	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2306	1
1950	}	2307	}
1951		2308
1952	#############################################################################	2309	#############################################################################
1953		2310
		2311	package CFPlus::UI::TextEdit;
		2312
		2313	our @ISA = CFPlus::UI::EntryBase::;
		2314
		2315	use CFPlus::OpenGL;
		2316
		2317	sub move_cursor_ver {
		2318	my ($self, $dy) = @_;
		2319
		2320	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2321
		2322	$y += $dy;
		2323
		2324	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2325	$self->{cursor} = $index;
		2326	delete $self->{cur_h};
		2327	$self->update;
		2328	return;
		2329	}
		2330	}
		2331
		2332	sub invoke_key_down {
		2333	my ($self, $ev) = @_;
		2334
		2335	my $sym = $ev->{sym};
		2336
		2337	if ($sym == CFPlus::SDLK_UP) {
		2338	$self->move_cursor_ver (-1);
		2339	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2340	$self->move_cursor_ver (+1);
		2341	} else {
		2342	return $self->SUPER::invoke_key_down ($ev)
		2343	}
		2344
		2345	1
		2346	}
		2347
		2348	#############################################################################
		2349
1954	package CFClient::UI::Button;	2350	package CFPlus::UI::ButtonBin;
1955		2351
1956	our @ISA = CFClient::UI::Label::;	2352	our @ISA = CFPlus::UI::Bin::;
1957		2353
1958	use CFClient::OpenGL;	2354	use CFPlus::OpenGL;
1959		2355
1960	my @tex =	2356	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2358	qw(b1_button_inactive.png b1_button_active.png);
1963		2359
1964	sub new {	2360	sub new {
1965	my $class = shift;	2361	my $class = shift;
1966		2362
1967	$class->SUPER::new (	2363	$class->SUPER::new (
1968	padding_x => 4,
1969	padding_y => 4,
1970	fg => [1, 1, 1],
1971	active_fg => [0, 0, 1],
1972	can_hover => 1,	2364	can_hover => 1,
1973	align => 0,	2365	align => 0,
1974	valign => 0,	2366	valign => 0,
1975	can_events => 1,	2367	can_events => 1,
1976	@_	2368	@_
…		…
1988	}	2380	}
1989		2381
1990	sub _draw {	2382	sub _draw {
1991	my ($self) = @_;	2383	my ($self) = @_;
1992		2384
1993	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1994
1995	glEnable GL_TEXTURE_2D;	2385	glEnable GL_TEXTURE_2D;
1996	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2386	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997	glColor 0, 0, 0, 1;	2387	glColor 0, 0, 0, 1;
1998		2388
		2389	my $tex = $tex[$GRAB == $self];
1999	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2390	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2000		2391
2001	glDisable GL_TEXTURE_2D;	2392	glDisable GL_TEXTURE_2D;
2002		2393
2003	$self->SUPER::_draw;	2394	$self->SUPER::_draw;
2004	}	2395	}
2005		2396
2006	#############################################################################	2397	#############################################################################
2007		2398
		2399	package CFPlus::UI::Button;
		2400
		2401	our @ISA = CFPlus::UI::Label::;
		2402
		2403	use CFPlus::OpenGL;
		2404
		2405	my @tex =
		2406	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2407	qw(b1_button_inactive.png b1_button_active.png);
		2408
		2409	sub new {
		2410	my $class = shift;
		2411
		2412	$class->SUPER::new (
		2413	padding_x => 4,
		2414	padding_y => 4,
		2415	fg => [1.0, 1.0, 1.0],
		2416	active_fg => [0.8, 0.8, 0.8],
		2417	can_hover => 1,
		2418	align => 0,
		2419	valign => 0,
		2420	can_events => 1,
		2421	@_
		2422	)
		2423	}
		2424
		2425	sub invoke_button_up {
		2426	my ($self, $ev, $x, $y) = @_;
		2427
		2428	$self->emit ("activate")
		2429	if $x >= 0 && $x < $self->{w}
		2430	&& $y >= 0 && $y < $self->{h};
		2431
		2432	1
		2433	}
		2434
		2435	sub _draw {
		2436	my ($self) = @_;
		2437
		2438	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2439
		2440	glEnable GL_TEXTURE_2D;
		2441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2442	glColor 0, 0, 0, 1;
		2443
		2444	my $tex = $tex[$GRAB == $self];
		2445	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2446
		2447	glDisable GL_TEXTURE_2D;
		2448
		2449	$self->SUPER::_draw;
		2450	}
		2451
		2452	#############################################################################
		2453
		2454	package CFPlus::UI::CheckBox;
		2455
		2456	our @ISA = CFPlus::UI::DrawBG::;
		2457
		2458	my @tex =
		2459	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2460	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2461
		2462	use CFPlus::OpenGL;
		2463
		2464	sub new {
		2465	my $class = shift;
		2466
		2467	$class->SUPER::new (
		2468	padding_x => 2,
		2469	padding_y => 2,
		2470	fg => [1, 1, 1],
		2471	active_fg => [1, 1, 0],
		2472	bg => [0, 0, 0, 0.2],
		2473	active_bg => [1, 1, 1, 0.5],
		2474	state => 0,
		2475	can_hover => 1,
		2476	@_
		2477	)
		2478	}
		2479
		2480	sub size_request {
		2481	my ($self) = @_;
		2482
		2483	(6) x 2
		2484	}
		2485
		2486	sub toggle {
		2487	my ($self) = @_;
		2488
		2489	$self->{state} = !$self->{state};
		2490	$self->emit (changed => $self->{state});
		2491	$self->update;
		2492	}
		2493
		2494	sub invoke_button_down {
		2495	my ($self, $ev, $x, $y) = @_;
		2496
		2497	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2498	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2499	$self->toggle;
		2500	} else {
		2501	return 0
		2502	}
		2503
		2504	1
		2505	}
		2506
		2507	sub _draw {
		2508	my ($self) = @_;
		2509
		2510	$self->SUPER::_draw;
		2511
		2512	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2513
		2514	my ($w, $h) = @$self{qw(w h)};
		2515
		2516	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2517
		2518	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2519
		2520	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2521
		2522	glEnable GL_TEXTURE_2D;
		2523	$tex->draw_quad_alpha (0, 0, $s, $s);
		2524	glDisable GL_TEXTURE_2D;
		2525	}
		2526
		2527	#############################################################################
		2528
		2529	package CFPlus::UI::Image;
		2530
		2531	our @ISA = CFPlus::UI::Base::;
		2532
		2533	use CFPlus::OpenGL;
		2534
		2535	our %texture_cache;
		2536
		2537	sub new {
		2538	my $class = shift;
		2539
		2540	my $self = $class->SUPER::new (
		2541	can_events => 0,
		2542	scale => 1,
		2543	@_,
		2544	);
		2545
		2546	$self->{path} || $self->{tex}
		2547	or Carp::croak "'path' or 'tex' attributes required";
		2548
		2549	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2550	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2551
		2552	CFPlus::weaken $texture_cache{$self->{path}};
		2553
		2554	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2555
		2556	$self
		2557	}
		2558
		2559	sub STORABLE_freeze {
		2560	my ($self, $cloning) = @_;
		2561
		2562	$self->{path}
		2563	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2564
		2565	$self->{path}
		2566	}
		2567
		2568	sub STORABLE_attach {
		2569	my ($self, $cloning, $path) = @_;
		2570
		2571	$self->new (path => $path)
		2572	}
		2573
		2574	sub size_request {
		2575	my ($self) = @_;
		2576
		2577	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2578	}
		2579
		2580	sub _draw {
		2581	my ($self) = @_;
		2582
		2583	my $tex = $self->{tex};
		2584
		2585	my ($w, $h) = ($self->{w}, $self->{h});
		2586
		2587	if ($self->{rot90}) {
		2588	glRotate 90, 0, 0, 1;
		2589	glTranslate 0, -$self->{w}, 0;
		2590
		2591	($w, $h) = ($h, $w);
		2592	}
		2593
		2594	glEnable GL_TEXTURE_2D;
		2595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2596
		2597	$tex->draw_quad_alpha (0, 0, $w, $h);
		2598
		2599	glDisable GL_TEXTURE_2D;
		2600	}
		2601
		2602	#############################################################################
		2603
2008	package CFClient::UI::ImageButton;	2604	package CFPlus::UI::ImageButton;
2009		2605
2010	our @ISA = CFClient::UI::Image::;	2606	our @ISA = CFPlus::UI::Image::;
2011		2607
2012	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2013		2609
2014	my %textures;	2610	my %textures;
2015		2611
2016	sub new {	2612	sub new {
2017	my $class = shift;	2613	my $class = shift;
…		…
2027	can_events => 1,	2623	can_events => 1,
2028	@_	2624	@_
2029	);	2625	);
2030	}	2626	}
2031		2627
		2628	sub invoke_button_down {
		2629	my ($self, $ev, $x, $y) = @_;
		2630
		2631	1
		2632	}
		2633
2032	sub invoke_button_up {	2634	sub invoke_button_up {
2033	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2034		2636
2035	$self->emit ("activate")	2637	$self->emit ("activate")
2036	if $x >= 0 && $x < $self->{w}	2638	if $x >= 0 && $x < $self->{w}
…		…
2039	1	2641	1
2040	}	2642	}
2041		2643
2042	#############################################################################	2644	#############################################################################
2043		2645
2044	package CFClient::UI::CheckBox;
2045
2046	our @ISA = CFClient::UI::DrawBG::;
2047
2048	my @tex =
2049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052	use CFClient::OpenGL;
2053
2054	sub new {
2055	my $class = shift;
2056
2057	$class->SUPER::new (
2058	padding_x => 2,
2059	padding_y => 2,
2060	fg => [1, 1, 1],
2061	active_fg => [1, 1, 0],
2062	bg => [0, 0, 0, 0.2],
2063	active_bg => [1, 1, 1, 0.5],
2064	state => 0,
2065	can_hover => 1,
2066	@_
2067	)
2068	}
2069
2070	sub size_request {
2071	my ($self) = @_;
2072
2073	(6) x 2
2074	}
2075
2076	sub toggle {
2077	my ($self) = @_;
2078
2079	$self->{state} = !$self->{state};
2080	$self->emit (changed => $self->{state});
2081	$self->update;
2082	}
2083
2084	sub invoke_button_down {
2085	my ($self, $ev, $x, $y) = @_;
2086
2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089	$self->toggle;
2090	} else {
2091	return 0
2092	}
2093
2094	1
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099
2100	$self->SUPER::_draw;
2101
2102	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104	my ($w, $h) = @$self{qw(w h)};
2105
2106	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110	my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112	glEnable GL_TEXTURE_2D;
2113	$tex->draw_quad_alpha (0, 0, $s, $s);
2114	glDisable GL_TEXTURE_2D;
2115	}
2116
2117	#############################################################################
2118
2119	package CFClient::UI::Image;	2646	package CFPlus::UI::VGauge;
2120		2647
2121	our @ISA = CFClient::UI::Base::;	2648	our @ISA = CFPlus::UI::Base::;
2122
2123	use CFClient::OpenGL;
2124
2125	our %texture_cache;
2126
2127	sub new {
2128	my $class = shift;
2129
2130	my $self = $class->SUPER::new (
2131	can_events => 0,
2132	@_,
2133	);
2134
2135	$self->{path} || $self->{tex}
2136	or Carp::croak "'path' or 'tex' attributes required";
2137
2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145	$self
2146	}
2147
2148	sub size_request {
2149	my ($self) = @_;
2150
2151	($self->{tex}{w}, $self->{tex}{h})
2152	}
2153
2154	sub _draw {
2155	my ($self) = @_;
2156
2157	my $tex = $self->{tex};
2158
2159	my ($w, $h) = ($self->{w}, $self->{h});
2160
2161	if ($self->{rot90}) {
2162	glRotate 90, 0, 0, 1;
2163	glTranslate 0, -$self->{w}, 0;
2164
2165	($w, $h) = ($h, $w);
2166	}
2167
2168	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171	$tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173	glDisable GL_TEXTURE_2D;
2174	}
2175
2176	#############################################################################
2177
2178	package CFClient::UI::VGauge;
2179
2180	our @ISA = CFClient::UI::Base::;
2181		2649
2182	use List::Util qw(min max);	2650	use List::Util qw(min max);
2183		2651
2184	use CFClient::OpenGL;	2652	use CFPlus::OpenGL;
2185		2653
2186	my %tex = (	2654	my %tex = (
2187	food => [	2655	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2656	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2657	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2658	],
2191	grace => [	2659	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2661	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2662	],
2195	hp => [	2663	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2664	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2665	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2666	],
2199	mana => [	2667	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2668	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2669	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2670	],
2203	);	2671	);
2204		2672
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2673	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2309	}	2777	}
2310		2778
2311	#############################################################################	2779	#############################################################################
2312		2780
		2781	package CFPlus::UI::Progress;
		2782
		2783	our @ISA = CFPlus::UI::Label::;
		2784
		2785	use CFPlus::OpenGL;
		2786
		2787	sub new {
		2788	my ($class, %arg) = @_;
		2789
		2790	my $self = $class->SUPER::new (
		2791	fg => [1, 1, 1],
		2792	bg => [0, 0, 1, 0.2],
		2793	bar => [0.7, 0.5, 0.1, 0.8],
		2794	outline => [0.4, 0.3, 0],
		2795	fontsize => 0.9,
		2796	valign => 0,
		2797	align => 0,
		2798	can_events => 1,
		2799	ellipsise => 1,
		2800	label => "%d%%",
		2801	%arg,
		2802	);
		2803
		2804	$self->set_value ($arg{value} || -1);
		2805
		2806	$self
		2807	}
		2808
		2809	sub set_label {
		2810	my ($self, $label) = @_;
		2811
		2812	return if $self->{label} eq $label;
		2813	$self->{label} = $label;
		2814
		2815	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2816	}
		2817
		2818	sub set_value {
		2819	my ($self, $value) = @_;
		2820
		2821	if ($self->{value} ne $value) {
		2822	$self->{value} = $value;
		2823
		2824	if ($value < 0) {
		2825	$self->set_text ("-");
		2826	} else {
		2827	$self->set_text (sprintf $self->{label}, $value * 100);
		2828	}
		2829
		2830	$self->update;
		2831	}
		2832	}
		2833
		2834	sub _draw {
		2835	my ($self) = @_;
		2836
		2837	glEnable GL_BLEND;
		2838	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2839
		2840	if ($self->{value} >= 0) {
		2841	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2842
		2843	glColor_premultiply @{$self->{bar}};
		2844	glRect 2, 2, $s, $self->{h} - 2;
		2845	glColor_premultiply @{$self->{bg}};
		2846	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2847	}
		2848
		2849	glColor_premultiply @{$self->{outline}};
		2850	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2851
		2852	glDisable GL_BLEND;
		2853
		2854	{
		2855	local $self->{bg}; # do not draw background
		2856	$self->SUPER::_draw;
		2857	}
		2858	}
		2859
		2860	#############################################################################
		2861
		2862	package CFPlus::UI::ExperienceProgress;
		2863
		2864	our @ISA = CFPlus::UI::Progress::;
		2865
		2866	sub new {
		2867	my ($class, %arg) = @_;
		2868
		2869	my $self = $class->SUPER::new (
		2870	tooltip => sub {
		2871	my ($self) = @_;
		2872
		2873	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2874	$self->{lvl},
		2875	::formsep ($self->{exp}),
		2876	::formsep ($self->{nxt}),
		2877	::formsep ($self->{nxt} - $self->{exp}),
		2878	},
		2879	%arg
		2880	);
		2881
		2882	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2883	if $::CONN;
		2884
		2885	$self
		2886	}
		2887
		2888	sub DESTROY {
		2889	my ($self) = @_;
		2890
		2891	delete $::CONN->{on_exp_update}{$self+0}
		2892	if $::CONN;
		2893
		2894	$self->SUPER::DESTROY;
		2895	}
		2896
		2897	sub set_value {
		2898	my ($self, $lvl, $exp) = @_;
		2899
		2900	$self->{lvl} = $lvl;
		2901	$self->{exp} = $exp;
		2902
		2903	my $v = -1;
		2904
		2905	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2906	my $l0 = $table->[$lvl - 1];
		2907	my $l1 = $table->[$lvl];
		2908
		2909	$self->{nxt} = $l1;
		2910
		2911	$v = ($exp - $l0) / ($l1 - $l0);
		2912	}
		2913
		2914	$self->SUPER::set_value ($v);
		2915	}
		2916
		2917	#############################################################################
		2918
2313	package CFClient::UI::Gauge;	2919	package CFPlus::UI::Gauge;
2314		2920
2315	our @ISA = CFClient::UI::VBox::;	2921	our @ISA = CFPlus::UI::VBox::;
2316		2922
2317	sub new {	2923	sub new {
2318	my ($class, %arg) = @_;	2924	my ($class, %arg) = @_;
2319		2925
2320	my $self = $class->SUPER::new (	2926	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2928	can_hover => 1,
2323	can_events => 1,	2929	can_events => 1,
2324	%arg,	2930	%arg,
2325	);	2931	);
2326		2932
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2933	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2934	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2935	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2936
2331	$self	2937	$self
2332	}	2938	}
2333		2939
2334	sub set_fontsize {	2940	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2961	$self->{value}->set_text ($val);
2356	}	2962	}
2357		2963
2358	#############################################################################	2964	#############################################################################
2359		2965
2360	package CFClient::UI::Slider;	2966	package CFPlus::UI::Slider;
2361		2967
2362	use strict;	2968	use strict;
2363		2969
2364	use CFClient::OpenGL;	2970	use CFPlus::OpenGL;
2365		2971
2366	our @ISA = CFClient::UI::DrawBG::;	2972	our @ISA = CFPlus::UI::DrawBG::;
2367		2973
2368	my @tex =	2974	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2975	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2976	qw(s1_slider.png s1_slider_bg.png);
2371		2977
2372	sub new {	2978	sub new {
2373	my $class = shift;	2979	my $class = shift;
2374		2980
…		…
2442		3048
2443	$self->SUPER::invoke_button_down ($ev, $x, $y);	3049	$self->SUPER::invoke_button_down ($ev, $x, $y);
2444		3050
2445	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3051	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2446		3052
2447	$self->invoke_mouse_motion ($ev, $x, $y)	3053	$self->invoke_mouse_motion ($ev, $x, $y);
		3054
		3055	1
2448	}	3056	}
2449		3057
2450	sub invoke_mouse_motion {	3058	sub invoke_mouse_motion {
2451	my ($self, $ev, $x, $y) = @_;	3059	my ($self, $ev, $x, $y) = @_;
2452		3060
…		…
2459		3067
2460	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3068	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2461	} else {	3069	} else {
2462	return 0;	3070	return 0;
2463	}	3071	}
		3072
		3073	1
		3074	}
		3075
		3076	sub invoke_mouse_wheel {
		3077	my ($self, $ev) = @_;
		3078
		3079	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3080
		3081	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3082
		3083	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2464		3084
2465	1	3085	1
2466	}	3086	}
2467		3087
2468	sub update {	3088	sub update {
…		…
2519	glDisable GL_TEXTURE_2D;	3139	glDisable GL_TEXTURE_2D;
2520	}	3140	}
2521		3141
2522	#############################################################################	3142	#############################################################################
2523		3143
2524	package CFClient::UI::ValSlider;	3144	package CFPlus::UI::ValSlider;
2525		3145
2526	our @ISA = CFClient::UI::HBox::;	3146	our @ISA = CFPlus::UI::HBox::;
2527		3147
2528	sub new {	3148	sub new {
2529	my ($class, %arg) = @_;	3149	my ($class, %arg) = @_;
2530		3150
2531	my $range = delete $arg{range};	3151	my $range = delete $arg{range};
2532		3152
2533	my $self = $class->SUPER::new (	3153	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3154	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3155	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	3156	to_value => sub { shift },
2537	from_value => sub { shift },	3157	from_value => sub { shift },
2538	%arg,	3158	%arg,
2539	);	3159	);
2540		3160
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	3180	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	3181	sub set_value { shift->{slider}->set_value (@_) }
2562		3182
2563	#############################################################################	3183	#############################################################################
2564		3184
2565	package CFClient::UI::TextScroller;	3185	package CFPlus::UI::TextScroller;
2566		3186
2567	our @ISA = CFClient::UI::HBox::;	3187	our @ISA = CFPlus::UI::HBox::;
2568		3188
2569	use CFClient::OpenGL;	3189	use CFPlus::OpenGL;
2570		3190
2571	sub new {	3191	sub new {
2572	my $class = shift;	3192	my $class = shift;
2573		3193
2574	my $self = $class->SUPER::new (	3194	my $self = $class->SUPER::new (
2575	fontsize => 1,	3195	fontsize => 1,
2576	can_events => 0,	3196	can_events => 1,
2577	indent => 0,	3197	indent => 0,
2578	#font => default_font	3198	#font => default_font
2579	@_,	3199	@_,
2580		3200
2581	layout => (new CFClient::Layout),	3201	layout => (new CFPlus::Layout),
2582	par => [],	3202	par => [],
		3203	max_par => 0,
2583	height => 0,	3204	height => 0,
2584	children => [	3205	children => [
2585	(new CFClient::UI::Empty expand => 1),	3206	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	3207	(new CFPlus::UI::Slider vertical => 1),
2587	],	3208	],
2588	);	3209	);
2589		3210
2590	$self->{children}[1]->connect (changed => sub { $self->update });	3211	$self->{children}[1]->connect (changed => sub { $self->update });
2591		3212
…		…
2600	}	3221	}
2601		3222
2602	sub size_request {	3223	sub size_request {
2603	my ($self) = @_;	3224	my ($self) = @_;
2604		3225
2605	my ($empty, $slider) = @{ $self->{children} };	3226	my ($empty, $slider) = $self->visible_children;
2606		3227
2607	local $self->{children} = [$empty, $slider];	3228	local $self->{children} = [$empty, $slider];
2608	$self->SUPER::size_request	3229	$self->SUPER::size_request
2609	}	3230	}
2610		3231
…		…
2621		3242
2622	$self->reflow;	3243	$self->reflow;
2623		3244
2624	local $self->{children} = [$empty, $slider];	3245	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	3246	$self->SUPER::invoke_size_allocate ($w, $h)
		3247	}
		3248
		3249	sub invoke_mouse_wheel {
		3250	my ($self, $ev) = @_;
		3251
		3252	return 0 unless $ev->{dy}; # only vertical movements
		3253
		3254	$self->{children}[1]->emit (mouse_wheel => $ev);
		3255
		3256	1
2626	}	3257	}
2627		3258
2628	sub get_layout {	3259	sub get_layout {
2629	my ($self, $para) = @_;	3260	my ($self, $para) = @_;
2630		3261
…		…
2658		3289
2659	# todo: base offset on lines or so, not on pixels	3290	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	3291	$self->{children}[1]->set_value ($offset);
2661	}	3292	}
2662		3293
		3294	sub current_paragraph {
		3295	my ($self) = @_;
		3296
		3297	$self->{top_paragraph} - 1
		3298	}
		3299
		3300	sub scroll_to {
		3301	my ($self, $para) = @_;
		3302
		3303	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3304
		3305	$self->{scroll_to} = $para;
		3306	$self->update;
		3307	}
		3308
2663	sub clear {	3309	sub clear {
2664	my ($self) = @_;	3310	my ($self) = @_;
2665		3311
2666	my (undef, undef, @other) = @{ $self->{children} };	3312	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	3313	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	3316	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3317	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	3318	}
2673		3319
2674	sub add_paragraph {	3320	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	3321	my $self = shift;
2676		3322
2677	my ($text, @w) = ref $para ? @$para : $para;	3323	for my $para (@_) {
2678
2679	$para = {	3324	$para = {
		3325	fg => [1, 1, 1, 1],
		3326	indent => 0,
		3327	markup => "",
		3328	widget => [],
		3329	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	3330	w => 1e10,
2681	wrapped => 1,	3331	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	3332	};
2687		3333
2688	$self->add (@w) if @w;	3334	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	3335	push @{$self->{par}}, $para;
		3336	}
		3337
		3338	if (my $max = $self->{max_par}) {
		3339	shift @{$self->{par}} while @{$self->{par}} > $max;
		3340	}
2690		3341
2691	$self->{need_reflow}++;	3342	$self->{need_reflow}++;
2692	$self->update;	3343	$self->update;
2693	}	3344	}
2694		3345
2695	sub scroll_to_bottom {	3346	sub scroll_to_bottom {
2696	my ($self) = @_;	3347	my ($self) = @_;
2697		3348
2698	$self->{scroll_to_bottom} = 1;	3349	$self->{scroll_to} = $#{$self->{par}};
2699	$self->update;	3350	$self->update;
2700	}	3351	}
2701		3352
		3353	sub force_uptodate {
		3354	my ($self) = @_;
		3355
		3356	if (delete $self->{need_reflow}) {
		3357	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3358
		3359	my $height = 0;
		3360
		3361	for my $para (@{$self->{par}}) {
		3362	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3363	my $layout = $self->get_layout ($para);
		3364	my ($w, $h) = $layout->size;
		3365
		3366	$para->{w} = $w + $para->{indent};
		3367	$para->{h} = $h;
		3368	$para->{wrapped} = $layout->has_wrapped;
		3369	}
		3370
		3371	$para->{y} = $height;
		3372	$height += $para->{h};
		3373	}
		3374
		3375	$self->{height} = $height;
		3376	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3377
		3378	delete $self->{texture};
		3379	}
		3380
		3381	if (my $paridx = delete $self->{scroll_to}) {
		3382	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3383	}
		3384	}
		3385
2702	sub update {	3386	sub update {
2703	my ($self) = @_;	3387	my ($self) = @_;
2704		3388
2705	$self->SUPER::update;	3389	$self->SUPER::update;
2706		3390
2707	return unless $self->{h} > 0;	3391	return unless $self->{h} > 0;
2708		3392
2709	delete $self->{texture};	3393	delete $self->{texture};
2710		3394
2711	$ROOT->on_post_alloc ($self => sub {	3395	$ROOT->on_post_alloc ($self => sub {
		3396	$self->force_uptodate;
		3397
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		3399
2714	if (delete $self->{need_reflow}) {
2715	my $height = 0;
2716
2717	for my $para (@{$self->{par}}) {
2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719	my $layout = $self->get_layout ($para);
2720	my ($w, $h) = $layout->size;
2721
2722	$para->{w} = $w + $para->{indent};
2723	$para->{h} = $h;
2724	$para->{wrapped} = $layout->has_wrapped;
2725	}
2726
2727	$height += $para->{h};
2728	}
2729
2730	$self->{height} = $height;
2731
2732	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734	delete $self->{texture};
2735	}
2736
2737	if (delete $self->{scroll_to_bottom}) {
2738	$self->{children}[1]->set_value (1e10);
2739	}
2740
2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3400	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	3401	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	3402	glClear GL_COLOR_BUFFER_BIT;
2744		3403
		3404	package CFPlus::UI::Base;
		3405	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3406	(0, 0, $self->{w}, $self->{h});
		3407
		3408	my $top = int $self->{children}[1]{range}[0];
		3409
		3410	my $paridx = 0;
		3411	my $top_paragraph;
2745	my $top = int $self->{children}[1]{range}[0];	3412	my $top = int $self->{children}[1]{range}[0];
2746		3413
2747	my $y0 = $top;	3414	my $y0 = $top;
2748	my $y1 = $top + $H;	3415	my $y1 = $top + $H;
2749		3416
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	3417	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	3418	my $h = $para->{h};
		3419	my $y = $para->{y};
2754		3420
2755	if ($y0 < $y + $h && $y < $y1) {	3421	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	3422	my $layout = $self->get_layout ($para);
2758		3423
2759	$layout->render ($para->{indent}, $y - $y0);	3424	$layout->render ($para->{indent}, $y - $y0);
		3425	$layout->draw;
2760		3426
2761	if (my @w = @{ $para->{widget} }) {	3427	if (my @w = @{ $para->{widget} }) {
2762	my @s = $layout->get_shapes;	3428	my @s = $layout->get_shapes;
2763		3429
2764	for (@w) {	3430	for (@w) {
…		…
2770	$_->draw;	3436	$_->draw;
2771	}	3437	}
2772	}	3438	}
2773	}	3439	}
2774		3440
2775	$y += $h;	3441	$paridx++;
		3442	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3443	}
		3444
		3445	$self->{top_paragraph} = $top_paragraph;
2777	};	3446	};
2778	});	3447	});
2779	}	3448	}
2780		3449
2781	sub reconfigure {	3450	sub reconfigure {
…		…
2799	$self->{children}[1]->draw;	3468	$self->{children}[1]->draw;
2800	}	3469	}
2801		3470
2802	#############################################################################	3471	#############################################################################
2803		3472
2804	package CFClient::UI::Animator;	3473	package CFPlus::UI::Animator;
2805		3474
2806	use CFClient::OpenGL;	3475	use CFPlus::OpenGL;
2807		3476
2808	our @ISA = CFClient::UI::Bin::;	3477	our @ISA = CFPlus::UI::Bin::;
2809		3478
2810	sub moveto {	3479	sub moveto {
2811	my ($self, $x, $y) = @_;	3480	my ($self, $x, $y) = @_;
2812		3481
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3482	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	3510	glPopMatrix;
2842	}	3511	}
2843		3512
2844	#############################################################################	3513	#############################################################################
2845		3514
2846	package CFClient::UI::Flopper;	3515	package CFPlus::UI::Flopper;
2847		3516
2848	our @ISA = CFClient::UI::Button::;	3517	our @ISA = CFPlus::UI::Button::;
2849		3518
2850	sub new {	3519	sub new {
2851	my $class = shift;	3520	my $class = shift;
2852		3521
2853	my $self = $class->SUPER::new (	3522	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	3534	$self->{other}->toggle_visibility;
2866	}	3535	}
2867		3536
2868	#############################################################################	3537	#############################################################################
2869		3538
2870	package CFClient::UI::Tooltip;	3539	package CFPlus::UI::Tooltip;
2871		3540
2872	our @ISA = CFClient::UI::Bin::;	3541	our @ISA = CFPlus::UI::Bin::;
2873		3542
2874	use CFClient::OpenGL;	3543	use CFPlus::OpenGL;
2875		3544
2876	sub new {	3545	sub new {
2877	my $class = shift;	3546	my $class = shift;
2878		3547
2879	$class->SUPER::new (	3548	$class->SUPER::new (
…		…
2883	}	3552	}
2884		3553
2885	sub set_tooltip_from {	3554	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3555	my ($self, $widget) = @_;
2887		3556
2888	my $tooltip = $widget->{tooltip};	3557	my $tip = $widget->{tooltip};
		3558	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3559
		3560	$tip = CFPlus::Pod::section_label tooltip => $1
		3561	if $tip =~ /^#(.*)$/;
2889		3562
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3563	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3564	$tip .= "\n\n" . (ref $widget) . "\n"
2892	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3565	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2893	. "req $widget->{req_w} $widget->{req_h}\n"	3566	. "req $widget->{req_w} $widget->{req_h}\n"
2894	. "visible $widget->{visible}";	3567	. "visible $widget->{visible}";
2895	}	3568	}
2896		3569
2897	$tooltip =~ s/^\n+//;	3570	$tip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3571	$tip =~ s/\n+$//;
2899		3572
2900	$self->add (new CFClient::UI::Label	3573	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3574	markup => $tip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3575	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3576	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3577	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3578	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3579	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3580	);
2908	}	3581	}
2909		3582
…		…
2928		3601
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3602	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3603	my $widget = $self->{owner}
2931	or return;	3604	or return;
2932		3605
		3606	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3607	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3608
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3609	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3610	if $x + $self->{w} > $self->{root}{w};
2937		3611
2938	$self->move_abs ($x, $y);	3612	$self->move_abs ($x, $y);
		3613	} else {
		3614	$self->hide;
		3615	}
2939	});	3616	});
2940	}	3617	}
2941		3618
2942	sub _draw {	3619	sub _draw {
2943	my ($self) = @_;	3620	my ($self) = @_;
2944		3621
2945	glTranslate 0.375, 0.375;
2946
2947	my ($w, $h) = @$self{qw(w h)};	3622	my ($w, $h) = @$self{qw(w h)};
2948		3623
2949	glColor 1, 0.8, 0.4;	3624	glColor 1, 0.8, 0.4;
2950	glBegin GL_QUADS;	3625	glRect 0, 0, $w, $h;
2951	glVertex 0 , 0;
2952	glVertex 0 , $h;
2953	glVertex $w, $h;
2954	glVertex $w, 0;
2955	glEnd;
2956		3626
2957	glColor 0, 0, 0;	3627	glColor 0, 0, 0;
2958	glBegin GL_LINE_LOOP;	3628	glRect_lineloop .5, .5, $w + .5, $h + .5;
2959	glVertex 0 , 0;
2960	glVertex 0 , $h;
2961	glVertex $w, $h;
2962	glVertex $w, 0;
2963	glEnd;
2964		3629
2965	glTranslate 2 - 0.375, 2 - 0.375;	3630	glTranslate 2, 2;
2966		3631
2967	$self->SUPER::_draw;	3632	$self->SUPER::_draw;
2968	}	3633	}
2969		3634
2970	#############################################################################	3635	#############################################################################
2971		3636
2972	package CFClient::UI::Face;	3637	package CFPlus::UI::Face;
2973		3638
2974	our @ISA = CFClient::UI::Base::;	3639	our @ISA = CFPlus::UI::DrawBG::;
2975		3640
2976	use CFClient::OpenGL;	3641	use CFPlus::OpenGL;
2977		3642
2978	sub new {	3643	sub new {
2979	my $class = shift;	3644	my $class = shift;
2980		3645
2981	my $self = $class->SUPER::new (	3646	my $self = $class->SUPER::new (
		3647	size_w => 32,
		3648	size_h => 8,
2982	aspect => 1,	3649	aspect => 1,
2983	can_events => 0,	3650	can_events => 0,
2984	@_,	3651	@_,
2985	);	3652	);
2986		3653
2987	if ($self->{anim} && $self->{animspeed}) {	3654	if ($self->{anim} && $self->{animspeed}) {
2988	Scalar::Util::weaken (my $widget = $self);	3655	CFPlus::weaken (my $widget = $self);
2989		3656
		3657	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3658	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2990	$self->{timer} = Event->timer (	3659	$self->{timer} = Event->timer (
2991	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992	hard => 1,	3660	parked => 1,
2993	interval => $self->{animspeed},
2994	cb => sub {	3661	cb => sub {
		3662	return unless $::CONN;
		3663
		3664	my $w = $widget
		3665	or return;
		3666
2995	++$widget->{frame};	3667	++$w->{frame};
		3668	$w->update_face;
		3669
		3670	# somehow, $widget can go away
2996	$widget->update;	3671	$w->update;
		3672	$w->update_timer;
2997	},	3673	},
2998	);	3674	);
		3675
		3676	$self->update_face;
		3677	$self->update_timer;
2999	}	3678	}
3000		3679
3001	$self	3680	$self
3002	}	3681	}
3003		3682
		3683	sub update_timer {
		3684	my ($self) = @_;
		3685
		3686	return unless $self->{timer};
		3687
		3688	if ($self->{visible}) {
		3689	$self->{timer}->at (
		3690	$self->{anim_start}
		3691	+ $self->{animspeed}
		3692	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3693	);
		3694	$self->{timer}->start;
		3695	} else {
		3696	$self->{timer}->stop;
		3697	}
		3698	}
		3699
		3700	sub update_face {
		3701	my ($self) = @_;
		3702
		3703	if ($::CONN) {
		3704	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3705	if ($anim && @$anim) {
		3706	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3707	delete $self->{face_change_cb};
		3708
		3709	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3710	unless ($tex->{name} || $tex->{loading}) {
		3711	$tex->upload (sub { $self->reconfigure });
		3712	}
		3713	}
		3714	}
		3715	}
		3716	}
		3717	}
		3718
3004	sub size_request {	3719	sub size_request {
3005	(32, 8)	3720	my ($self) = @_;
		3721
		3722	if ($::CONN) {
		3723	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3724	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3725	if ($tex->{name}) {
		3726	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3727	} elsif (!$tex->{loading}) {
		3728	$tex->upload (sub { $self->reconfigure });
		3729	}
		3730	}
		3731
		3732	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3733	}
		3734	}
		3735
		3736	($self->{size_w} || 8, $self->{size_h} || 8)
3006	}	3737	}
3007		3738
3008	sub update {	3739	sub update {
3009	my ($self) = @_;	3740	my ($self) = @_;
3010		3741
3011	return unless $self->{visible};	3742	return unless $self->{visible};
3012		3743
3013	$self->SUPER::update;	3744	$self->SUPER::update;
3014	}	3745	}
3015		3746
		3747	sub invoke_visibility_change {
		3748	my ($self) = @_;
		3749
		3750	$self->update_timer;
		3751
		3752	0
		3753	}
		3754
3016	sub _draw {	3755	sub _draw {
3017	my ($self) = @_;	3756	my ($self) = @_;
3018		3757
3019	return unless $::CONN;	3758	$self->SUPER::_draw;
3020		3759
3021	my $face;	3760	if (my $tex = $self->{tex}) {
3022
3023	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];
3025
3026	$face = $anim->[ $self->{frame} % @$anim ]
3027	if $anim && @$anim;
3028	}
3029
3030	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3031
3032	if ($tex) {
3033	glEnable GL_TEXTURE_2D;	3761	glEnable GL_TEXTURE_2D;
3034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035	glColor 0, 0, 0, 1;	3763	glColor 0, 0, 0, 1;
3036	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3764	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3037	glDisable GL_TEXTURE_2D;	3765	glDisable GL_TEXTURE_2D;
…		…
3039	}	3767	}
3040		3768
3041	sub destroy {	3769	sub destroy {
3042	my ($self) = @_;	3770	my ($self) = @_;
3043		3771
3044	$self->{timer}->cancel	3772	(delete $self->{timer})->cancel
3045	if $self->{timer};	3773	if $self->{timer};
3046		3774
3047	$self->SUPER::destroy;	3775	$self->SUPER::destroy;
3048	}	3776	}
3049		3777
3050	#############################################################################	3778	#############################################################################
3051		3779
3052	package CFClient::UI::Buttonbar;	3780	package CFPlus::UI::Buttonbar;
3053		3781
3054	our @ISA = CFClient::UI::HBox::;	3782	our @ISA = CFPlus::UI::HBox::;
3055		3783
3056	# TODO: should actualyl wrap buttons and other goodies.	3784	# TODO: should actually wrap buttons and other goodies.
3057		3785
3058	#############################################################################	3786	#############################################################################
3059		3787
3060	package CFClient::UI::Menu;	3788	package CFPlus::UI::Menu;
3061		3789
3062	our @ISA = CFClient::UI::FancyFrame::;	3790	our @ISA = CFPlus::UI::Toplevel::;
3063		3791
3064	use CFClient::OpenGL;	3792	use CFPlus::OpenGL;
3065		3793
3066	sub new {	3794	sub new {
3067	my $class = shift;	3795	my $class = shift;
3068		3796
3069	my $self = $class->SUPER::new (	3797	my $self = $class->SUPER::new (
3070	items => [],	3798	items => [],
3071	z => 100,	3799	z => 100,
3072	@_,	3800	@_,
3073	);	3801	);
3074		3802
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3803	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3804
3077	for my $item (@{ $self->{items} }) {	3805	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3806	my ($widget, $cb, $tooltip) = @$item;
3079		3807
3080	# handle various types of items, only text for now	3808	# handle various types of items, only text for now
3081	if (!ref $widget) {	3809	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3810	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3811	my ($left, $right) = split /\t/, $widget, 2;
3084		3812
3085	$widget = new CFClient::UI::HBox	3813	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3814	can_hover => 1,
3087	can_events => 1,	3815	can_events => 1,
3088	tooltip => $tooltip,	3816	tooltip => $tooltip,
3089	children => [	3817	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3818	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3819	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3820	],
3093	;	3821	;
3094		3822
3095	} else {	3823	} else {
3096	$widget = new CFClient::UI::Label	3824	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3825	can_hover => 1,
3098	can_events => 1,	3826	can_events => 1,
3099	markup => $widget,	3827	markup => $widget,
3100	tooltip => $tooltip;	3828	tooltip => $tooltip;
3101	}	3829	}
…		…
3149	1	3877	1
3150	}	3878	}
3151		3879
3152	#############################################################################	3880	#############################################################################
3153		3881
3154	package CFClient::UI::Multiplexer;	3882	package CFPlus::UI::Multiplexer;
3155		3883
3156	our @ISA = CFClient::UI::Container::;	3884	our @ISA = CFPlus::UI::Container::;
3157		3885
3158	sub new {	3886	sub new {
3159	my $class = shift;	3887	my $class = shift;
3160		3888
3161	my $self = $class->SUPER::new (	3889	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3950	$self->{current}->draw;
3223	}	3951	}
3224		3952
3225	#############################################################################	3953	#############################################################################
3226		3954
3227	package CFClient::UI::Notebook;	3955	package CFPlus::UI::Notebook;
3228		3956
		3957	use CFPlus::OpenGL;
		3958
3229	our @ISA = CFClient::UI::VBox::;	3959	our @ISA = CFPlus::UI::VBox::;
3230		3960
3231	sub new {	3961	sub new {
3232	my $class = shift;	3962	my $class = shift;
3233		3963
3234	my $self = $class->SUPER::new (	3964	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3965	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3966	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3967	active_outline => [.7, .7, 0.2],
3237	# filter => # will be put between multiplexer and $self	3968	# filter => # will be put between multiplexer and $self
3238	@_,	3969	@_,
3239	);	3970	);
3240		3971
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3972	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3242	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3973	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3243		3974
		3975	{
		3976	Scalar::Util::weaken (my $wself = $self);
		3977
		3978	$self->{multiplexer}->connect (c_add => sub {
		3979	my ($mplex, $widgets) = @_;
		3980
		3981	for my $child (@$widgets) {
		3982	Scalar::Util::weaken $child;
		3983	$child->{c_tab_} ||= do {
		3984	my $tab =
		3985	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3986	? $child->{c_tab}
		3987	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3988
		3989	$tab->connect (activate => sub {
		3990	$wself->set_current_page ($child);
		3991	});
		3992
		3993	$tab
		3994	};
		3995
		3996	$self->{buttonbar}->add ($child->{c_tab_});
		3997	}
		3998	});
		3999
		4000	$self->{multiplexer}->connect (c_remove => sub {
		4001	my ($mplex, $widgets) = @_;
		4002
		4003	for my $child (@$widgets) {
		4004	$wself->{buttonbar}->remove ($child->{c_tab_});
		4005	}
		4006	});
		4007	}
		4008
3244	$self	4009	$self
3245	}	4010	}
3246		4011
3247	sub add {	4012	sub add {
		4013	my ($self, @widgets) = @_;
		4014
		4015	$self->{multiplexer}->add (@widgets)
		4016	}
		4017
		4018	sub remove {
		4019	my ($self, @widgets) = @_;
		4020
		4021	$self->{multiplexer}->remove (@widgets)
		4022	}
		4023
		4024	sub pages {
		4025	my ($self) = @_;
		4026	$self->{multiplexer}->children
		4027	}
		4028
		4029	sub add_tab {
3248	my ($self, $title, $widget, $tooltip) = @_;	4030	my ($self, $title, $widget, $tooltip) = @_;
3249		4031
3250	Scalar::Util::weaken $self;	4032	$title = [$title, $tooltip] unless ref $title;
		4033	$widget->{c_tab} = $title;
3251		4034
3252	$self->{buttonbar}->add (new CFClient::UI::Button
3253	markup => $title,
3254	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },
3256	);
3257
3258	$self->{multiplexer}->add ($widget);	4035	$self->add ($widget);
3259	}	4036	}
3260		4037
3261	sub get_current_page {	4038	sub get_current_page {
3262	my ($self) = @_;	4039	my ($self) = @_;
3263		4040
…		…
3269		4046
3270	$self->{multiplexer}->set_current_page ($page);	4047	$self->{multiplexer}->set_current_page ($page);
3271	$self->emit (page_changed => $self->{multiplexer}{current});	4048	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	4049	}
3273		4050
		4051	sub _draw {
		4052	my ($self) = @_;
		4053
		4054	$self->SUPER::_draw ();
		4055
		4056	if (my $cur = $self->{multiplexer}{current}) {
		4057	if ($cur = $cur->{c_tab_}) {
		4058	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4059	$self->{buttonbar}{y} + $cur->{y};
		4060	glLineWidth 3;
		4061	#glEnable GL_BLEND;
		4062	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4063	glColor @{$self->{active_outline}};
		4064	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4065	glLineWidth 1;
		4066	#glDisable GL_BLEND;
		4067	}
		4068	}
		4069	}
		4070
3274	#############################################################################	4071	#############################################################################
3275		4072
3276	package CFClient::UI::Combobox;	4073	package CFPlus::UI::Selector;
3277		4074
3278	use utf8;	4075	use utf8;
3279		4076
3280	our @ISA = CFClient::UI::Button::;	4077	our @ISA = CFPlus::UI::Button::;
3281		4078
3282	sub new {	4079	sub new {
3283	my $class = shift;	4080	my $class = shift;
3284		4081
3285	my $self = $class->SUPER::new (	4082	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	4099	my ($value, $title, $tooltip) = @$_;
3303		4100
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4101	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	4102	}
3306		4103
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4104	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	4105	}
3309		4106
3310	sub _set_value {	4107	sub _set_value {
3311	my ($self, $value) = @_;	4108	my ($self, $value) = @_;
3312		4109
…		…
3327	$self->emit (changed => $value);	4124	$self->emit (changed => $value);
3328	}	4125	}
3329		4126
3330	#############################################################################	4127	#############################################################################
3331		4128
3332	package CFClient::UI::Statusbox;	4129	package CFPlus::UI::Statusbox;
3333		4130
3334	our @ISA = CFClient::UI::VBox::;	4131	our @ISA = CFPlus::UI::VBox::;
3335		4132
3336	sub new {	4133	sub new {
3337	my $class = shift;	4134	my $class = shift;
3338		4135
3339	my $self = $class->SUPER::new (	4136	my $self = $class->SUPER::new (
3340	fontsize => 0.8,	4137	fontsize => 0.8,
3341	@_,	4138	@_,
3342	);	4139	);
3343		4140
3344	Scalar::Util::weaken (my $this = $self);	4141	CFPlus::weaken (my $this = $self);
3345		4142
3346	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4143	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347		4144
3348	$self	4145	$self
3349	}	4146	}
…		…
3351	sub reorder {	4148	sub reorder {
3352	my ($self) = @_;	4149	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	4150	my $NOW = Time::HiRes::time;
3354		4151
3355	# freeze display when hovering over any label	4152	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	4153	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4154	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	4155	values %{ $self->{item} };
3359		4156
3360	while (my ($k, $v) = each %{ $self->{item} }) {	4157	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4158	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	4159	}
…		…
3383	for ($short) {	4180	for ($short) {
3384	s/^\s+//;	4181	s/^\s+//;
3385	s/\s+/ /g;	4182	s/\s+/ /g;
3386	}	4183	}
3387		4184
3388	new CFClient::UI::Label	4185	new CFPlus::UI::Label
3389	markup => $short,	4186	markup => $short,
3390	tooltip => $item->{tooltip},	4187	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	4188	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	4189	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	4190	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	4269	$self->SUPER::destroy;
3473	}	4270	}
3474		4271
3475	#############################################################################	4272	#############################################################################
3476		4273
3477	package CFClient::UI::Inventory;
3478
3479	our @ISA = CFClient::UI::Table::;
3480
3481	sub new {
3482	my $class = shift;
3483
3484	my $self = $class->SUPER::new (
3485	col_expand => [0, 1, 0],
3486	@_,
3487	);
3488
3489	$self
3490	}
3491
3492	sub set_items {
3493	my ($self, $items) = @_;
3494
3495	$self->clear;
3496	return unless $items;
3497
3498	my @items = sort {
3499	($a->{type} <=> $b->{type})
3500	or ($a->{name} cmp $b->{name})
3501	} values %$items;
3502
3503	$self->{real_items} = \@items;
3504
3505	my $row = 0;
3506	for my $item (@items) {
3507	CFClient::Item::update_widgets $item;
3508
3509	$self->add (0, $row, $item->{face_widget});
3510	$self->add (1, $row, $item->{desc_widget});
3511	$self->add (2, $row, $item->{weight_widget});
3512
3513	$row++;
3514	}
3515	}
3516
3517	#############################################################################
3518
3519	package CFClient::UI::SpellList;
3520
3521	our @ISA = CFClient::UI::Table::;
3522
3523	sub new {
3524	my $class = shift;
3525
3526	my $self = $class->SUPER::new (
3527	binding => [],
3528	commands => [],
3529	@_,
3530	)
3531	}
3532
3533	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546	sub rebuild_spell_list {
3547	my ($self) = @_;
3548
3549	$CFClient::UI::ROOT->on_refresh ($self => sub {
3550	$self->clear;
3551
3552	return unless $::CONN;
3553
3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560	my $row = 0;
3561
3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563	my $spell = $self->{spell}{$_};
3564
3565	$row++;
3566
3567	my $spell_cb = sub {
3568	my ($widget, $ev) = @_;
3569
3570	if ($ev->{button} == 1) {
3571	$::CONN->user_send ("cast $spell->{name}");
3572	} elsif ($ev->{button} == 2) {
3573	$::CONN->user_send ("invoke $spell->{name}");
3574	} elsif ($ev->{button} == 3) {
3575	(new CFClient::UI::Menu
3576	items => [
3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579	],
3580	)->popup ($ev);
3581	} else {
3582	return 0;
3583	}
3584
3585	1
3586	};
3587
3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590	#TODO: add path info to tooltip
3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593	$self->add (0, $row, new CFClient::UI::Face
3594	face => $spell->{face},
3595	can_hover => 1,
3596	can_events => 1,
3597	tooltip => $tooltip,
3598	on_button_down => $spell_cb,
3599	);
3600
3601	$self->add (1, $row, new CFClient::UI::Label
3602	expand => 1,
3603	text => $spell->{name},
3604	can_hover => 1,
3605	can_events => 1,
3606	tooltip => $tooltip,
3607	on_button_down => $spell_cb,
3608	);
3609
3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614	}
3615	});
3616	}
3617
3618	sub add_spell {
3619	my ($self, $spell) = @_;
3620
3621	$self->{spell}->{$spell->{name}} = $spell;
3622	$self->rebuild_spell_list;
3623	}
3624
3625	sub remove_spell {
3626	my ($self, $spell) = @_;
3627
3628	delete $self->{spell}->{$spell->{name}};
3629	$self->rebuild_spell_list;
3630	}
3631
3632	sub clear_spells {
3633	my ($self) = @_;
3634
3635	$self->{spell} = {};
3636	$self->rebuild_spell_list;
3637	}
3638
3639	#############################################################################
3640
3641	package CFClient::UI::Root;	4274	package CFPlus::UI::Root;
3642		4275
3643	our @ISA = CFClient::UI::Container::;	4276	our @ISA = CFPlus::UI::Container::;
3644		4277
3645	use List::Util qw(min max);	4278	use List::Util qw(min max);
3646		4279
3647	use CFClient::OpenGL;	4280	use CFPlus::OpenGL;
3648		4281
3649	sub new {	4282	sub new {
3650	my $class = shift;	4283	my $class = shift;
3651		4284
3652	my $self = $class->SUPER::new (	4285	my $self = $class->SUPER::new (
3653	visible => 1,	4286	visible => 1,
3654	@_,	4287	@_,
3655	);	4288	);
3656		4289
3657	Scalar::Util::weaken ($self->{root} = $self);	4290	CFPlus::weaken ($self->{root} = $self);
3658		4291
3659	$self	4292	$self
3660	}	4293	}
3661		4294
3662	sub size_request {	4295	sub size_request {
…		…
3710	}	4343	}
3711		4344
3712	sub update {	4345	sub update {
3713	my ($self) = @_;	4346	my ($self) = @_;
3714		4347
3715	$::WANT_REFRESH++;	4348	$::WANT_REFRESH->start;
3716	}	4349	}
3717		4350
3718	sub add {	4351	sub add {
3719	my ($self, @children) = @_;	4352	my ($self, @children) = @_;
3720		4353
…		…
3757	while ($self->{refresh_hook}) {	4390	while ($self->{refresh_hook}) {
3758	$_->()	4391	$_->()
3759	for values %{delete $self->{refresh_hook}};	4392	for values %{delete $self->{refresh_hook}};
3760	}	4393	}
3761		4394
3762	if ($self->{realloc}) {	4395	while ($self->{realloc}) {
3763	my %queue;	4396	my %queue;
3764	my @queue;	4397	my @queue;
3765	my $widget;	4398	my $widget;
3766		4399
3767	outer:	4400	outer:
…		…
3814	}	4447	}
3815	}	4448	}
3816		4449
3817	delete $self->{realloc}{$widget+0};	4450	delete $self->{realloc}{$widget+0};
3818	}	4451	}
3819	}
3820		4452
3821	while (my $size_alloc = delete $self->{size_alloc}) {	4453	while (my $size_alloc = delete $self->{size_alloc}) {
3822	my @queue = sort { $b->{visible} <=> $a->{visible} }	4454	my @queue = sort { $a->{visible} <=> $b->{visible} }
3823	values %$size_alloc;	4455	values %$size_alloc;
3824		4456
3825	while () {	4457	while () {
3826	my $widget = pop @queue || last;	4458	my $widget = pop @queue || last;
3827		4459
3828	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3829		4461
3830	$w = 0 if $w < 0;
3831	$h = 0 if $h < 0;
3832
3833	$w = max $widget->{min_w}, $w;	4462	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	4463	$h = max $widget->{min_h}, $h;
3835		4464
		4465	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4466	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4467
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4468	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4469	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		4470
3839	$w = int $w + 0.5;	4471	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	4472	$h = int $h + 0.5;
3841		4473
3842	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4474	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3843	$widget->{old_w} = $widget->{w};	4475	$widget->{old_w} = $widget->{w};
3844	$widget->{old_h} = $widget->{h};	4476	$widget->{old_h} = $widget->{h};
3845		4477
3846	$widget->{w} = $w;	4478	$widget->{w} = $w;
3847	$widget->{h} = $h;	4479	$widget->{h} = $h;
3848		4480
3849	$widget->emit (size_allocate => $w, $h);	4481	$widget->emit (size_allocate => $w, $h);
		4482	}
3850	}	4483	}
3851	}	4484	}
3852	}	4485	}
3853		4486
3854	while ($self->{post_alloc_hook}) {	4487	while ($self->{post_alloc_hook}) {
3855	$_->()	4488	$_->()
3856	for values %{delete $self->{post_alloc_hook}};	4489	for values %{delete $self->{post_alloc_hook}};
3857	}	4490	}
3858
3859		4491
3860	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4492	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3861	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4493	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3862	glClear GL_COLOR_BUFFER_BIT;	4494	glClear GL_COLOR_BUFFER_BIT;
3863		4495
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4498	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4499	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4500	glLoadIdentity;
3869		4501
3870	{	4502	{
3871	package CFClient::UI::Base;	4503	package CFPlus::UI::Base;
3872		4504
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4505	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4506	(0, 0, $self->{w}, $self->{h});
3875	}
3876		4507
3877	$self->_draw;	4508	$self->_draw;
		4509	}
3878	}	4510	}
3879		4511
3880	#############################################################################	4512	#############################################################################
3881		4513
3882	package CFClient::UI;	4514	package CFPlus::UI;
3883		4515
3884	$ROOT = new CFClient::UI::Root;	4516	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4517	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4518
3887	1	4519	1
3888		4520

Diff Legend

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