ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.423 by root, Mon Aug 6 05:06:33 2007 UTC

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

Diff Legend

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