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

Diff Legend

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