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

Diff Legend

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