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

Diff Legend

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