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.301 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

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

Diff Legend

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