ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

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