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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		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	{ __widget_ref__ => $_[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
…		…
315	}	344	}
316		345
317	sub move_abs {	346	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	347	my ($self, $x, $y, $z) = @_;
319		348
320	$self->{x} = List::Util::max 0, int $x;	349	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321	$self->{y} = List::Util::max 0, int $y;	350	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	351	$self->{z} = $z if defined $z;
323		352
324	$self->update;	353	$self->update;
325	}	354	}
326		355
…		…
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
…		…
542	return unless $self->{h} && $self->{w};	597	return unless $self->{h} && $self->{w};
543		598
544	# update screen rectangle	599	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	600	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	601	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		602
550	# skip widgets that are entirely outside the drawing area	603	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	604	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	605	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		606
…		…
576	glVertex $self->{w} - 1, 0;	629	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	630	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	631	glVertex 0 , $self->{h} - 1;
579	glEnd;	632	glEnd;
580	glPopMatrix;	633	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	634	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	635	}
583		636
584	$self->_draw;	637	$self->_draw;
585	glPopMatrix;	638	glPopMatrix;
586	}	639	}
…		…
589	my ($self) = @_;	642	my ($self) = @_;
590		643
591	warn "no draw defined for $self\n";	644	warn "no draw defined for $self\n";
592	}	645	}
593		646
		647	my $cntx;#d#
594	sub DESTROY {	648	sub DESTROY {
595	my ($self) = @_;	649	my ($self) = @_;
596		650
		651	return if CFPlus::in_destruct;
		652
		653	eval { $self->destroy };
		654	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		655
597	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
598	#$self->deactivate;
599	}	657	}
600		658
601	#############################################################################	659	#############################################################################
602		660
603	package CFClient::UI::DrawBG;	661	package CFPlus::UI::DrawBG;
604		662
605	our @ISA = CFClient::UI::Base::;	663	our @ISA = CFPlus::UI::Base::;
606		664
607	use strict;	665	use strict;
608	use CFClient::OpenGL;	666	use CFPlus::OpenGL;
609		667
610	sub new {	668	sub new {
611	my $class = shift;	669	my $class = shift;
612		670
613	# range [value, low, high, page]	671	# range [value, low, high, page]
…		…
644	}	702	}
645	}	703	}
646		704
647	#############################################################################	705	#############################################################################
648		706
649	package CFClient::UI::Empty;	707	package CFPlus::UI::Empty;
650		708
651	our @ISA = CFClient::UI::Base::;	709	our @ISA = CFPlus::UI::Base::;
652		710
653	sub new {	711	sub new {
654	my ($class, %arg) = @_;	712	my ($class, %arg) = @_;
655	$class->SUPER::new (can_events => 0, %arg);	713	$class->SUPER::new (can_events => 0, %arg);
656	}	714	}
…		…
663		721
664	sub draw { }	722	sub draw { }
665		723
666	#############################################################################	724	#############################################################################
667		725
668	package CFClient::UI::Container;	726	package CFPlus::UI::Container;
669		727
670	our @ISA = CFClient::UI::Base::;	728	our @ISA = CFPlus::UI::Base::;
671		729
672	sub new {	730	sub new {
673	my ($class, %arg) = @_;	731	my ($class, %arg) = @_;
674		732
675	my $children = delete $arg{children};	733	my $children = delete $arg{children};
…		…
684	if $children;	742	if $children;
685		743
686	$self	744	$self
687	}	745	}
688		746
		747	sub realloc {
		748	my ($self) = @_;
		749
		750	$self->{force_realloc} = 1;
		751	$self->{force_size_alloc} = 1;
		752	$self->SUPER::realloc;
		753	}
		754
689	sub add {	755	sub add {
690	my ($self, @widgets) = @_;	756	my ($self, @widgets) = @_;
691		757
692	$_->set_parent ($self)	758	$_->set_parent ($self)
693	for @widgets;	759	for @widgets;
…		…
753	$_->draw for @{$self->{children}};	819	$_->draw for @{$self->{children}};
754	}	820	}
755		821
756	#############################################################################	822	#############################################################################
757		823
758	package CFClient::UI::Bin;	824	package CFPlus::UI::Bin;
759		825
760	our @ISA = CFClient::UI::Container::;	826	our @ISA = CFPlus::UI::Container::;
761		827
762	sub new {	828	sub new {
763	my ($class, %arg) = @_;	829	my ($class, %arg) = @_;
764		830
765	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	831	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766		832
767	$class->SUPER::new (children => [$child], %arg)	833	$class->SUPER::new (children => [$child], %arg)
768	}	834	}
769		835
770	sub add {	836	sub add {
771	my ($self, $child) = @_;	837	my ($self, $child) = @_;
772		838
773	$self->{children} = [];	839	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	840	$self->SUPER::add ($child);
776	}	841	}
777		842
778	sub remove {	843	sub remove {
779	my ($self, $widget) = @_;	844	my ($self, $widget) = @_;
780		845
781	$self->SUPER::remove ($widget);	846	$self->SUPER::remove ($widget);
782		847
783	$self->{children} = [new CFClient::UI::Empty]	848	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	849	unless @{$self->{children}};
785	}	850	}
786		851
787	sub child { $_[0]->{children}[0] }	852	sub child { $_[0]->{children}[0] }
788		853
789	sub size_request {	854	sub size_request {
790	$_[0]{children}[0]->size_request	855	$_[0]{children}[0]->size_request
791	}	856	}
792		857
793	sub size_allocate {	858	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	859	my ($self, $w, $h) = @_;
795		860
796	$self->{children}[0]->configure (0, 0, $w, $h);	861	$self->{children}[0]->configure (0, 0, $w, $h);
		862
		863	1
797	}	864	}
798		865
799	#############################################################################	866	#############################################################################
800		867
801	# back-buffered drawing area	868	# back-buffered drawing area
802		869
803	package CFClient::UI::Window;	870	package CFPlus::UI::Window;
804		871
805	our @ISA = CFClient::UI::Bin::;	872	our @ISA = CFPlus::UI::Bin::;
806		873
807	use CFClient::OpenGL;	874	use CFPlus::OpenGL;
808		875
809	sub new {	876	sub new {
810	my ($class, %arg) = @_;	877	my ($class, %arg) = @_;
811		878
812	my $self = $class->SUPER::new (%arg);	879	my $self = $class->SUPER::new (%arg);
…		…
817		884
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	885	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	886	$self->SUPER::update;
820	}	887	}
821		888
822	sub size_allocate {	889	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	890	my ($self, $w, $h) = @_;
824		891
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	892	$self->update;
		893
		894	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	895	}
828		896
829	sub _render {	897	sub _render {
830	my ($self) = @_;	898	my ($self) = @_;
831		899
…		…
833	}	901	}
834		902
835	sub render_child {	903	sub render_child {
836	my ($self) = @_;	904	my ($self) = @_;
837		905
838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	906	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839	glClearColor 0, 0, 0, 0;	907	glClearColor 0, 0, 0, 0;
840	glClear GL_COLOR_BUFFER_BIT;	908	glClear GL_COLOR_BUFFER_BIT;
841		909
842	{	910	{
843	package CFClient::UI::Base;	911	package CFPlus::UI::Base;
844		912
845	($draw_x, $draw_y, $draw_w, $draw_h) =	913	local ($draw_x, $draw_y, $draw_w, $draw_h) =
846	(0, 0, $self->{w}, $self->{h});	914	(0, 0, $self->{w}, $self->{h});
		915
		916	$self->_render;
847	}	917	}
848
849	$self->_render;
850	};	918	};
851	}	919	}
852		920
853	sub _draw {	921	sub _draw {
854	my ($self) = @_;	922	my ($self) = @_;
855
856	my ($w, $h) = @$self{qw(w h)};
857		923
858	my $tex = $self->{texture}	924	my $tex = $self->{texture}
859	or return;	925	or return;
860		926
861	glEnable GL_TEXTURE_2D;	927	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	928	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863	glColor 0, 0, 0, 1;	929	glColor 0, 0, 0, 1;
864		930
865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	931	$tex->draw_quad_alpha_premultiplied (0, 0);
866		932
867	glDisable GL_TEXTURE_2D;	933	glDisable GL_TEXTURE_2D;
868	}	934	}
869		935
870	#############################################################################	936	#############################################################################
871		937
872	package CFClient::UI::ViewPort;	938	package CFPlus::UI::ViewPort;
873		939
		940	use List::Util qw(min max);
		941
874	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
875		943
876	sub new {	944	sub new {
877	my $class = shift;	945	my $class = shift;
878		946
879	$class->SUPER::new (	947	$class->SUPER::new (
…		…
892	$h = 10 if $self->{scroll_y};	960	$h = 10 if $self->{scroll_y};
893		961
894	($w, $h)	962	($w, $h)
895	}	963	}
896		964
897	sub size_allocate {	965	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	966	my ($self, $w, $h) = @_;
899		967
900	my $child = $self->child;	968	my $child = $self->child;
901		969
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	970	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	971	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		972
905	$self->child->configure (0, 0, $w, $h);	973	$self->child->configure (0, 0, $w, $h);
906	$self->update;	974	$self->update;
		975
		976	1
907	}	977	}
908		978
909	sub set_offset {	979	sub set_offset {
910	my ($self, $x, $y) = @_;	980	my ($self, $x, $y) = @_;
911		981
		982	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		983	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		984
		985	if ($x != $self->{view_x} or $y != $self->{view_y}) {
912	$self->{view_x} = int $x;	986	$self->{view_x} = $x;
913	$self->{view_y} = int $y;	987	$self->{view_y} = $y;
914		988
		989	$self->emit (changed => $x, $y);
915	$self->update;	990	$self->update;
		991	}
916	}	992	}
917		993
918	# hmm, this does not work for topleft of $self... but we should not ask for that	994	# hmm, this does not work for topleft of $self... but we should not ask for that
919	sub coord2local {	995	sub coord2local {
920	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
…		…
935	my ($self, $x, $y) = @_;	1011	my ($self, $x, $y) = @_;
936		1012
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1013	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1014	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1015	) {
940	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1016	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941	} else {	1017	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1018	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1019	}
944	}	1020	}
945		1021
946	sub _render {	1022	sub _render {
947	my ($self) = @_;	1023	my ($self) = @_;
948		1024
949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1025	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};	1026	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951		1027
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1028	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1029
954	$self->SUPER::_render;	1030	$self->SUPER::_render;
955	}	1031	}
956		1032
957	#############################################################################	1033	#############################################################################
958		1034
959	package CFClient::UI::ScrolledWindow;	1035	package CFPlus::UI::ScrolledWindow;
960		1036
961	our @ISA = CFClient::UI::HBox::;	1037	our @ISA = CFPlus::UI::Table::;
962		1038
963	sub new {	1039	sub new {
964	my ($class, %arg) = @_;	1040	my ($class, %arg) = @_;
965		1041
966	my $child = delete $arg{child};	1042	my $child = delete $arg{child};
967		1043
968	my $self;	1044	my $self;
969		1045
970	my $slider = new CFClient::UI::Slider	1046	my $hslider = new CFPlus::UI::Slider
		1047	vertical => 0,
		1048	range => [0, 0, 1, 0.01], # HACK fix
		1049	on_changed => sub {
		1050	$self->{hpos} = $_[1];
		1051	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1052	},
		1053	;
		1054
		1055	my $vslider = new CFPlus::UI::Slider
971	vertical => 1,	1056	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1057	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1058	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1059	$self->{vpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975	},	1061	},
976	;	1062	;
977		1063
978	$self = $class->SUPER::new (	1064	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1065	scroll_x => 0,
		1066	scroll_y => 1,
		1067	can_events => 1,
980	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
981	%arg,	1072	%arg,
982	);	1073	);
983		1074
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1075	$self->{vp} = new CFPlus::UI::ViewPort
		1076	expand => 1,
		1077	scroll_x => $self->{scroll_x},
		1078	scroll_y => $self->{scroll_y},
		1079	on_changed => sub {
		1080	my ($vp, $x, $y) = @_;
		1081
		1082	$vp->{parent}{hslider}->set_value ($x);
		1083	$vp->{parent}{vslider}->set_value ($y);
		1084
		1085	0
		1086	},
		1087	;
		1088
		1089	$self->SUPER::add_at (0, 0, $self->{vp});
		1090
985	$self->add ($child) if $child;	1091	$self->add ($child) if $child;
986		1092
987	$self	1093	$self
988	}	1094	}
		1095
		1096	#TODO# update range on size_allocate depending on child
989		1097
990	sub add {	1098	sub add {
991	my ($self, $widget) = @_;	1099	my ($self, $widget) = @_;
992		1100
993	$self->{vp}->add ($self->{child} = $widget);	1101	$self->{vp}->add ($self->{child} = $widget);
994	}	1102	}
995		1103
		1104	sub update_slider {
		1105	my ($self) = @_;
		1106
		1107	my $child = ($self->{vp} or return)->child;
		1108
		1109	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1111
		1112	my $visible = $w1 > $w2;
		1113	if ($visible != $self->{hslider}{visible}) {
		1114	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1115	: $self->{hslider}->hide;
		1116	}
		1117
		1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1124	: $self->{vslider}->hide;
		1125	}
		1126	}
		1127
996	sub update {	1128	sub update {
997	my ($self) = @_;	1129	my ($self) = @_;
998		1130
		1131	$self->update_slider;
999	$self->SUPER::update;	1132	$self->SUPER::update;
1000
1001	# todo: overwrite size_allocate of child
1002	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1133	}
1005		1134
		1135	sub invoke_mouse_wheel {
		1136	my ($self, $ev) = @_;
		1137
		1138	return 0 unless $ev->{dy}; # only vertical movements for now
		1139
		1140	$self->{vslider}->emit (mouse_wheel => $ev);
		1141
		1142	1
		1143	}
		1144
		1145	sub invoke_button_down {
		1146	my ($self, $ev, $x, $y) = @_;
		1147
		1148	if ($ev->{button} == 2) {
		1149	$self->grab_focus;
		1150
		1151	my $ox = $self->{vp}{view_x} + $ev->{x};
		1152	my $oy = $self->{vp}{view_y} + $ev->{y};
		1153
		1154	$self->{motion} = sub {
		1155	my ($ev, $x, $y) = @_;
		1156
		1157	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1158	$self->update;
		1159	};
		1160
		1161	return 1;
		1162	}
		1163
		1164	0
		1165	}
		1166
		1167	sub invoke_button_up {
		1168	my ($self, $ev, $x, $y) = @_;
		1169
		1170	if (delete $self->{motion}) {
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_mouse_motion {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if ($self->{motion}) {
		1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
		1184
		1185	0
		1186	}
		1187
1006	sub size_allocate {	1188	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1008		1190
		1191	$self->update_slider;
1009	$self->SUPER::size_allocate ($w, $h);	1192	$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	}	1193	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1194
1018	#############################################################################	1195	#############################################################################
1019		1196
1020	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1021		1198
1022	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1023		1200
1024	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1025		1202
1026	sub new {	1203	sub new {
1027	my $class = shift;	1204	my $class = shift;
1028		1205
1029	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1232	$self->SUPER::_draw;
1056	}	1233	}
1057		1234
1058	#############################################################################	1235	#############################################################################
1059		1236
1060	package CFClient::UI::FancyFrame;	1237	package CFPlus::UI::FancyFrame;
1061		1238
1062	our @ISA = CFClient::UI::Bin::;	1239	our @ISA = CFPlus::UI::Bin::;
1063		1240
1064	use CFClient::OpenGL;	1241	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		1242
1074	sub new {	1243	sub new {
1075	my ($class, %arg) = @_;	1244	my ($class, %arg) = @_;
1076		1245
1077	my $title = delete $arg{title};	1246	if ((exists $arg{label}) && !ref $arg{label}) {
		1247	$arg{label} = new CFPlus::UI::Label
		1248	align => 1,
		1249	valign => 0,
		1250	text => $arg{label},
		1251	fontsize => ($arg{border} || 0.8) * 0.75;
		1252	}
		1253
		1254	my $self = $class->SUPER::new (
		1255	# label => "",
		1256	fg => [0.6, 0.3, 0.1],
		1257	border => 0.8,
		1258	style => 'single',
		1259	%arg,
		1260	);
		1261
		1262	$self
		1263	}
		1264
		1265	sub add {
		1266	my ($self, @widgets) = @_;
		1267
		1268	$self->SUPER::add (@widgets);
		1269	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1270	}
		1271
		1272	sub border {
		1273	int $_[0]{border} * $::FONTSIZE
		1274	}
		1275
		1276	sub size_request {
		1277	my ($self) = @_;
		1278
		1279	($self->{label_w}, undef) = $self->{label}->size_request
		1280	if $self->{label};
		1281
		1282	my ($w, $h) = $self->SUPER::size_request;
		1283
		1284	(
		1285	$w + $self->border * 2,
		1286	$h + $self->border * 2,
		1287	)
		1288	}
		1289
		1290	sub invoke_size_allocate {
		1291	my ($self, $w, $h) = @_;
		1292
		1293	my $border = $self->border;
		1294
		1295	$w -= List::Util::max 0, $border * 2;
		1296	$h -= List::Util::max 0, $border * 2;
		1297
		1298	if (my $label = $self->{label}) {
		1299	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1300	$label->{h} = List::Util::min $h, $border;
		1301	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1302	}
		1303
		1304	$self->child->configure ($border, $border, $w, $h);
		1305
		1306	1
		1307	}
		1308
		1309	sub _draw {
		1310	my ($self) = @_;
		1311
		1312	my $child = $self->{children}[0];
		1313
		1314	my $border = $self->border;
		1315	my ($w, $h) = ($self->{w}, $self->{h});
		1316
		1317	$child->draw;
		1318
		1319	glColor @{$self->{fg}};
		1320	glBegin GL_LINE_STRIP;
		1321	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1322	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1323	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1324	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1325	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1327	glEnd;
		1328
		1329	if ($self->{label}) {
		1330	glTranslate $border * 2, 0;
		1331	$self->{label}->_draw;
		1332	}
		1333	}
		1334
		1335	#############################################################################
		1336
		1337	package CFPlus::UI::Toplevel;
		1338
		1339	our @ISA = CFPlus::UI::Bin::;
		1340
		1341	use CFPlus::OpenGL;
		1342
		1343	my $bg =
		1344	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1345	mipmap => 1, wrap => 1;
		1346
		1347	my @border =
		1348	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1349	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1350
		1351	my @icon =
		1352	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1353	qw(x1_move.png x1_resize.png);
		1354
		1355	sub new {
		1356	my ($class, %arg) = @_;
1078		1357
1079	my $self = $class->SUPER::new (	1358	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1359	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1360	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1361	border => 0.6,
1083	can_events => 1,	1362	can_events => 1,
1084	min_w => 16,	1363	min_w => 64,
1085	min_h => 16,	1364	min_h => 32,
1086	%arg,	1365	%arg,
1087	);	1366	);
1088		1367
1089	$self->{title} = new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1369	align => 0,
1091	valign => 1,	1370	valign => 1,
1092	text => $title,	1371	text => $self->{title},
1093	fontsize => $self->{border}	1372	fontsize => $self->{border},
1094	if defined $title;	1373	if exists $self->{title};
		1374
		1375	if ($self->{has_close_button}) {
		1376	$self->{close_button} =
		1377	new CFPlus::UI::ImageButton
		1378	path => 'x1_close.png',
		1379	on_activate => sub { $self->emit ("delete") };
		1380
		1381	$self->CFPlus::UI::Container::add ($self->{close_button});
		1382	}
1095		1383
1096	$self	1384	$self
1097	}	1385	}
1098		1386
1099	sub add {	1387	sub add {
1100	my ($self, @widgets) = @_;	1388	my ($self, @widgets) = @_;
1101		1389
1102	$self->SUPER::add (@widgets);	1390	$self->SUPER::add (@widgets);
		1391	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1393	}
1105		1394
1106	sub border {	1395	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1108	}	1397	}
1109		1398
1110	sub size_request {	1399	sub size_request {
1111	my ($self) = @_;	1400	my ($self) = @_;
1112		1401
1113	$self->{title}->size_request	1402	$self->{title_widget}->size_request
1114	if $self->{title};	1403	if $self->{title_widget};
		1404
		1405	$self->{close_button}->size_request
		1406	if $self->{close_button};
1115		1407
1116	my ($w, $h) = $self->SUPER::size_request;	1408	my ($w, $h) = $self->SUPER::size_request;
1117		1409
1118	(	1410	(
1119	$w + $self->border * 2,	1411	$w + $self->border * 2,
1120	$h + $self->border * 2,	1412	$h + $self->border * 2,
1121	)	1413	)
1122	}	1414	}
1123		1415
1124	sub size_allocate {	1416	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1417	my ($self, $w, $h) = @_;
1126		1418
1127	if ($self->{title}) {	1419	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1420	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1421	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1422	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1423	}
1132		1424
1133	my $border = $self->border;	1425	my $border = $self->border;
1134		1426
1135	$h -= List::Util::max 0, $border * 2;	1427	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1428	$w -= List::Util::max 0, $border * 2;
		1429
		1430	$self->child->configure ($border, $border, $w, $h);
		1431
		1432	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1433	if $self->{close_button};
		1434
		1435	1
		1436	}
		1437
		1438	sub invoke_delete {
		1439	my ($self) = @_;
		1440
		1441	$self->hide;
1137		1442
1138	$self->child->configure ($border, $border, $w, $h);	1443	1
1139	}	1444	}
1140		1445
1141	sub button_down {	1446	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1447	my ($self, $ev, $x, $y) = @_;
1143		1448
1144	my ($w, $h) = @$self{qw(w h)};	1449	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1450	my $border = $self->border;
1146		1451
…		…
1177		1482
1178	($x, $y) = ($ev->{x}, $ev->{y});	1483	($x, $y) = ($ev->{x}, $ev->{y});
1179		1484
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1485	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1486	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1487	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1488	};
1184	} else {	1489	} else {
1185	return 0;	1490	return 0;
1186	}	1491	}
1187		1492
1188	1	1493	1
1189	}	1494	}
1190		1495
1191	sub button_up {	1496	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1497	my ($self, $ev, $x, $y) = @_;
1193		1498
1194	!!delete $self->{motion}	1499	! ! delete $self->{motion}
1195	}	1500	}
1196		1501
1197	sub mouse_motion {	1502	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1199		1504
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1505	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1506
1202	!!$self->{motion}	1507	! ! $self->{motion}
		1508	}
		1509
		1510	sub invoke_visibility_change {
		1511	my ($self, $visible) = @_;
		1512
		1513	delete $self->{motion} unless $visible;
		1514
		1515	0
1203	}	1516	}
1204		1517
1205	sub _draw {	1518	sub _draw {
1206	my ($self) = @_;	1519	my ($self) = @_;
1207		1520
…		…
1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215		1528
1216	my $border = $self->border;	1529	my $border = $self->border;
1217		1530
1218	glColor @{ $self->{border_bg} };	1531	glColor @{ $self->{border_bg} };
1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1532	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1533	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1535	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1536
		1537	# move
		1538	my $w2 = ($w - $border) * .5;
		1539	my $h2 = ($h - $border) * .5;
		1540	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1541	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1542	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1543
		1544	# resize
		1545	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1546	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1547	unless $self->{has_close_button};
		1548	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1223		1550
1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1551	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225	glColor @{ $self->{bg} };	1552	glColor @{ $self->{bg} };
1226		1553
1227	# TODO: repeat texture not scale	1554	# TODO: repeat texture not scale
…		…
1233		1560
1234	glDisable GL_TEXTURE_2D;	1561	glDisable GL_TEXTURE_2D;
1235		1562
1236	$child->draw;	1563	$child->draw;
1237		1564
1238	if ($self->{title}) {	1565	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1566	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1567	$self->{title_widget}->_draw;
		1568
		1569	glTranslate 0, - ($border - $self->{h});
1241	}	1570	}
		1571
		1572	$self->{close_button}->draw
		1573	if $self->{close_button};
1242	}	1574	}
1243		1575
1244	#############################################################################	1576	#############################################################################
1245		1577
1246	package CFClient::UI::Table;	1578	package CFPlus::UI::Table;
1247		1579
1248	our @ISA = CFClient::UI::Base::;	1580	our @ISA = CFPlus::UI::Base::;
1249		1581
1250	use List::Util qw(max sum);	1582	use List::Util qw(max sum);
1251		1583
1252	use CFClient::OpenGL;	1584	use CFPlus::OpenGL;
1253		1585
1254	sub new {	1586	sub new {
1255	my $class = shift;	1587	my $class = shift;
1256		1588
1257	$class->SUPER::new (	1589	$class->SUPER::new (
		1590	children => [],
1258	col_expand => [],	1591	col_expand => [],
		1592	row_expand => [],
1259	@_,	1593	@_,
1260	)	1594	)
1261	}	1595	}
1262		1596
1263	sub children {	1597	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}	1599	}
1266		1600
		1601	# TODO: store row/col info in child widget and use standard add/del
1267	sub add {	1602	sub add {
1268	my ($self, $x, $y, $child) = @_;	1603	my $self = shift;
1269		1604
		1605	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1606	$self->add_at (@_);
		1607	}
		1608
		1609	sub add_at {
		1610	my $self = shift;
		1611
		1612	while (@_) {
		1613	my ($col, $row, $child) = splice @_, 0, 3, ();
		1614
1270	$child->set_parent ($self);	1615	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1616	$self->{children}[$row][$col] = $child;
		1617	}
1272		1618
		1619	$self->{force_realloc} = 1;
		1620	$self->{force_size_alloc} = 1;
1273	$self->realloc;	1621	$self->realloc;
		1622	}
		1623
		1624	sub remove {
		1625	my ($self, $child) = @_;
		1626
		1627	for (@{ $self->{children} }) {
		1628	for (@{ $_ || [] }) {
		1629	$_ = undef if $_ == $child;
		1630	}
		1631	}
1274	}	1632	}
1275		1633
1276	# TODO: move to container class maybe? send children a signal on removal?	1634	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1635	sub clear {
1278	my ($self) = @_;	1636	my ($self) = @_;
…		…
1319	(sum @$ws),	1677	(sum @$ws),
1320	(sum @$hs),	1678	(sum @$hs),
1321	)	1679	)
1322	}	1680	}
1323		1681
1324	sub size_allocate {	1682	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1683	my ($self, $w, $h) = @_;
1326		1684
1327	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1328		1686
1329	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1330	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1331		1689
1332	# TODO: nicer code && do row_expand	1690	# TODO: nicer code
1333	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1334	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1335	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1336		1694
1337	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1696
1341	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1342	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1343		1706
1344	my $y;	1707	my $y;
1345		1708
1346	for my $r (0 .. $#{$self->{children}}) {	1709	for my $r (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$r]	1710	my $row = $self->{children}[$r]
…		…
1361	}	1724	}
1362		1725
1363	$y += $row_h;	1726	$y += $row_h;
1364	}	1727	}
1365		1728
		1729	1
1366	}	1730	}
1367		1731
1368	sub find_widget {	1732	sub find_widget {
1369	my ($self, $x, $y) = @_;	1733	my ($self, $x, $y) = @_;
1370		1734
…		…
1389	}	1753	}
1390	}	1754	}
1391		1755
1392	#############################################################################	1756	#############################################################################
1393		1757
1394	package CFClient::UI::Box;	1758	package CFPlus::UI::Fixed;
1395		1759
		1760	use List::Util qw(min max);
		1761
1396	our @ISA = CFClient::UI::Container::;	1762	our @ISA = CFPlus::UI::Container::;
		1763
		1764	sub add {
		1765	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1766
		1767	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1768	$self->SUPER::add ($child);
		1769	}
		1770
		1771	sub _scale($$$) {
		1772	my ($mode, $val, $max) = @_;
		1773
		1774	$mode eq "abs" ? $val
		1775	: $mode eq "rel" ? $val * $max
		1776	: 0
		1777	}
		1778
		1779	sub size_request {
		1780	my ($self) = @_;
		1781
		1782	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1783
		1784	# determine overall size by querying abs widgets
		1785	for my $child ($self->visible_children) {
		1786	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1787
		1788	if ($pos eq "abs") {
		1789	$w = _scale $size, $w, $child->{req_w};
		1790	$h = _scale $size, $h, $child->{req_h};
		1791
		1792	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1793	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1794	}
		1795	}
		1796
		1797	my $W = $x2 - $x1;
		1798	my $H = $y2 - $y1;
		1799
		1800	# now layout remaining widgets
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	if ($pos ne "abs") {
		1805	$x = _scale $pos, $x, $W;
		1806	$y = _scale $pos, $x, $H;
		1807	$w = _scale $size, $w, $child->{req_w};
		1808	$h = _scale $size, $h, $child->{req_h};
		1809
		1810	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1811	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1812	}
		1813	}
		1814
		1815	my $W = $x2 - $x1;
		1816	my $H = $y2 - $y1;
		1817
		1818	($W, $H)
		1819	}
		1820
		1821	sub invoke_size_allocate {
		1822	my ($self, $W, $H) = @_;
		1823
		1824	for my $child ($self->visible_children) {
		1825	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1826
		1827	$x = _scale $pos, $x, $W;
		1828	$y = _scale $pos, $x, $H;
		1829	$w = _scale $size, $w, $child->{req_w};
		1830	$h = _scale $size, $h, $child->{req_h};
		1831
		1832	$child->configure ($x, $y, $w, $h);
		1833	}
		1834
		1835	1
		1836	}
		1837
		1838	#############################################################################
		1839
		1840	package CFPlus::UI::Box;
		1841
		1842	our @ISA = CFPlus::UI::Container::;
1397		1843
1398	sub size_request {	1844	sub size_request {
1399	my ($self) = @_;	1845	my ($self) = @_;
1400		1846
1401	$self->{vertical}	1847	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1853	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1854	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1855	)
1410	}	1856	}
1411		1857
1412	sub size_allocate {	1858	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1859	my ($self, $w, $h) = @_;
1414		1860
1415	my $space = $self->{vertical} ? $h : $w;	1861	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1862	my @children = $self->visible_children;
1417		1863
1418	my @req;	1864	my @req;
1419		1865
1420	if ($self->{homogeneous}) {	1866	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1867	@req = ($space / (@children || 1)) x @children;
1422	} else {	1868	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1869	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1870	my $req = List::Util::sum @req;
1425		1871
1426	if ($req > $space) {	1872	if ($req > $space) {
1427	# ah well, not enough space	1873	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1874	$_ *= $space / $req for @req;
1429	} else {	1875	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1876	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1877
1432	$space = ($space - $req) / $expand; # remaining space to give away	1878	$space = ($space - $req) / $expand; # remaining space to give away
1433		1879
1434	$req[$_] += $space * $children->[$_]{expand}	1880	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1881	for 0 .. $#children;
1436	}	1882	}
1437	}	1883	}
1438		1884
1439	CFClient::UI::harmonize \@req;	1885	CFPlus::UI::harmonize \@req;
1440		1886
1441	my $pos = 0;	1887	my $pos = 0;
1442	for (0 .. $#$children) {	1888	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1889	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1890	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1891
1446	$pos += $alloc;	1892	$pos += $alloc;
1447	}	1893	}
1448		1894
1449	1	1895	1
1450	}	1896	}
1451		1897
1452	#############################################################################	1898	#############################################################################
1453		1899
1454	package CFClient::UI::HBox;	1900	package CFPlus::UI::HBox;
1455		1901
1456	our @ISA = CFClient::UI::Box::;	1902	our @ISA = CFPlus::UI::Box::;
1457		1903
1458	sub new {	1904	sub new {
1459	my $class = shift;	1905	my $class = shift;
1460		1906
1461	$class->SUPER::new (	1907	$class->SUPER::new (
…		…
1464	)	1910	)
1465	}	1911	}
1466		1912
1467	#############################################################################	1913	#############################################################################
1468		1914
1469	package CFClient::UI::VBox;	1915	package CFPlus::UI::VBox;
1470		1916
1471	our @ISA = CFClient::UI::Box::;	1917	our @ISA = CFPlus::UI::Box::;
1472		1918
1473	sub new {	1919	sub new {
1474	my $class = shift;	1920	my $class = shift;
1475		1921
1476	$class->SUPER::new (	1922	$class->SUPER::new (
…		…
1479	)	1925	)
1480	}	1926	}
1481		1927
1482	#############################################################################	1928	#############################################################################
1483		1929
1484	package CFClient::UI::Label;	1930	package CFPlus::UI::Label;
1485		1931
1486	our @ISA = CFClient::UI::DrawBG::;	1932	our @ISA = CFPlus::UI::DrawBG::;
1487		1933
1488	use CFClient::OpenGL;	1934	use CFPlus::OpenGL;
1489		1935
1490	sub new {	1936	sub new {
1491	my ($class, %arg) = @_;	1937	my ($class, %arg) = @_;
1492		1938
1493	my $self = $class->SUPER::new (	1939	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1942	#active_bg => none
1497	#font => default_font	1943	#font => default_font
1498	#text => initial text	1944	#text => initial text
1499	#markup => initial narkup	1945	#markup => initial narkup
1500	#max_w => maximum pixel width	1946	#max_w => maximum pixel width
		1947	#style => 0, # render flags
1501	ellipsise => 3, # end	1948	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1949	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1950	fontsize => 1,
1504	align => -1,	1951	align => -1,
1505	valign => -1,	1952	valign => -1,
1506	padding_x => 2,	1953	padding_x => 2,
1507	padding_y => 2,	1954	padding_y => 2,
1508	can_events => 0,	1955	can_events => 0,
1509	%arg	1956	%arg
1510	);	1957	);
1511		1958
1512	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1960	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1961	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1962	$self->{template} = $layout;
1516	}	1963	}
1517		1964
1518	if (exists $self->{markup}) {	1965	if (exists $self->{markup}) {
…		…
1522	}	1969	}
1523		1970
1524	$self	1971	$self
1525	}	1972	}
1526		1973
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 {	1974	sub update {
1538	my ($self) = @_;	1975	my ($self) = @_;
1539		1976
1540	delete $self->{texture};	1977	delete $self->{texture};
1541	$self->SUPER::update;	1978	$self->SUPER::update;
…		…
1552	my ($self, $text) = @_;	1989	my ($self, $text) = @_;
1553		1990
1554	return if $self->{text} eq "T$text";	1991	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1992	$self->{text} = "T$text";
1556		1993
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1994	$self->{layout}->set_text ($text);
1559		1995
1560	delete $self->{size_req};	1996	delete $self->{size_req};
1561	$self->realloc;	1997	$self->realloc;
1562	$self->update;	1998	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	2004	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	2005	$self->{text} = "M$markup";
1570		2006
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2007	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		2008
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	2009	$self->{layout}->set_markup ($markup);
1575		2010
1576	delete $self->{size_req};	2011	delete $self->{size_req};
1577	$self->realloc;	2012	$self->realloc;
1578	$self->update;	2013	$self->update;
…		…
1590		2025
1591	my ($w, $h) = $self->{layout}->size;	2026	my ($w, $h) = $self->{layout}->size;
1592		2027
1593	if (exists $self->{template}) {	2028	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	2029	$self->{template}->set_font ($self->{font}) if $self->{font};
		2030	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		2032
1597	my ($w2, $h2) = $self->{template}->size;	2033	my ($w2, $h2) = $self->{template}->size;
1598		2034
1599	$w = List::Util::max $w, $w2;	2035	$w = List::Util::max $w, $w2;
…		…
1604	};	2040	};
1605		2041
1606	@{ $self->{size_req} }	2042	@{ $self->{size_req} }
1607	}	2043	}
1608		2044
		2045	sub baseline_shift {
		2046	$_[0]{layout}->descent
		2047	}
		2048
1609	sub size_allocate {	2049	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	2050	my ($self, $w, $h) = @_;
1611		2051
1612	delete $self->{ox};	2052	delete $self->{ox};
1613		2053
1614	delete $self->{texture}	2054	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2055	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2056
		2057	1
1616	}	2058	}
1617		2059
1618	sub set_fontsize {	2060	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	2061	my ($self, $fontsize) = @_;
1620		2062
1621	$self->{fontsize} = $fontsize;	2063	$self->{fontsize} = $fontsize;
		2064	delete $self->{size_req};
1622	delete $self->{texture};	2065	delete $self->{texture};
1623		2066
1624	$self->realloc;	2067	$self->realloc;
1625	}	2068	}
1626		2069
1627	sub reconfigure {	2070	sub reconfigure {
1628	my ($self) = @_;	2071	my ($self) = @_;
1629		2072
1630	delete $self->{size_req};	2073	delete $self->{size_req};
		2074	delete $self->{texture};
1631		2075
1632	$self->SUPER::reconfigure;	2076	$self->SUPER::reconfigure;
1633	}	2077	}
1634		2078
1635	sub _draw {	2079	sub _draw {
1636	my ($self) = @_;	2080	my ($self) = @_;
1637		2081
1638	$self->SUPER::_draw; # draw background, if applicable	2082	$self->SUPER::_draw; # draw background, if applicable
1639		2083
1640	my $tex = $self->{texture} ||= do {	2084	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	2085	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	2086	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	2087	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	2088	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2089	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2090	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		2091
1648	new_from_layout CFClient::Texture $self->{layout}	2092	[$self->{layout}->size]
1649	};	2093	};
1650		2094
1651	unless (exists $self->{ox}) {	2095	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2096	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2097	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	2098	: ($self->{w} - $size->[0]) * 0.5);
1655		2099
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	2102	: ($self->{h} - $size->[1]) * 0.5);
1659	};	2103	};
1660		2104
1661	glEnable GL_TEXTURE_2D;	2105	my $w = List::Util::min $self->{w} + 4, $size->[0];
		2106	my $h = List::Util::min $self->{h} + 2, $size->[1];
1662		2107
1663	if ($tex->{format} == GL_ALPHA) {	2108	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670	}
1671
1672	glDisable GL_TEXTURE_2D;
1673	}	2109	}
1674		2110
1675	#############################################################################	2111	#############################################################################
1676		2112
1677	package CFClient::UI::EntryBase;	2113	package CFPlus::UI::EntryBase;
1678		2114
1679	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1680		2116
1681	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1682		2118
1683	sub new {	2119	sub new {
1684	my $class = shift;	2120	my $class = shift;
1685		2121
1686	$class->SUPER::new (	2122	$class->SUPER::new (
…		…
1690	active_fg => [0, 0, 0],	2126	active_fg => [0, 0, 0],
1691	can_hover => 1,	2127	can_hover => 1,
1692	can_focus => 1,	2128	can_focus => 1,
1693	valign => 0,	2129	valign => 0,
1694	can_events => 1,	2130	can_events => 1,
		2131	ellipsise => 0,
1695	#text => ...	2132	#text => ...
1696	#hidden => "*",	2133	#hidden => "*",
1697	@_	2134	@_
1698	)	2135	)
1699	}	2136	}
…		…
1710		2147
1711	$text =~ s/./*/g if $self->{hidden};	2148	$text =~ s/./*/g if $self->{hidden};
1712	$self->{layout}->set_text ("$text ");	2149	$self->{layout}->set_text ("$text ");
1713	delete $self->{size_req};	2150	delete $self->{size_req};
1714		2151
1715	$self->_emit (changed => $self->{text});	2152	$self->emit (changed => $self->{text});
1716		2153
1717	$self->realloc;	2154	$self->realloc;
1718	$self->update;	2155	$self->update;
1719	}	2156	}
1720		2157
…		…
1735	my ($w, $h) = $self->SUPER::size_request;	2172	my ($w, $h) = $self->SUPER::size_request;
1736		2173
1737	($w + 1, $h) # add 1 for cursor	2174	($w + 1, $h) # add 1 for cursor
1738	}	2175	}
1739		2176
1740	sub key_down {	2177	sub invoke_key_down {
1741	my ($self, $ev) = @_;	2178	my ($self, $ev) = @_;
1742		2179
1743	my $mod = $ev->{mod};	2180	my $mod = $ev->{mod};
1744	my $sym = $ev->{sym};	2181	my $sym = $ev->{sym};
1745	my $uni = $ev->{unicode};	2182	my $uni = $ev->{unicode};
1746		2183
1747	my $text = $self->get_text;	2184	my $text = $self->get_text;
		2185
		2186	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1748		2187
1749	if ($uni == 8) {	2188	if ($uni == 8) {
1750	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2189	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751	} elsif ($uni == 127) {	2190	} elsif ($uni == 127) {
1752	substr $text, $self->{cursor}, 1, "";	2191	substr $text, $self->{cursor}, 1, "";
1753	} elsif ($sym == CFClient::SDLK_LEFT) {	2192	} elsif ($sym == CFPlus::SDLK_LEFT) {
1754	--$self->{cursor} if $self->{cursor};	2193	--$self->{cursor} if $self->{cursor};
1755	} elsif ($sym == CFClient::SDLK_RIGHT) {	2194	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1756	++$self->{cursor} if $self->{cursor} < length $self->{text};	2195	++$self->{cursor} if $self->{cursor} < length $self->{text};
1757	} elsif ($sym == CFClient::SDLK_HOME) {	2196	} elsif ($sym == CFPlus::SDLK_HOME) {
		2197	# what a hack
		2198	$self->{cursor} =
		2199	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2200	? length $1
		2201	: 0;
		2202	} elsif ($sym == CFPlus::SDLK_END) {
		2203	# uh, again
		2204	$self->{cursor} =
		2205	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2206	? $self->{cursor} + length $1
		2207	: length $self->{text};
		2208	} elsif ($uni == 21) { # ctrl-u
		2209	$text = "";
1758	$self->{cursor} = 0;	2210	$self->{cursor} = 0;
1759	} elsif ($sym == CFClient::SDLK_END) {
1760	$self->{cursor} = length $text;
1761	} elsif ($uni == 27) {	2211	} elsif ($uni == 27) {
1762	$self->_emit ('escape');	2212	$self->emit ('escape');
1763	} elsif ($uni) {	2213	} elsif ($uni == 0x0d) {
		2214	substr $text, $self->{cursor}++, 0, "\012";
		2215	} elsif ($uni >= 0x20) {
1764	substr $text, $self->{cursor}++, 0, chr $uni;	2216	substr $text, $self->{cursor}++, 0, chr $uni;
1765	} else {	2217	} else {
1766	return 0;	2218	return 0;
1767	}	2219	}
1768		2220
1769	$self->_set_text ($text);	2221	$self->_set_text ($text);
1770		2222
1771	$self->realloc;	2223	$self->realloc;
		2224	$self->update;
1772		2225
1773	1	2226	1
1774	}	2227	}
1775		2228
1776	sub focus_in {	2229	sub invoke_focus_in {
1777	my ($self) = @_;	2230	my ($self) = @_;
1778		2231
1779	$self->{last_activity} = $::NOW;	2232	$self->{last_activity} = $::NOW;
1780		2233
1781	$self->SUPER::focus_in;	2234	$self->SUPER::invoke_focus_in
1782	}	2235	}
1783		2236
1784	sub button_down {	2237	sub invoke_button_down {
1785	my ($self, $ev, $x, $y) = @_;	2238	my ($self, $ev, $x, $y) = @_;
1786		2239
1787	$self->SUPER::button_down ($ev, $x, $y);	2240	$self->SUPER::invoke_button_down ($ev, $x, $y);
1788		2241
1789	my $idx = $self->{layout}->xy_to_index ($x, $y);	2242	my $idx = $self->{layout}->xy_to_index ($x, $y);
1790		2243
1791	# byte-index to char-index	2244	# byte-index to char-index
1792	my $text = $self->{text};	2245	my $text = $self->{text};
1793	utf8::encode $text;	2246	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794	$self->{cursor} = length substr $text, 0, $idx;	2247	$self->{cursor} = length $text;
1795		2248
1796	$self->_set_text ($self->{text});	2249	$self->_set_text ($self->{text});
1797	$self->update;	2250	$self->update;
1798		2251
1799	1	2252	1
1800	}	2253	}
1801		2254
1802	sub mouse_motion {	2255	sub invoke_mouse_motion {
1803	my ($self, $ev, $x, $y) = @_;	2256	my ($self, $ev, $x, $y) = @_;
1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2257	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805		2258
1806	0	2259	1
1807	}	2260	}
1808		2261
1809	sub _draw {	2262	sub _draw {
1810	my ($self) = @_;	2263	my ($self) = @_;
1811		2264
…		…
1838	utf8::encode $text;	2291	utf8::encode $text;
1839		2292
1840	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2293	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1841	}	2294	}
1842		2295
1843	glColor @{$self->{fg}};
1844	glBegin GL_LINES;	2296	glBegin GL_LINES;
1845	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2297	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1846	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2298	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1847	glEnd;	2299	glEnd;
1848	}	2300	}
1849	}	2301	}
1850		2302
		2303	#############################################################################
		2304
1851	package CFClient::UI::Entry;	2305	package CFPlus::UI::Entry;
1852		2306
1853	our @ISA = CFClient::UI::EntryBase::;	2307	our @ISA = CFPlus::UI::EntryBase::;
1854		2308
1855	use CFClient::OpenGL;	2309	use CFPlus::OpenGL;
1856		2310
1857	sub key_down {	2311	sub invoke_key_down {
1858	my ($self, $ev) = @_;	2312	my ($self, $ev) = @_;
1859		2313
1860	my $sym = $ev->{sym};	2314	my $sym = $ev->{sym};
1861		2315
1862	if ($sym == 13) {	2316	if ($ev->{uni} == 0x0d || $sym == 13) {
1863	unshift @{$self->{history}},	2317	unshift @{$self->{history}},
1864	my $txt = $self->get_text;	2318	my $txt = $self->get_text;
		2319
1865	$self->{history_pointer} = -1;	2320	$self->{history_pointer} = -1;
1866	$self->{history_saveback} = '';	2321	$self->{history_saveback} = '';
1867	$self->_emit (activate => $txt);	2322	$self->emit (activate => $txt);
1868	$self->update;	2323	$self->update;
1869		2324
1870	} elsif ($sym == CFClient::SDLK_UP) {	2325	} elsif ($sym == CFPlus::SDLK_UP) {
1871	if ($self->{history_pointer} < 0) {	2326	if ($self->{history_pointer} < 0) {
1872	$self->{history_saveback} = $self->get_text;	2327	$self->{history_saveback} = $self->get_text;
1873	}	2328	}
1874	if (@{$self->{history} || []} > 0) {	2329	if (@{$self->{history} || []} > 0) {
1875	$self->{history_pointer}++;	2330	$self->{history_pointer}++;
…		…
1877	$self->{history_pointer} = @{$self->{history} || []} - 1;	2332	$self->{history_pointer} = @{$self->{history} || []} - 1;
1878	}	2333	}
1879	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2334	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1880	}	2335	}
1881		2336
1882	} elsif ($sym == CFClient::SDLK_DOWN) {	2337	} elsif ($sym == CFPlus::SDLK_DOWN) {
1883	$self->{history_pointer}--;	2338	$self->{history_pointer}--;
1884	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2339	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885		2340
1886	if ($self->{history_pointer} >= 0) {	2341	if ($self->{history_pointer} >= 0) {
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2342	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	} else {	2343	} else {
1889	$self->set_text ($self->{history_saveback});	2344	$self->set_text ($self->{history_saveback});
1890	}	2345	}
1891		2346
1892	} else {	2347	} else {
1893	return $self->SUPER::key_down ($ev)	2348	return $self->SUPER::invoke_key_down ($ev)
1894	}	2349	}
1895		2350
1896	1	2351	1
1897	}	2352	}
1898		2353
1899	#############################################################################	2354	#############################################################################
1900		2355
		2356	package CFPlus::UI::TextEdit;
		2357
		2358	our @ISA = CFPlus::UI::EntryBase::;
		2359
		2360	use CFPlus::OpenGL;
		2361
		2362	sub move_cursor_ver {
		2363	my ($self, $dy) = @_;
		2364
		2365	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2366
		2367	$y += $dy;
		2368
		2369	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2370	$self->{cursor} = $index;
		2371	delete $self->{cur_h};
		2372	$self->update;
		2373	return;
		2374	}
		2375	}
		2376
		2377	sub invoke_key_down {
		2378	my ($self, $ev) = @_;
		2379
		2380	my $sym = $ev->{sym};
		2381
		2382	if ($sym == CFPlus::SDLK_UP) {
		2383	$self->move_cursor_ver (-1);
		2384	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2385	$self->move_cursor_ver (+1);
		2386	} else {
		2387	return $self->SUPER::invoke_key_down ($ev)
		2388	}
		2389
		2390	1
		2391	}
		2392
		2393	#############################################################################
		2394
1901	package CFClient::UI::Button;	2395	package CFPlus::UI::Button;
1902		2396
1903	our @ISA = CFClient::UI::Label::;	2397	our @ISA = CFPlus::UI::Label::;
1904		2398
1905	use CFClient::OpenGL;	2399	use CFPlus::OpenGL;
1906		2400
1907	my @tex =	2401	my @tex =
1908	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2402	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1909	qw(b1_button_active.png);	2403	qw(b1_button_inactive.png b1_button_active.png);
1910		2404
1911	sub new {	2405	sub new {
1912	my $class = shift;	2406	my $class = shift;
1913		2407
1914	$class->SUPER::new (	2408	$class->SUPER::new (
1915	padding_x => 4,	2409	padding_x => 4,
1916	padding_y => 4,	2410	padding_y => 4,
1917	fg => [1, 1, 1],	2411	fg => [1.0, 1.0, 1.0],
1918	active_fg => [0, 0, 1],	2412	active_fg => [0.8, 0.8, 0.8],
1919	can_hover => 1,	2413	can_hover => 1,
1920	align => 0,	2414	align => 0,
1921	valign => 0,	2415	valign => 0,
1922	can_events => 1,	2416	can_events => 1,
1923	@_	2417	@_
1924	)	2418	)
1925	}	2419	}
1926		2420
1927	sub activate { }
1928
1929	sub button_up {	2421	sub invoke_button_up {
1930	my ($self, $ev, $x, $y) = @_;	2422	my ($self, $ev, $x, $y) = @_;
1931		2423
1932	$self->emit ("activate")	2424	$self->emit ("activate")
1933	if $x >= 0 && $x < $self->{w}	2425	if $x >= 0 && $x < $self->{w}
1934	&& $y >= 0 && $y < $self->{h};	2426	&& $y >= 0 && $y < $self->{h};
…		…
1943		2435
1944	glEnable GL_TEXTURE_2D;	2436	glEnable GL_TEXTURE_2D;
1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1946	glColor 0, 0, 0, 1;	2438	glColor 0, 0, 0, 1;
1947		2439
		2440	my $tex = $tex[$GRAB == $self];
1948	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2441	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949		2442
1950	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1951		2444
1952	$self->SUPER::_draw;	2445	$self->SUPER::_draw;
1953	}	2446	}
1954		2447
1955	#############################################################################	2448	#############################################################################
1956		2449
1957	package CFClient::UI::CheckBox;	2450	package CFPlus::UI::CheckBox;
1958		2451
1959	our @ISA = CFClient::UI::DrawBG::;	2452	our @ISA = CFPlus::UI::DrawBG::;
1960		2453
1961	my @tex =	2454	my @tex =
1962	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2455	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2456	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964		2457
1965	use CFClient::OpenGL;	2458	use CFPlus::OpenGL;
1966		2459
1967	sub new {	2460	sub new {
1968	my $class = shift;	2461	my $class = shift;
1969		2462
1970	$class->SUPER::new (	2463	$class->SUPER::new (
…		…
1984	my ($self) = @_;	2477	my ($self) = @_;
1985		2478
1986	(6) x 2	2479	(6) x 2
1987	}	2480	}
1988		2481
		2482	sub toggle {
		2483	my ($self) = @_;
		2484
		2485	$self->{state} = !$self->{state};
		2486	$self->emit (changed => $self->{state});
		2487	$self->update;
		2488	}
		2489
1989	sub button_down {	2490	sub invoke_button_down {
1990	my ($self, $ev, $x, $y) = @_;	2491	my ($self, $ev, $x, $y) = @_;
1991		2492
1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2493	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2494	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994	$self->{state} = !$self->{state};	2495	$self->toggle;
1995	$self->_emit (changed => $self->{state});
1996	} else {	2496	} else {
1997	return 0	2497	return 0
1998	}	2498	}
1999		2499
2000	1	2500	1
…		…
2020	glDisable GL_TEXTURE_2D;	2520	glDisable GL_TEXTURE_2D;
2021	}	2521	}
2022		2522
2023	#############################################################################	2523	#############################################################################
2024		2524
2025	package CFClient::UI::Image;	2525	package CFPlus::UI::Image;
2026		2526
2027	our @ISA = CFClient::UI::Base::;	2527	our @ISA = CFPlus::UI::Base::;
2028		2528
2029	use CFClient::OpenGL;	2529	use CFPlus::OpenGL;
2030	use Carp qw/confess/;
2031		2530
2032	our %loaded_images;	2531	our %texture_cache;
2033		2532
2034	sub new {	2533	sub new {
2035	my $class = shift;	2534	my $class = shift;
2036		2535
2037	my $self = $class->SUPER::new (can_events => 0, @_);	2536	my $self = $class->SUPER::new (
		2537	can_events => 0,
		2538	@_,
		2539	);
2038		2540
2039	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2541	$self->{path} || $self->{tex}
		2542	or Carp::croak "'path' or 'tex' attributes required";
2040		2543
2041	$loaded_images{$self->{image}} ||=	2544	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2042	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2545	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2043		2546
2044	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2547	CFPlus::weaken $texture_cache{$self->{path}};
2045		2548
2046	Scalar::Util::weaken $loaded_images{$self->{image}};	2549	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048	$self->{aspect} = $tex->{w} / $tex->{h};
2049		2550
2050	$self	2551	$self
2051	}	2552	}
2052		2553
		2554	sub STORABLE_freeze {
		2555	my ($self, $cloning) = @_;
		2556
		2557	$self->{path}
		2558	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2559
		2560	$self->{path}
		2561	}
		2562
		2563	sub STORABLE_attach {
		2564	my ($self, $cloning, $path) = @_;
		2565
		2566	$self->new (path => $path)
		2567	}
		2568
2053	sub size_request {	2569	sub size_request {
2054	my ($self) = @_;	2570	my ($self) = @_;
2055		2571
2056	($self->{tex}->{w}, $self->{tex}->{h})	2572	($self->{tex}{w}, $self->{tex}{h})
2057	}	2573	}
2058		2574
2059	sub _draw {	2575	sub _draw {
2060	my ($self) = @_;	2576	my ($self) = @_;
2061		2577
…		…
2071	}	2587	}
2072		2588
2073	glEnable GL_TEXTURE_2D;	2589	glEnable GL_TEXTURE_2D;
2074	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2075		2591
2076	$tex->draw_quad_alpha (0, 0, $w, $h);	2592	$tex->draw_quad (0, 0, $w, $h);
2077		2593
2078	glDisable GL_TEXTURE_2D;	2594	glDisable GL_TEXTURE_2D;
2079	}	2595	}
2080		2596
2081	#############################################################################	2597	#############################################################################
2082		2598
		2599	package CFPlus::UI::ImageButton;
		2600
		2601	our @ISA = CFPlus::UI::Image::;
		2602
		2603	use CFPlus::OpenGL;
		2604
		2605	my %textures;
		2606
		2607	sub new {
		2608	my $class = shift;
		2609
		2610	my $self = $class->SUPER::new (
		2611	padding_x => 4,
		2612	padding_y => 4,
		2613	fg => [1, 1, 1],
		2614	active_fg => [0, 0, 1],
		2615	can_hover => 1,
		2616	align => 0,
		2617	valign => 0,
		2618	can_events => 1,
		2619	@_
		2620	);
		2621	}
		2622
		2623	sub invoke_button_up {
		2624	my ($self, $ev, $x, $y) = @_;
		2625
		2626	$self->emit ("activate")
		2627	if $x >= 0 && $x < $self->{w}
		2628	&& $y >= 0 && $y < $self->{h};
		2629
		2630	1
		2631	}
		2632
		2633	#############################################################################
		2634
2083	package CFClient::UI::VGauge;	2635	package CFPlus::UI::VGauge;
2084		2636
2085	our @ISA = CFClient::UI::Base::;	2637	our @ISA = CFPlus::UI::Base::;
2086		2638
2087	use List::Util qw(min max);	2639	use List::Util qw(min max);
2088		2640
2089	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2090		2642
2091	my %tex = (	2643	my %tex = (
2092	food => [	2644	food => [
2093	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2645	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2646	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095	],	2647	],
2096	grace => [	2648	grace => [
2097	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2649	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2098	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2650	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2099	],	2651	],
2100	hp => [	2652	hp => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2654	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103	],	2655	],
2104	mana => [	2656	mana => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2658	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2107	],	2659	],
2108	);	2660	);
2109		2661
2110	# eg. VGauge->new (gauge => 'food'), default gauge: food	2662	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2170	my $ycut1 = max 0, min 1, $ycut;	2722	my $ycut1 = max 0, min 1, $ycut;
2171	my $ycut2 = max 0, min 1, $ycut - 1;	2723	my $ycut2 = max 0, min 1, $ycut - 1;
2172		2724
2173	my $h1 = $self->{h} * (1 - $ycut1);	2725	my $h1 = $self->{h} * (1 - $ycut1);
2174	my $h2 = $self->{h} * (1 - $ycut2);	2726	my $h2 = $self->{h} * (1 - $ycut2);
		2727	my $h3 = $self->{h};
		2728
		2729	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175		2730
2176	glEnable GL_BLEND;	2731	glEnable GL_BLEND;
2177	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2732	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2733	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179	glEnable GL_TEXTURE_2D;	2734	glEnable GL_TEXTURE_2D;
…		…
2198		2753
2199	if ($t3) {	2754	if ($t3) {
2200	glBindTexture GL_TEXTURE_2D, $t3->{name};	2755	glBindTexture GL_TEXTURE_2D, $t3->{name};
2201	glBegin GL_QUADS;	2756	glBegin GL_QUADS;
2202	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2758	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206	glEnd;	2761	glEnd;
2207	}	2762	}
2208		2763
2209	glDisable GL_BLEND;	2764	glDisable GL_BLEND;
2210	glDisable GL_TEXTURE_2D;	2765	glDisable GL_TEXTURE_2D;
2211	}	2766	}
2212		2767
2213	#############################################################################	2768	#############################################################################
2214		2769
2215	package CFClient::UI::Gauge;	2770	package CFPlus::UI::Gauge;
2216		2771
2217	our @ISA = CFClient::UI::VBox::;	2772	our @ISA = CFPlus::UI::VBox::;
2218		2773
2219	sub new {	2774	sub new {
2220	my ($class, %arg) = @_;	2775	my ($class, %arg) = @_;
2221		2776
2222	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
…		…
2224	can_hover => 1,	2779	can_hover => 1,
2225	can_events => 1,	2780	can_events => 1,
2226	%arg,	2781	%arg,
2227	);	2782	);
2228		2783
2229	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2784	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2230	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2785	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2231	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2786	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2232		2787
2233	$self	2788	$self
2234	}	2789	}
2235		2790
2236	sub set_fontsize {	2791	sub set_fontsize {
…		…
2257	$self->{value}->set_text ($val);	2812	$self->{value}->set_text ($val);
2258	}	2813	}
2259		2814
2260	#############################################################################	2815	#############################################################################
2261		2816
2262	package CFClient::UI::Slider;	2817	package CFPlus::UI::Slider;
2263		2818
2264	use strict;	2819	use strict;
2265		2820
2266	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2267		2822
2268	our @ISA = CFClient::UI::DrawBG::;	2823	our @ISA = CFPlus::UI::DrawBG::;
2269		2824
2270	my @tex =	2825	my @tex =
2271	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2826	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2272	qw(s1_slider.png s1_slider_bg.png);	2827	qw(s1_slider.png s1_slider_bg.png);
2273		2828
2274	sub new {	2829	sub new {
2275	my $class = shift;	2830	my $class = shift;
2276		2831
…		…
2297	$self->update;	2852	$self->update;
2298		2853
2299	$self	2854	$self
2300	}	2855	}
2301		2856
2302	sub changed { }
2303
2304	sub set_range {	2857	sub set_range {
2305	my ($self, $range) = @_;	2858	my ($self, $range) = @_;
2306		2859
2307	($range, $self->{range}) = ($self->{range}, $range);	2860	($range, $self->{range}) = ($self->{range}, $range);
2308		2861
2309	$self->update
2310	if "@$range" ne "@{$self->{range}}";	2862	if ("@$range" ne "@{$self->{range}}") {
		2863	$self->update;
		2864	$self->set_value ($self->{range}[0]);
		2865	}
2311	}	2866	}
2312		2867
2313	sub set_value {	2868	sub set_value {
2314	my ($self, $value) = @_;	2869	my ($self, $value) = @_;
2315		2870
…		…
2326	if $unit;	2881	if $unit;
2327		2882
2328	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2883	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329		2884
2330	if ($value != $old_value) {	2885	if ($value != $old_value) {
2331	$self->_emit (changed => $value);	2886	$self->emit (changed => $value);
2332	$self->update;	2887	$self->update;
2333	}	2888	}
2334	}	2889	}
2335		2890
2336	sub size_request {	2891	sub size_request {
2337	my ($self) = @_;	2892	my ($self) = @_;
2338		2893
2339	($self->{req_w}, $self->{req_h})	2894	($self->{req_w}, $self->{req_h})
2340	}	2895	}
2341		2896
2342	sub button_down {	2897	sub invoke_button_down {
2343	my ($self, $ev, $x, $y) = @_;	2898	my ($self, $ev, $x, $y) = @_;
2344		2899
2345	$self->SUPER::button_down ($ev, $x, $y);	2900	$self->SUPER::invoke_button_down ($ev, $x, $y);
2346		2901
2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348		2903
2349	$self->mouse_motion ($ev, $x, $y)	2904	$self->invoke_mouse_motion ($ev, $x, $y)
2350	}	2905	}
2351		2906
2352	sub mouse_motion {	2907	sub invoke_mouse_motion {
2353	my ($self, $ev, $x, $y) = @_;	2908	my ($self, $ev, $x, $y) = @_;
2354		2909
2355	if ($GRAB == $self) {	2910	if ($GRAB == $self) {
2356	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2911	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357		2912
…		…
2363	} else {	2918	} else {
2364	return 0;	2919	return 0;
2365	}	2920	}
2366		2921
2367	1	2922	1
		2923	}
		2924
		2925	sub invoke_mouse_wheel {
		2926	my ($self, $ev) = @_;
		2927
		2928	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2929
		2930	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2931
		2932	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2933
		2934	! ! $delta
2368	}	2935	}
2369		2936
2370	sub update {	2937	sub update {
2371	my ($self) = @_;	2938	my ($self) = @_;
2372		2939
…		…
2421	glDisable GL_TEXTURE_2D;	2988	glDisable GL_TEXTURE_2D;
2422	}	2989	}
2423		2990
2424	#############################################################################	2991	#############################################################################
2425		2992
2426	package CFClient::UI::ValSlider;	2993	package CFPlus::UI::ValSlider;
2427		2994
2428	our @ISA = CFClient::UI::HBox::;	2995	our @ISA = CFPlus::UI::HBox::;
2429		2996
2430	sub new {	2997	sub new {
2431	my ($class, %arg) = @_;	2998	my ($class, %arg) = @_;
2432		2999
2433	my $range = delete $arg{range};	3000	my $range = delete $arg{range};
2434		3001
2435	my $self = $class->SUPER::new (	3002	my $self = $class->SUPER::new (
2436	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3003	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2437	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3004	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2438	to_value => sub { shift },	3005	to_value => sub { shift },
2439	from_value => sub { shift },	3006	from_value => sub { shift },
2440	%arg,	3007	%arg,
2441	);	3008	);
2442		3009
…		…
2462	sub set_range { shift->{slider}->set_range (@_) }	3029	sub set_range { shift->{slider}->set_range (@_) }
2463	sub set_value { shift->{slider}->set_value (@_) }	3030	sub set_value { shift->{slider}->set_value (@_) }
2464		3031
2465	#############################################################################	3032	#############################################################################
2466		3033
2467	package CFClient::UI::TextView;	3034	package CFPlus::UI::TextScroller;
2468		3035
2469	our @ISA = CFClient::UI::HBox::;	3036	our @ISA = CFPlus::UI::HBox::;
2470		3037
2471	use CFClient::OpenGL;	3038	use CFPlus::OpenGL;
2472		3039
2473	sub new {	3040	sub new {
2474	my $class = shift;	3041	my $class = shift;
2475		3042
2476	my $self = $class->SUPER::new (	3043	my $self = $class->SUPER::new (
2477	fontsize => 1,	3044	fontsize => 1,
2478	can_events => 0,	3045	can_events => 1,
		3046	indent => 0,
2479	#font => default_font	3047	#font => default_font
2480	@_,	3048	@_,
2481		3049
2482	layout => (new CFClient::Layout 1),	3050	layout => (new CFPlus::Layout),
2483	par => [],	3051	par => [],
		3052	max_par => 0,
2484	height => 0,	3053	height => 0,
2485	children => [	3054	children => [
2486	(new CFClient::UI::Empty expand => 1),	3055	(new CFPlus::UI::Empty expand => 1),
2487	(new CFClient::UI::Slider vertical => 1),	3056	(new CFPlus::UI::Slider vertical => 1),
2488	],	3057	],
2489	);	3058	);
2490		3059
2491	$self->{children}[1]->connect (changed => sub { $self->update });	3060	$self->{children}[1]->connect (changed => sub { $self->update });
2492		3061
…		…
2498		3067
2499	$self->{fontsize} = $fontsize;	3068	$self->{fontsize} = $fontsize;
2500	$self->reflow;	3069	$self->reflow;
2501	}	3070	}
2502		3071
		3072	sub size_request {
		3073	my ($self) = @_;
		3074
		3075	my ($empty, $slider) = @{ $self->{children} };
		3076
		3077	local $self->{children} = [$empty, $slider];
		3078	$self->SUPER::size_request
		3079	}
		3080
2503	sub size_allocate {	3081	sub invoke_size_allocate {
2504	my ($self, $w, $h) = @_;	3082	my ($self, $w, $h) = @_;
2505		3083
2506	$self->SUPER::size_allocate ($w, $h);	3084	my ($empty, $slider, @other) = @{ $self->{children} };
		3085	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507		3086
2508	$self->{layout}->set_font ($self->{font}) if $self->{font};	3087	$self->{layout}->set_font ($self->{font}) if $self->{font};
2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3088	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510	$self->{layout}->set_width ($self->{children}[0]{w});	3089	$self->{layout}->set_width ($empty->{w});
2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	3090	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512		3091
2513	$self->reflow;	3092	$self->reflow;
2514	}
2515		3093
2516	sub text_size {	3094	local $self->{children} = [$empty, $slider];
		3095	$self->SUPER::invoke_size_allocate ($w, $h)
		3096	}
		3097
		3098	sub invoke_mouse_wheel {
2517	my ($self, $text, $indent) = @_;	3099	my ($self, $ev) = @_;
		3100
		3101	return 0 unless $ev->{dy}; # only vertical movements
		3102
		3103	$self->{children}[1]->emit (mouse_wheel => $ev);
		3104
		3105	1
		3106	}
		3107
		3108	sub get_layout {
		3109	my ($self, $para) = @_;
2518		3110
2519	my $layout = $self->{layout};	3111	my $layout = $self->{layout};
2520		3112
		3113	$layout->set_font ($self->{font}) if $self->{font};
		3114	$layout->set_foreground (@{$para->{fg}});
2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3115	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522	$layout->set_width ($self->{children}[0]{w} - $indent);	3116	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	3117	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524	$layout->set_markup ($text);	3118	$layout->set_markup ($para->{markup});
		3119
		3120	$layout->set_shapes (
		3121	map
		3122	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3123	@{$para->{widget}}
2525		3124	);
		3125
2526	$layout->size	3126	$layout
2527	}	3127	}
2528		3128
2529	sub reflow {	3129	sub reflow {
2530	my ($self) = @_;	3130	my ($self) = @_;
2531		3131
…		…
2538		3138
2539	# todo: base offset on lines or so, not on pixels	3139	# todo: base offset on lines or so, not on pixels
2540	$self->{children}[1]->set_value ($offset);	3140	$self->{children}[1]->set_value ($offset);
2541	}	3141	}
2542		3142
		3143	sub current_paragraph {
		3144	my ($self) = @_;
		3145
		3146	$self->{top_paragraph} - 1
		3147	}
		3148
		3149	sub scroll_to {
		3150	my ($self, $para) = @_;
		3151
		3152	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3153
		3154	$self->{scroll_to} = $para;
		3155	$self->update;
		3156	}
		3157
2543	sub clear {	3158	sub clear {
2544	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	my (undef, undef, @other) = @{ $self->{children} };
		3162	$self->remove ($_) for @other;
2545		3163
2546	$self->{par} = [];	3164	$self->{par} = [];
2547	$self->{height} = 0;	3165	$self->{height} = 0;
2548	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3166	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549	}	3167	}
2550		3168
2551	sub add_paragraph {	3169	sub add_paragraph {
2552	my ($self, $color, $text, $indent) = @_;	3170	my $self = shift;
2553		3171
2554	for my $line (split /\n/, $text) {	3172	for my $para (@_) {
2555	my ($w, $h) = $self->text_size ($line);	3173	$para = {
		3174	fg => [1, 1, 1, 1],
		3175	indent => 0,
		3176	markup => "",
		3177	widget => [],
		3178	ref $para ? %$para : (markup => $para),
		3179	w => 1e10,
		3180	wrapped => 1,
		3181	};
		3182
		3183	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3184	push @{$self->{par}}, $para;
		3185	}
		3186
		3187	if (my $max = $self->{max_par}) {
		3188	shift @{$self->{par}} while @{$self->{par}} > $max;
		3189	}
		3190
		3191	$self->{need_reflow}++;
		3192	$self->update;
		3193	}
		3194
		3195	sub scroll_to_bottom {
		3196	my ($self) = @_;
		3197
		3198	$self->{scroll_to} = $#{$self->{par}};
		3199	$self->update;
		3200	}
		3201
		3202	sub force_uptodate {
		3203	my ($self) = @_;
		3204
		3205	if (delete $self->{need_reflow}) {
		3206	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3207
		3208	my $height = 0;
		3209
		3210	for my $para (@{$self->{par}}) {
		3211	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3212	my $layout = $self->get_layout ($para);
		3213	my ($w, $h) = $layout->size;
		3214
		3215	$para->{w} = $w + $para->{indent};
		3216	$para->{h} = $h;
		3217	$para->{wrapped} = $layout->has_wrapped;
		3218	}
		3219
		3220	$para->{y} = $height;
		3221	$height += $para->{h};
		3222	}
		3223
2556	$self->{height} += $h;	3224	$self->{height} = $height;
2557	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3225	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2558	}
2559		3226
2560	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3227	delete $self->{texture};
		3228	}
		3229
		3230	if (my $paridx = delete $self->{scroll_to}) {
		3231	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3232	}
2561	}	3233	}
2562		3234
2563	sub update {	3235	sub update {
2564	my ($self) = @_;	3236	my ($self) = @_;
2565		3237
…		…
2567		3239
2568	return unless $self->{h} > 0;	3240	return unless $self->{h} > 0;
2569		3241
2570	delete $self->{texture};	3242	delete $self->{texture};
2571		3243
2572	$ROOT->on_post_alloc ($self, sub {	3244	$ROOT->on_post_alloc ($self => sub {
		3245	$self->force_uptodate;
		3246
2573	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3247	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574		3248
2575	if (delete $self->{need_reflow}) {
2576	my $height = 0;
2577
2578	my $layout = $self->{layout};
2579
2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582	for (@{$self->{par}}) {
2583	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2584	$layout->set_width ($W - $_->[3]);
2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586	$layout->set_markup ($_->[4]);
2587	my ($w, $h) = $layout->size;
2588	$_->[0] = $w + $_->[3];
2589	$_->[1] = $h;
2590	}
2591
2592	$height += $_->[1];
2593	}
2594
2595	$self->{height} = $height;
2596
2597	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2598
2599	delete $self->{texture};
2600	}
2601
2602	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3249	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2603	glClearColor 0, 0, 0, 0;	3250	glClearColor 0, 0, 0, 0;
2604	glClear GL_COLOR_BUFFER_BIT;	3251	glClear GL_COLOR_BUFFER_BIT;
2605		3252
		3253	package CFPlus::UI::Base;
		3254	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3255	(0, 0, $self->{w}, $self->{h});
		3256
		3257	my $top = int $self->{children}[1]{range}[0];
		3258
		3259	my $paridx = 0;
		3260	my $top_paragraph;
2606	my $top = int $self->{children}[1]{range}[0];	3261	my $top = int $self->{children}[1]{range}[0];
2607		3262
2608	my $y0 = $top;	3263	my $y0 = $top;
2609	my $y1 = $top + $H;	3264	my $y1 = $top + $H;
2610		3265
2611	my $y = 0;
2612
2613	my $layout = $self->{layout};
2614
2615	$layout->set_font ($self->{font}) if $self->{font};
2616
2617	glEnable GL_BLEND;
2618	#TODO# not correct in windows where rgba is forced off
2619	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620
2621	for my $par (@{$self->{par}}) {	3266	for my $para (@{$self->{par}}) {
2622	my $h = $par->[1];	3267	my $h = $para->{h};
		3268	my $y = $para->{y};
2623		3269
2624	if ($y0 < $y + $h && $y < $y1) {	3270	if ($y0 < $y + $h && $y < $y1) {
2625	$layout->set_foreground (@{ $par->[2] });	3271	my $layout = $self->get_layout ($para);
2626	$layout->set_width ($W - $par->[3]);
2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628	$layout->set_markup ($par->[4]);
2629		3272
2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3273	$layout->render ($para->{indent}, $y - $y0);
2631		3274
2632	glRasterPos $par->[3], $y - $y0;	3275	if (my @w = @{ $para->{widget} }) {
2633	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3276	my @s = $layout->get_shapes;
		3277
		3278	for (@w) {
		3279	my ($dx, $dy) = splice @s, 0, 2, ();
		3280
		3281	$_->{x} = $dx + $para->{indent};
		3282	$_->{y} = $dy + $y - $y0;
		3283
		3284	$_->draw;
		3285	}
		3286	}
2634	}	3287	}
2635		3288
2636	$y += $h;	3289	$paridx++;
		3290	$top_paragraph ||= $paridx if $y >= $top;
2637	}	3291	}
2638		3292
2639	glDisable GL_BLEND;	3293	$self->{top_paragraph} = $top_paragraph;
2640	};	3294	};
2641	});	3295	});
		3296	}
		3297
		3298	sub reconfigure {
		3299	my ($self) = @_;
		3300
		3301	$self->SUPER::reconfigure;
		3302
		3303	$_->{w} = 1e10 for @{ $self->{par} };
		3304	$self->reflow;
2642	}	3305	}
2643		3306
2644	sub _draw {	3307	sub _draw {
2645	my ($self) = @_;	3308	my ($self) = @_;
2646		3309
…		…
2649	glColor 0, 0, 0, 1;	3312	glColor 0, 0, 0, 1;
2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3313	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2651	glDisable GL_TEXTURE_2D;	3314	glDisable GL_TEXTURE_2D;
2652		3315
2653	$self->{children}[1]->draw;	3316	$self->{children}[1]->draw;
2654
2655	}	3317	}
2656		3318
2657	#############################################################################	3319	#############################################################################
2658		3320
2659	package CFClient::UI::Animator;	3321	package CFPlus::UI::Animator;
2660		3322
2661	use CFClient::OpenGL;	3323	use CFPlus::OpenGL;
2662		3324
2663	our @ISA = CFClient::UI::Bin::;	3325	our @ISA = CFPlus::UI::Bin::;
2664		3326
2665	sub moveto {	3327	sub moveto {
2666	my ($self, $x, $y) = @_;	3328	my ($self, $x, $y) = @_;
2667		3329
2668	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3330	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2696	glPopMatrix;	3358	glPopMatrix;
2697	}	3359	}
2698		3360
2699	#############################################################################	3361	#############################################################################
2700		3362
2701	package CFClient::UI::Flopper;	3363	package CFPlus::UI::Flopper;
2702		3364
2703	our @ISA = CFClient::UI::Button::;	3365	our @ISA = CFPlus::UI::Button::;
2704		3366
2705	sub new {	3367	sub new {
2706	my $class = shift;	3368	my $class = shift;
2707		3369
2708	my $self = $class->SUPER::new (	3370	my $self = $class->SUPER::new (
…		…
2720	$self->{other}->toggle_visibility;	3382	$self->{other}->toggle_visibility;
2721	}	3383	}
2722		3384
2723	#############################################################################	3385	#############################################################################
2724		3386
2725	package CFClient::UI::Tooltip;	3387	package CFPlus::UI::Tooltip;
2726		3388
2727	our @ISA = CFClient::UI::Bin::;	3389	our @ISA = CFPlus::UI::Bin::;
2728		3390
2729	use CFClient::OpenGL;	3391	use CFPlus::OpenGL;
2730		3392
2731	sub new {	3393	sub new {
2732	my $class = shift;	3394	my $class = shift;
2733		3395
2734	$class->SUPER::new (	3396	$class->SUPER::new (
…		…
2737	)	3399	)
2738	}	3400	}
2739		3401
2740	sub set_tooltip_from {	3402	sub set_tooltip_from {
2741	my ($self, $widget) = @_;	3403	my ($self, $widget) = @_;
		3404
		3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3406	if $widget->{tooltip} =~ /^#(.*)$/;
2742		3407
2743	my $tooltip = $widget->{tooltip};	3408	my $tooltip = $widget->{tooltip};
2744		3409
2745	if ($ENV{CFPLUS_DEBUG} & 2) {	3410	if ($ENV{CFPLUS_DEBUG} & 2) {
2746	$tooltip .= "\n\n" . (ref $widget) . "\n"	3411	$tooltip .= "\n\n" . (ref $widget) . "\n"
2747	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3412	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748	. "req $widget->{req_w} $widget->{req_h}\n"	3413	. "req $widget->{req_w} $widget->{req_h}\n"
2749	. "visible $widget->{visible}";	3414	. "visible $widget->{visible}";
2750	}	3415	}
2751		3416
		3417	$tooltip =~ s/^\n+//;
		3418	$tooltip =~ s/\n+$//;
		3419
2752	$self->add (new CFClient::UI::Label	3420	$self->add (new CFPlus::UI::Label
2753	markup => $tooltip,	3421	markup => $tooltip,
2754	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3422	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755	fontsize => 0.8,	3423	fontsize => 0.8,
2756	fg => [0, 0, 0, 1],	3424	style => 1, # FLAG_INVERSE
2757	ellipsise => 0,	3425	ellipsise => 0,
2758	font => ($widget->{tooltip_font} || $::FONT_PROP),	3426	font => ($widget->{tooltip_font} || $::FONT_PROP),
2759	);	3427	);
2760	}	3428	}
2761		3429
…		…
2765	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3433	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766		3434
2767	($w + 4, $h + 4)	3435	($w + 4, $h + 4)
2768	}	3436	}
2769		3437
2770	sub size_allocate {	3438	sub invoke_size_allocate {
2771	my ($self, $w, $h) = @_;	3439	my ($self, $w, $h) = @_;
2772		3440
2773	$self->SUPER::size_allocate ($w - 4, $h - 4);	3441	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774	}	3442	}
2775		3443
2776	sub visibility_change {	3444	sub invoke_visibility_change {
2777	my ($self, $visible) = @_;	3445	my ($self, $visible) = @_;
2778		3446
2779	return unless $visible;	3447	return unless $visible;
2780		3448
2781	$self->{root}->on_post_alloc ("move_$self" => sub {	3449	$self->{root}->on_post_alloc ("move_$self" => sub {
2782	my $widget = $self->{owner}	3450	my $widget = $self->{owner}
2783	or return;	3451	or return;
2784		3452
		3453	if ($widget->{visible}) {
2785	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3454	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786		3455
2787	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3456	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788	if $x + $self->{w} > $::WIDTH;	3457	if $x + $self->{w} > $self->{root}{w};
2789		3458
2790	$self->move_abs ($x, $y);	3459	$self->move_abs ($x, $y);
		3460	} else {
		3461	$self->hide;
		3462	}
2791	});	3463	});
2792	}	3464	}
2793		3465
2794	sub _draw {	3466	sub _draw {
2795	my ($self) = @_;	3467	my ($self) = @_;
…		…
2819	$self->SUPER::_draw;	3491	$self->SUPER::_draw;
2820	}	3492	}
2821		3493
2822	#############################################################################	3494	#############################################################################
2823		3495
2824	package CFClient::UI::Face;	3496	package CFPlus::UI::Face;
2825		3497
2826	our @ISA = CFClient::UI::Base::;	3498	our @ISA = CFPlus::UI::DrawBG::;
2827		3499
2828	use CFClient::OpenGL;	3500	use CFPlus::OpenGL;
2829		3501
2830	sub new {	3502	sub new {
2831	my $class = shift;	3503	my $class = shift;
2832		3504
2833	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	size_w => 32,
		3507	size_h => 8,
2834	aspect => 1,	3508	aspect => 1,
2835	can_events => 0,	3509	can_events => 0,
2836	@_,	3510	@_,
2837	);	3511	);
2838		3512
2839	if ($self->{anim} && $self->{animspeed}) {	3513	if ($self->{anim} && $self->{animspeed}) {
2840	Scalar::Util::weaken (my $widget = $self);	3514	CFPlus::weaken (my $widget = $self);
2841		3515
		3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2842	$self->{timer} = Event->timer (	3518	$self->{timer} = Event->timer (
2843	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2844	hard => 1,	3519	parked => 1,
2845	interval => $self->{animspeed},
2846	cb => sub {	3520	cb => sub {
		3521	return unless $::CONN && $widget;
		3522
2847	++$widget->{frame};	3523	++$widget->{frame};
		3524	$widget->update_face;
2848	$widget->update;	3525	$widget->update;
		3526
		3527	$widget->update_timer;
2849	},	3528	},
2850	);	3529	);
		3530
		3531	$self->update_face;
		3532	$self->update_timer;
2851	}	3533	}
2852		3534
2853	$self	3535	$self
2854	}	3536	}
2855		3537
		3538	sub update_timer {
		3539	my ($self) = @_;
		3540
		3541	return unless $self->{timer};
		3542
		3543	if ($self->{visible}) {
		3544	$self->{timer}->at (
		3545	$self->{anim_start}
		3546	+ $self->{animspeed}
		3547	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3548	);
		3549	$self->{timer}->start;
		3550	} else {
		3551	$self->{timer}->stop;
		3552	}
		3553	}
		3554
		3555	sub update_face {
		3556	my ($self) = @_;
		3557
		3558	return unless $::CONN;
		3559
		3560	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3561	if ($anim && @$anim) {
		3562	delete $self->{wait_face};
		3563	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3564	}
		3565	}
		3566	}
		3567
2856	sub size_request {	3568	sub size_request {
2857	(32, 8)	3569	my ($self) = @_;
		3570
		3571	if ($::CONN) {
		3572	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3573	if (my $tex = $::CONN->{texture}[$faceid]) {
		3574	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3575	} else {
		3576	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3577	$self->realloc;
		3578	});
		3579	}
		3580	}
		3581	}
		3582
		3583	($self->{size_w} || 8, $self->{size_h} || 8)
2858	}	3584	}
2859		3585
2860	sub update {	3586	sub update {
2861	my ($self) = @_;	3587	my ($self) = @_;
2862		3588
2863	return unless $self->{visible};	3589	return unless $self->{visible};
2864		3590
2865	$self->SUPER::update;	3591	$self->SUPER::update;
2866	}	3592	}
2867		3593
		3594	sub invoke_visibility_change {
		3595	my ($self) = @_;
		3596
		3597	$self->update_timer;
		3598
		3599	0
		3600	}
		3601
2868	sub _draw {	3602	sub _draw {
2869	my ($self) = @_;	3603	my ($self) = @_;
2870		3604
2871	return unless $::CONN;	3605	return unless $::CONN;
2872		3606
2873	my $face;	3607	$self->SUPER::_draw;
2874		3608
2875	if ($self->{frame}) {
2876	my $anim = $::CONN->{anim}[$self->{anim}];	3609	my $faceid = $::CONN->{faceid}[$self->{face}]
2877		3610	or return;
2878	$face = $anim->[ $self->{frame} % @$anim ]
2879	if $anim && @$anim;
2880	}
2881		3611
2882	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3612	my $tex = $::CONN->{texture}[$faceid];
2883		3613
2884	if ($tex) {	3614	if ($tex) {
2885	glEnable GL_TEXTURE_2D;	3615	glEnable GL_TEXTURE_2D;
2886	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2887	glColor 0, 0, 0, 1;	3617	glColor 0, 0, 0, 1;
2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3618	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889	glDisable GL_TEXTURE_2D;	3619	glDisable GL_TEXTURE_2D;
2890	}	3620	}
2891	}	3621	}
2892		3622
2893	sub DESTROY {	3623	sub destroy {
2894	my ($self) = @_;	3624	my ($self) = @_;
2895		3625
2896	$self->{timer}->cancel	3626	(delete $self->{timer})->cancel
2897	if $self->{timer};	3627	if $self->{timer};
2898		3628
2899	$self->SUPER::DESTROY;	3629	$self->SUPER::destroy;
2900	}	3630	}
2901		3631
2902	#############################################################################	3632	#############################################################################
2903		3633
2904	package CFClient::UI::Buttonbar;	3634	package CFPlus::UI::Buttonbar;
2905		3635
2906	our @ISA = CFClient::UI::HBox::;	3636	our @ISA = CFPlus::UI::HBox::;
2907		3637
2908	# TODO: should actualyl wrap buttons and other goodies.	3638	# TODO: should actually wrap buttons and other goodies.
2909		3639
2910	#############################################################################	3640	#############################################################################
2911		3641
2912	package CFClient::UI::Menu;	3642	package CFPlus::UI::Menu;
2913		3643
2914	our @ISA = CFClient::UI::FancyFrame::;	3644	our @ISA = CFPlus::UI::Toplevel::;
2915		3645
2916	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2917		3647
2918	sub new {	3648	sub new {
2919	my $class = shift;	3649	my $class = shift;
2920		3650
2921	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
2922	items => [],	3652	items => [],
2923	z => 100,	3653	z => 100,
2924	@_,	3654	@_,
2925	);	3655	);
2926		3656
2927	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3657	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2928		3658
2929	for my $item (@{ $self->{items} }) {	3659	for my $item (@{ $self->{items} }) {
2930	my ($widget, $cb, $tooltip) = @$item;	3660	my ($widget, $cb, $tooltip) = @$item;
2931		3661
2932	# handle various types of items, only text for now	3662	# handle various types of items, only text for now
2933	if (!ref $widget) {	3663	if (!ref $widget) {
		3664	if ($widget =~ /\t/) {
		3665	my ($left, $right) = split /\t/, $widget, 2;
		3666
2934	$widget = new CFClient::UI::Label	3667	$widget = new CFPlus::UI::HBox
2935	can_hover => 1,	3668	can_hover => 1,
2936	can_events => 1,	3669	can_events => 1,
2937	text => $widget,
2938	tooltip => $tooltip	3670	tooltip => $tooltip,
		3671	children => [
		3672	(new CFPlus::UI::Label markup => $left, expand => 1),
		3673	(new CFPlus::UI::Label markup => $right, align => +1),
		3674	],
		3675	;
		3676
		3677	} else {
		3678	$widget = new CFPlus::UI::Label
		3679	can_hover => 1,
		3680	can_events => 1,
		3681	markup => $widget,
		3682	tooltip => $tooltip;
		3683	}
2939	}	3684	}
2940		3685
2941	$self->{item}{$widget} = $item;	3686	$self->{item}{$widget} = $item;
2942		3687
2943	$self->{vbox}->add ($widget);	3688	$self->{vbox}->add ($widget);
…		…
2948		3693
2949	# popup given the event (must be a mouse button down event currently)	3694	# popup given the event (must be a mouse button down event currently)
2950	sub popup {	3695	sub popup {
2951	my ($self, $ev) = @_;	3696	my ($self, $ev) = @_;
2952		3697
2953	$self->_emit ("popdown");	3698	$self->emit ("popdown");
2954		3699
2955	# maybe save $GRAB? must be careful about events...	3700	# maybe save $GRAB? must be careful about events...
2956	$GRAB = $self;	3701	$GRAB = $self;
2957	$self->{button} = $ev->{button};	3702	$self->{button} = $ev->{button};
2958		3703
2959	$self->show;	3704	$self->show;
2960	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3705	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2961	}	3706	}
2962		3707
2963	sub mouse_motion {	3708	sub invoke_mouse_motion {
2964	my ($self, $ev, $x, $y) = @_;	3709	my ($self, $ev, $x, $y) = @_;
2965		3710
2966	# TODO: should use vbox->find_widget or so	3711	# TODO: should use vbox->find_widget or so
2967	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3712	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968	$self->{hover} = $self->{item}{$HOVER};	3713	$self->{hover} = $self->{item}{$HOVER};
2969		3714
2970	0	3715	0
2971	}	3716	}
2972		3717
2973	sub button_up {	3718	sub invoke_button_up {
2974	my ($self, $ev, $x, $y) = @_;	3719	my ($self, $ev, $x, $y) = @_;
2975		3720
2976	if ($ev->{button} == $self->{button}) {	3721	if ($ev->{button} == $self->{button}) {
2977	undef $GRAB;	3722	undef $GRAB;
2978	$self->hide;	3723	$self->hide;
2979		3724
2980	$self->_emit ("popdown");	3725	$self->emit ("popdown");
2981	$self->{hover}[1]->() if $self->{hover};	3726	$self->{hover}[1]->() if $self->{hover};
2982	} else {	3727	} else {
2983	return 0	3728	return 0
2984	}	3729	}
2985		3730
2986	1	3731	1
2987	}	3732	}
2988		3733
2989	#############################################################################	3734	#############################################################################
2990		3735
2991	package CFClient::UI::Multiplexer;	3736	package CFPlus::UI::Multiplexer;
2992		3737
2993	our @ISA = CFClient::UI::Container::;	3738	our @ISA = CFPlus::UI::Container::;
2994		3739
2995	sub new {	3740	sub new {
2996	my $class = shift;	3741	my $class = shift;
2997		3742
2998	my $self = $class->SUPER::new (	3743	my $self = $class->SUPER::new (
…		…
3012		3757
3013	$self->{current} = $self->{children}[0]	3758	$self->{current} = $self->{children}[0]
3014	if @{ $self->{children} };	3759	if @{ $self->{children} };
3015	}	3760	}
3016		3761
		3762	sub get_current_page {
		3763	my ($self) = @_;
		3764
		3765	$self->{current}
		3766	}
		3767
3017	sub set_current_page {	3768	sub set_current_page {
3018	my ($self, $page_or_widget) = @_;	3769	my ($self, $page_or_widget) = @_;
3019		3770
3020	my $widget = ref $page_or_widget	3771	my $widget = ref $page_or_widget
3021	? $page_or_widget	3772	? $page_or_widget
3022	: $self->{children}[$page_or_widget];	3773	: $self->{children}[$page_or_widget];
3023		3774
3024	$self->{current} = $widget;	3775	$self->{current} = $widget;
3025	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3776	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026		3777
3027	$self->_emit (page_changed => $self->{current});	3778	$self->emit (page_changed => $self->{current});
3028		3779
3029	$self->realloc;	3780	$self->realloc;
3030	}	3781	}
3031		3782
3032	sub visible_children {	3783	sub visible_children {
…		…
3037	my ($self) = @_;	3788	my ($self) = @_;
3038		3789
3039	$self->{current}->size_request	3790	$self->{current}->size_request
3040	}	3791	}
3041		3792
3042	sub size_allocate {	3793	sub invoke_size_allocate {
3043	my ($self, $w, $h) = @_;	3794	my ($self, $w, $h) = @_;
3044		3795
3045	$self->{current}->configure (0, 0, $w, $h);	3796	$self->{current}->configure (0, 0, $w, $h);
		3797
		3798	1
3046	}	3799	}
3047		3800
3048	sub _draw {	3801	sub _draw {
3049	my ($self) = @_;	3802	my ($self) = @_;
3050		3803
3051	$self->{current}->draw;	3804	$self->{current}->draw;
3052	}	3805	}
3053		3806
3054	#############################################################################	3807	#############################################################################
3055		3808
3056	package CFClient::UI::Notebook;	3809	package CFPlus::UI::Notebook;
3057		3810
3058	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3059		3812
3060	sub new {	3813	sub new {
3061	my $class = shift;	3814	my $class = shift;
3062		3815
3063	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3064	buttonbar => (new CFClient::UI::Buttonbar),	3817	buttonbar => (new CFPlus::UI::Buttonbar),
3065	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3818	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3066	# filter => # will be put between multiplexer and $self	3819	# filter => # will be put between multiplexer and $self
3067	@_,	3820	@_,
3068	);	3821	);
3069		3822
3070	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3823	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3074	}	3827	}
3075		3828
3076	sub add {	3829	sub add {
3077	my ($self, $title, $widget, $tooltip) = @_;	3830	my ($self, $title, $widget, $tooltip) = @_;
3078		3831
3079	Scalar::Util::weaken $self;	3832	CFPlus::weaken $self;
3080		3833
3081	$self->{buttonbar}->add (new CFClient::UI::Button	3834	$self->{buttonbar}->add (new CFPlus::UI::Button
3082	markup => $title,	3835	markup => $title,
3083	tooltip => $tooltip,	3836	tooltip => $tooltip,
3084	on_activate => sub { $self->set_current_page ($widget) },	3837	on_activate => sub { $self->set_current_page ($widget) },
3085	);	3838	);
3086		3839
3087	$self->{multiplexer}->add ($widget);	3840	$self->{multiplexer}->add ($widget);
3088	}	3841	}
3089		3842
		3843	sub get_current_page {
		3844	my ($self) = @_;
		3845
		3846	$self->{multiplexer}->get_current_page
		3847	}
		3848
3090	sub set_current_page {	3849	sub set_current_page {
3091	my ($self, $page) = @_;	3850	my ($self, $page) = @_;
3092		3851
3093	$self->{multiplexer}->set_current_page ($page);	3852	$self->{multiplexer}->set_current_page ($page);
3094	$self->_emit (page_changed => $self->{multiplexer}{current});	3853	$self->emit (page_changed => $self->{multiplexer}{current});
3095	}	3854	}
3096		3855
3097	#############################################################################	3856	#############################################################################
3098		3857
3099	package CFClient::UI::Combobox;	3858	package CFPlus::UI::Selector;
3100		3859
3101	use utf8;	3860	use utf8;
3102		3861
3103	our @ISA = CFClient::UI::Button::;	3862	our @ISA = CFPlus::UI::Button::;
3104		3863
3105	sub new {	3864	sub new {
3106	my $class = shift;	3865	my $class = shift;
3107		3866
3108	my $self = $class->SUPER::new (	3867	my $self = $class->SUPER::new (
3109	options => [], # [title, value, tooltip], ...	3868	options => [], # [value, title, longdesc], ...
3110	value => undef,	3869	value => undef,
3111	@_,	3870	@_,
3112	);	3871	);
3113		3872
3114	$self->_set_value ($self->{value});	3873	$self->_set_value ($self->{value});
3115		3874
3116	$self	3875	$self
3117	}	3876	}
3118		3877
3119	sub button_down {	3878	sub invoke_button_down {
3120	my ($self, $ev) = @_;	3879	my ($self, $ev) = @_;
3121		3880
3122	my @menu_items;	3881	my @menu_items;
3123		3882
3124	for (@{ $self->{options} }) {	3883	for (@{ $self->{options} }) {
3125	my ($title, $value, $tooltip) = @$_;	3884	my ($value, $title, $tooltip) = @$_;
3126		3885
3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3886	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128	}	3887	}
3129		3888
3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3889	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131	}	3890	}
3132		3891
3133	sub _set_value {	3892	sub _set_value {
3134	my ($self, $value) = @_;	3893	my ($self, $value) = @_;
3135		3894
3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3895	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137	or return;	3896	or return;
3138		3897
3139	$self->{value} = $item->[1];	3898	$self->{value} = $item->[0];
3140	$self->set_markup ("$item->[0] ⇓");	3899	$self->set_markup ("$item->[1] ⇓");
3141	$self->set_tooltip ($item->[2]);	3900	$self->set_tooltip ($item->[2]);
3142	}	3901	}
3143		3902
3144	sub set_value {	3903	sub set_value {
3145	my ($self, $value) = @_;	3904	my ($self, $value) = @_;
3146		3905
3147	return unless $self->{value} ne $value;	3906	return unless $self->{value} ne $value;
3148		3907
3149	$self->_set_value ($value);	3908	$self->_set_value ($value);
3150	$self->_emit (changed => $value);	3909	$self->emit (changed => $value);
3151	}	3910	}
3152		3911
3153	#############################################################################	3912	#############################################################################
3154		3913
3155	package CFClient::UI::Statusbox;	3914	package CFPlus::UI::Statusbox;
3156		3915
3157	our @ISA = CFClient::UI::VBox::;	3916	our @ISA = CFPlus::UI::VBox::;
3158		3917
3159	sub new {	3918	sub new {
3160	my $class = shift;	3919	my $class = shift;
3161		3920
3162	my $self = $class->SUPER::new (	3921	my $self = $class->SUPER::new (
3163	fontsize => 0.8,	3922	fontsize => 0.8,
3164	@_,	3923	@_,
3165	);	3924	);
3166		3925
3167	Scalar::Util::weaken (my $this = $self);	3926	CFPlus::weaken (my $this = $self);
3168		3927
3169	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3928	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3170		3929
3171	$self	3930	$self
3172	}	3931	}
…		…
3174	sub reorder {	3933	sub reorder {
3175	my ($self) = @_;	3934	my ($self) = @_;
3176	my $NOW = Time::HiRes::time;	3935	my $NOW = Time::HiRes::time;
3177		3936
3178	# freeze display when hovering over any label	3937	# freeze display when hovering over any label
3179	return if $CFClient::UI::TOOLTIP->{owner}	3938	return if $CFPlus::UI::TOOLTIP->{owner}
3180	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3939	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3181	values %{ $self->{item} };	3940	values %{ $self->{item} };
3182		3941
3183	while (my ($k, $v) = each %{ $self->{item} }) {	3942	while (my ($k, $v) = each %{ $self->{item} }) {
3184	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3943	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3185	}	3944	}
…		…
3206	for ($short) {	3965	for ($short) {
3207	s/^\s+//;	3966	s/^\s+//;
3208	s/\s+/ /g;	3967	s/\s+/ /g;
3209	}	3968	}
3210		3969
3211	new CFClient::UI::Label	3970	new CFPlus::UI::Label
3212	markup => $short,	3971	markup => $short,
3213	tooltip => $item->{tooltip},	3972	tooltip => $item->{tooltip},
3214	tooltip_font => $::FONT_PROP,	3973	tooltip_font => $::FONT_PROP,
3215	tooltip_width => 0.67,	3974	tooltip_width => 0.67,
3216	fontsize => $item->{fontsize} || $self->{fontsize},	3975	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3254	$item->{count}++;	4013	$item->{count}++;
3255	} else {	4014	} else {
3256	$item->{count} = 1;	4015	$item->{count} = 1;
3257	$item->{text} = $item->{tooltip} = $text;	4016	$item->{text} = $item->{tooltip} = $text;
3258	}	4017	}
3259	$item->{id} = ++$self->{id};	4018	$item->{id} += 0.2;#d#
3260	$item->{timeout} = $timeout;	4019	$item->{timeout} = $timeout;
3261	delete $item->{label};	4020	delete $item->{label};
3262	} else {	4021	} else {
3263	$self->{item}{$group} = {	4022	$self->{item}{$group} = {
3264	id => ++$self->{id},	4023	id => ++$self->{id},
…		…
3270	count => 1,	4029	count => 1,
3271	%arg,	4030	%arg,
3272	};	4031	};
3273	}	4032	}
3274		4033
		4034	$ROOT->on_refresh (reorder => sub {
3275	$self->reorder;	4035	$self->reorder;
		4036	});
3276	}	4037	}
3277		4038
3278	sub reconfigure {	4039	sub reconfigure {
3279	my ($self) = @_;	4040	my ($self) = @_;
3280		4041
…		…
3283		4044
3284	$self->reorder;	4045	$self->reorder;
3285	$self->SUPER::reconfigure;	4046	$self->SUPER::reconfigure;
3286	}	4047	}
3287		4048
3288	sub DESTROY {	4049	sub destroy {
3289	my ($self) = @_;	4050	my ($self) = @_;
3290		4051
3291	$self->{timer}->cancel;	4052	$self->{timer}->cancel;
3292		4053
3293	$self->SUPER::DESTROY;	4054	$self->SUPER::destroy;
3294	}	4055	}
3295		4056
3296	#############################################################################	4057	#############################################################################
3297		4058
3298	package CFClient::UI::Inventory;
3299
3300	our @ISA = CFClient::UI::ScrolledWindow::;
3301
3302	sub new {
3303	my $class = shift;
3304
3305	my $self = $class->SUPER::new (
3306	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3307	@_,
3308	);
3309
3310	$self
3311	}
3312
3313	sub set_items {
3314	my ($self, $items) = @_;
3315
3316	$self->{child}->clear;
3317	return unless $items;
3318
3319	my @items = sort {
3320	($a->{type} <=> $b->{type})
3321	or ($a->{name} cmp $b->{name})
3322	} @$items;
3323
3324	$self->{real_items} = \@items;
3325
3326	my $row = 0;
3327	for my $item (@items) {
3328	CFClient::Item::update_widgets $item;
3329
3330	$self->{child}->add (0, $row, $item->{face_widget});
3331	$self->{child}->add (1, $row, $item->{desc_widget});
3332	$self->{child}->add (2, $row, $item->{weight_widget});
3333
3334	$row++;
3335	}
3336	}
3337
3338	#############################################################################
3339
3340	package CFClient::UI::BindEditor;
3341
3342	our @ISA = CFClient::UI::FancyFrame::;
3343
3344	sub new {
3345	my $class = shift;
3346
3347	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349	$self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353	text => "start recording",
3354	tooltip => "Start/Stops recording of actions."
3355	."All subsequent actions after the recording started will be captured."
3356	."The actions are displayed after the record was stopped."
3357	."To bind the action you have to click on the 'Bind' button",
3358	on_activate => sub {
3359	unless ($self->{recording}) {
3360	$self->start;
3361	} else {
3362	$self->stop;
3363	}
3364	});
3365
3366	$vb->add (new CFClient::UI::Label text => "Actions:");
3367	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3370	$vb->add (my $hb = new CFClient::UI::HBox);
3371	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372	$hb->add (new CFClient::UI::Button
3373	text => "bind",
3374	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375	on_activate => sub {
3376	$self->ask_for_bind;
3377	});
3378
3379	$vb->add (my $hb = new CFClient::UI::HBox);
3380	$hb->add (new CFClient::UI::Button
3381	text => "ok",
3382	expand => 1,
3383	tooltip => "This closes the binding editor and saves the binding",
3384	on_activate => sub {
3385	$self->hide;
3386	$self->commit;
3387	});
3388
3389	$hb->add (new CFClient::UI::Button
3390	text => "cancel",
3391	expand => 1,
3392	tooltip => "This closes the binding editor without saving",
3393	on_activate => sub {
3394	$self->hide;
3395	$self->{binding_cancel}->()
3396	if $self->{binding_cancel};
3397	});
3398
3399	$self->update_binding_widgets;
3400
3401	$self
3402	}
3403
3404	sub commit {
3405	my ($self) = @_;
3406	my ($mod, $sym, $cmds) = $self->get_binding;
3407	if ($sym != 0 && @$cmds > 0) {
3408	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409	."'. Don't forget 'Save Config'!");
3410	$self->{binding_change}->($mod, $sym, $cmds)
3411	if $self->{binding_change};
3412	} else {
3413	$::STATUSBOX->add ("No action bound, no key or action specified!");
3414	$self->{binding_cancel}->()
3415	if $self->{binding_cancel};
3416	}
3417	}
3418
3419	sub start {
3420	my ($self) = @_;
3421
3422	$self->{rec_btn}->set_text ("stop recording");
3423	$self->{recording} = 1;
3424	$self->clear_command_list;
3425	$::CONN->start_record if $::CONN;
3426	}
3427
3428	sub stop {
3429	my ($self) = @_;
3430
3431	$self->{rec_btn}->set_text ("start recording");
3432	$self->{recording} = 0;
3433
3434	my $rec;
3435	$rec = $::CONN->stop_record if $::CONN;
3436	return unless ref $rec eq 'ARRAY';
3437	$self->set_command_list ($rec);
3438	}
3439
3440
3441	sub ask_for_bind_and_commit {
3442	my ($self) = @_;
3443	$self->ask_for_bind (1);
3444	}
3445
3446	sub ask_for_bind {
3447	my ($self, $commit) = @_;
3448
3449	CFClient::Binder::open_binding_dialog (sub {
3450	my ($mod, $sym) = @_;
3451	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452	$self->update_binding_widgets;
3453	$self->commit if $commit;
3454	});
3455	}
3456
3457	# $mod and $sym are the modifiers and key symbol
3458	# $cmds is a array ref of strings (the commands)
3459	# $cb is the callback that is executed on OK
3460	# $ccb is the callback that is executed on CANCEL and
3461	# when the binding was unsuccessful on OK
3462	sub set_binding {
3463	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465	$self->clear_command_list;
3466	$self->{recording} = 0;
3467	$self->{rec_btn}->set_text ("start recording");
3468
3469	$self->{binding} = [$mod, $sym];
3470	$self->{commands} = $cmds;
3471
3472	$self->{binding_change} = $cb;
3473	$self->{binding_cancel} = $ccb;
3474
3475	$self->update_binding_widgets;
3476	}
3477
3478	# this is a shortcut method that asks for a binding
3479	# and then just binds it.
3480	sub do_quick_binding {
3481	my ($self, $cmds) = @_;
3482	$self->set_binding (undef, undef, $cmds, sub {
3483	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484	});
3485	$self->ask_for_bind (1);
3486	}
3487
3488	sub update_binding_widgets {
3489	my ($self) = @_;
3490	my ($mod, $sym, $cmds) = $self->get_binding;
3491	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492	$self->set_command_list ($cmds);
3493	}
3494
3495	sub get_binding {
3496	my ($self) = @_;
3497	return (
3498	$self->{binding}->[0],
3499	$self->{binding}->[1],
3500	[ grep { defined $_ } @{$self->{commands}} ]
3501	);
3502	}
3503
3504	sub clear_command_list {
3505	my ($self) = @_;
3506	$self->{cmdbox}->clear ();
3507	}
3508
3509	sub set_command_list {
3510	my ($self, $cmds) = @_;
3511
3512	$self->{cmdbox}->clear ();
3513	$self->{commands} = $cmds;
3514
3515	my $idx = 0;
3516
3517	for (@$cmds) {
3518	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520	my $i = $idx;
3521	$hb->add (new CFClient::UI::Label text => $_);
3522	$hb->add (new CFClient::UI::Button
3523	text => "delete",
3524	tooltip => "Deletes the action from the record",
3525	on_activate => sub {
3526	$self->{cmdbox}->remove ($hb);
3527	$cmds->[$i] = undef;
3528	});
3529
3530
3531	$idx++
3532	}
3533	}
3534
3535	#############################################################################
3536
3537	package CFClient::UI::SpellList;
3538
3539	our @ISA = CFClient::UI::Table::;
3540
3541	sub new {
3542	my $class = shift;
3543
3544	my $self = $class->SUPER::new (
3545	binding => [],
3546	commands => [],
3547	@_,
3548	)
3549	}
3550
3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
3557
3558	sub rebuild_spell_list {
3559	my ($self) = @_;
3560
3561	$CFClient::UI::ROOT->on_refresh ($self => sub {
3562	$self->clear;
3563
3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568
3569	my $row = 0;
3570
3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572	my $spell = $self->{spell}{$_};
3573
3574	$row++;
3575
3576	$self->add (0, $row, new CFClient::UI::Face
3577	face => $spell->{face},
3578	can_hover => 1,
3579	can_events => 1,
3580	tooltip => $spell->{message},
3581	);
3582
3583	$self->add (1, $row, new CFClient::UI::Label
3584	expand => 1,
3585	text => $spell->{name},
3586	can_hover => 1,
3587	can_events => 1,
3588	tooltip => $spell->{message},
3589	);
3590
3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595	# TODO: should be done via popup
3596	$self->add (5, $row, new CFClient::UI::Button
3597	text => "bind",
3598	tooltip => "bind spell readying (cast command) to key",
3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600	);
3601	}
3602	});
3603	}
3604
3605	sub add_spell {
3606	my ($self, $spell) = @_;
3607
3608	$self->{spell}->{$spell->{name}} = $spell;
3609	$self->rebuild_spell_list;
3610	}
3611
3612	sub remove_spell {
3613	my ($self, $spell) = @_;
3614
3615	delete $self->{spell}->{$spell->{name}};
3616	$self->rebuild_spell_list;
3617	}
3618
3619	#############################################################################
3620
3621	package CFClient::UI::Root;	4059	package CFPlus::UI::Root;
3622		4060
3623	our @ISA = CFClient::UI::Container::;	4061	our @ISA = CFPlus::UI::Container::;
3624		4062
3625	use List::Util qw(min max);	4063	use List::Util qw(min max);
3626		4064
3627	use CFClient::OpenGL;	4065	use CFPlus::OpenGL;
3628		4066
3629	sub new {	4067	sub new {
3630	my $class = shift;	4068	my $class = shift;
3631		4069
3632	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
3633	visible => 1,	4071	visible => 1,
3634	@_,	4072	@_,
3635	);	4073	);
3636		4074
3637	Scalar::Util::weaken ($self->{root} = $self);	4075	CFPlus::weaken ($self->{root} = $self);
3638		4076
3639	$self	4077	$self
3640	}	4078	}
3641		4079
3642	sub size_request {	4080	sub size_request {
…		…
3657	$coord = $max - $size if $coord > $max - $size;	4095	$coord = $max - $size if $coord > $max - $size;
3658		4096
3659	int $coord + 0.5	4097	int $coord + 0.5
3660	}	4098	}
3661		4099
3662	sub size_allocate {	4100	sub invoke_size_allocate {
3663	my ($self, $w, $h) = @_;	4101	my ($self, $w, $h) = @_;
3664		4102
3665	for my $child ($self->children) {	4103	for my $child ($self->children) {
3666	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4104	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3667		4105
…		…
3671	$X = _to_pixel $X, $W, $self->{w};	4109	$X = _to_pixel $X, $W, $self->{w};
3672	$Y = _to_pixel $Y, $H, $self->{h};	4110	$Y = _to_pixel $Y, $H, $self->{h};
3673		4111
3674	$child->configure ($X, $Y, $W, $H);	4112	$child->configure ($X, $Y, $W, $H);
3675	}	4113	}
		4114
		4115	1
3676	}	4116	}
3677		4117
3678	sub coord2local {	4118	sub coord2local {
3679	my ($self, $x, $y) = @_;	4119	my ($self, $x, $y) = @_;
3680		4120
…		…
3806	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3807		4247
3808	$w = 0 if $w < 0;	4248	$w = 0 if $w < 0;
3809	$h = 0 if $h < 0;	4249	$h = 0 if $h < 0;
3810		4250
		4251	$w = max $widget->{min_w}, $w;
		4252	$h = max $widget->{min_h}, $h;
		4253
		4254	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4255	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4256
		4257	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4258	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4259
3811	$w = int $w + 0.5;	4260	$w = int $w + 0.5;
3812	$h = int $h + 0.5;	4261	$h = int $h + 0.5;
3813		4262
3814	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4263	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3815	$widget->{old_w} = $widget->{w};	4264	$widget->{old_w} = $widget->{w};
…		…
3825		4274
3826	while ($self->{post_alloc_hook}) {	4275	while ($self->{post_alloc_hook}) {
3827	$_->()	4276	$_->()
3828	for values %{delete $self->{post_alloc_hook}};	4277	for values %{delete $self->{post_alloc_hook}};
3829	}	4278	}
3830
3831		4279
3832	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4280	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3833	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4281	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3834	glClear GL_COLOR_BUFFER_BIT;	4282	glClear GL_COLOR_BUFFER_BIT;
3835		4283
…		…
3838	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4286	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3839	glMatrixMode GL_MODELVIEW;	4287	glMatrixMode GL_MODELVIEW;
3840	glLoadIdentity;	4288	glLoadIdentity;
3841		4289
3842	{	4290	{
3843	package CFClient::UI::Base;	4291	package CFPlus::UI::Base;
3844		4292
3845	($draw_x, $draw_y, $draw_w, $draw_h) =	4293	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3846	(0, 0, $self->{w}, $self->{h});	4294	(0, 0, $self->{w}, $self->{h});
3847	}
3848		4295
3849	$self->_draw;	4296	$self->_draw;
		4297	}
3850	}	4298	}
3851		4299
3852	#############################################################################	4300	#############################################################################
3853		4301
3854	package CFClient::UI;	4302	package CFPlus::UI;
3855		4303
3856	$ROOT = new CFClient::UI::Root;	4304	$ROOT = new CFPlus::UI::Root;
3857	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4305	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3858		4306
3859	1	4307	1
3860		4308

Diff Legend

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