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

Diff Legend

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