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.370 by root, Sun Jul 15 21:02:20 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	$self->update_slider;
981	# todo: overwrite size_allocate of child
982	my $child = $self->{vp}->child;
983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984	}	1119	}
985		1120
986	sub size_allocate {	1121	sub invoke_size_allocate {
987	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
988		1123
		1124	$self->update_slider;
989	$self->SUPER::size_allocate ($w, $h);	1125	$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	}	1126	}
994
995	#TODO# update range on size_allocate depending on child
996	# update viewport offset on scroll
997		1127
998	#############################################################################	1128	#############################################################################
999		1129
1000	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1001		1131
1002	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1003		1133
1004	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1005		1135
1006	sub new {	1136	sub new {
1007	my $class = shift;	1137	my $class = shift;
1008		1138
1009	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1017		1147
1018	if ($self->{bg}) {	1148	if ($self->{bg}) {
1019	my ($w, $h) = @$self{qw(w h)};	1149	my ($w, $h) = @$self{qw(w h)};
1020		1150
1021	glEnable GL_BLEND;	1151	glEnable GL_BLEND;
1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1152	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023	glColor @{ $self->{bg} };	1153	glColor_premultiply @{ $self->{bg} };
1024		1154
1025	glBegin GL_QUADS;	1155	glBegin GL_QUADS;
1026	glVertex 0 , 0;	1156	glVertex 0 , 0;
1027	glVertex 0 , $h;	1157	glVertex 0 , $h;
1028	glVertex $w, $h;	1158	glVertex $w, $h;
…		…
1035	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1036	}	1166	}
1037		1167
1038	#############################################################################	1168	#############################################################################
1039		1169
1040	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1041		1171
1042	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1043		1173
1044	use CFClient::OpenGL;	1174	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		1175
1054	sub new {	1176	sub new {
1055	my ($class, %arg) = @_;	1177	my ($class, %arg) = @_;
1056		1178
1057	my $title = delete $arg{title};	1179	if ((exists $arg{label}) && !ref $arg{label}) {
		1180	$arg{label} = new CFPlus::UI::Label
		1181	align => 1,
		1182	valign => 0,
		1183	text => $arg{label},
		1184	fontsize => ($arg{border} || 0.8) * 0.75;
		1185	}
		1186
		1187	my $self = $class->SUPER::new (
		1188	# label => "",
		1189	fg => [0.6, 0.3, 0.1],
		1190	border => 0.8,
		1191	style => 'single',
		1192	%arg,
		1193	);
		1194
		1195	$self
		1196	}
		1197
		1198	sub add {
		1199	my ($self, @widgets) = @_;
		1200
		1201	$self->SUPER::add (@widgets);
		1202	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1203	}
		1204
		1205	sub border {
		1206	int $_[0]{border} * $::FONTSIZE
		1207	}
		1208
		1209	sub size_request {
		1210	my ($self) = @_;
		1211
		1212	($self->{label_w}, undef) = $self->{label}->size_request
		1213	if $self->{label};
		1214
		1215	my ($w, $h) = $self->SUPER::size_request;
		1216
		1217	(
		1218	$w + $self->border * 2,
		1219	$h + $self->border * 2,
		1220	)
		1221	}
		1222
		1223	sub invoke_size_allocate {
		1224	my ($self, $w, $h) = @_;
		1225
		1226	my $border = $self->border;
		1227
		1228	$w -= List::Util::max 0, $border * 2;
		1229	$h -= List::Util::max 0, $border * 2;
		1230
		1231	if (my $label = $self->{label}) {
		1232	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1233	$label->{h} = List::Util::min $h, $border;
		1234	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1235	}
		1236
		1237	$self->child->configure ($border, $border, $w, $h);
		1238
		1239	1
		1240	}
		1241
		1242	sub _draw {
		1243	my ($self) = @_;
		1244
		1245	my $child = $self->{children}[0];
		1246
		1247	my $border = $self->border;
		1248	my ($w, $h) = ($self->{w}, $self->{h});
		1249
		1250	$child->draw;
		1251
		1252	glColor @{$self->{fg}};
		1253	glBegin GL_LINE_STRIP;
		1254	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1255	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1256	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1257	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1258	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1259	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1260	glEnd;
		1261
		1262	if ($self->{label}) {
		1263	glTranslate $border * 2, 0;
		1264	$self->{label}->_draw;
		1265	}
		1266	}
		1267
		1268	#############################################################################
		1269
		1270	package CFPlus::UI::Toplevel;
		1271
		1272	our @ISA = CFPlus::UI::Bin::;
		1273
		1274	use CFPlus::OpenGL;
		1275
		1276	my $bg =
		1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1278	mipmap => 1, wrap => 1;
		1279
		1280	my @border =
		1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1283
		1284	sub new {
		1285	my ($class, %arg) = @_;
1058		1286
1059	my $self = $class->SUPER::new (	1287	my $self = $class->SUPER::new (
1060	bg => [1, 1, 1, 1],	1288	bg => [1, 1, 1, 1],
1061	border_bg => [1, 1, 1, 1],	1289	border_bg => [1, 1, 1, 1],
1062	border => 0.6,	1290	border => 0.6,
1063	can_events => 1,	1291	can_events => 1,
1064	min_w => 16,	1292	min_w => 64,
1065	min_h => 16,	1293	min_h => 32,
1066	%arg,	1294	%arg,
1067	);	1295	);
1068		1296
1069	$self->{title} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1070	align => 0,	1298	align => 0,
1071	valign => 1,	1299	valign => 1,
1072	text => $title,	1300	text => $self->{title},
1073	fontsize => $self->{border}	1301	fontsize => $self->{border},
1074	if defined $title;	1302	if exists $self->{title};
		1303
		1304	if ($self->{has_close_button}) {
		1305	$self->{close_button} =
		1306	new CFPlus::UI::ImageButton
		1307	path => 'x1_close.png',
		1308	on_activate => sub { $self->emit ("delete") };
		1309
		1310	$self->CFPlus::UI::Container::add ($self->{close_button});
		1311	}
1075		1312
1076	$self	1313	$self
1077	}	1314	}
1078		1315
1079	sub add {	1316	sub add {
1080	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1081		1318
1082	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
		1320	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1321	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084	}	1322	}
1085		1323
1086	sub border {	1324	sub border {
1087	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1088	}	1326	}
1089		1327
1090	sub size_request {	1328	sub size_request {
1091	my ($self) = @_;	1329	my ($self) = @_;
1092		1330
1093	$self->{title}->size_request	1331	$self->{title_widget}->size_request
1094	if $self->{title};	1332	if $self->{title_widget};
		1333
		1334	$self->{close_button}->size_request
		1335	if $self->{close_button};
1095		1336
1096	my ($w, $h) = $self->SUPER::size_request;	1337	my ($w, $h) = $self->SUPER::size_request;
1097		1338
1098	(	1339	(
1099	$w + $self->border * 2,	1340	$w + $self->border * 2,
1100	$h + $self->border * 2,	1341	$h + $self->border * 2,
1101	)	1342	)
1102	}	1343	}
1103		1344
1104	sub size_allocate {	1345	sub invoke_size_allocate {
1105	my ($self, $w, $h) = @_;	1346	my ($self, $w, $h) = @_;
1106		1347
1107	if ($self->{title}) {	1348	if ($self->{title_widget}) {
1108	$self->{title}{w} = $w;	1349	$self->{title_widget}{w} = $w;
1109	$self->{title}{h} = $h;	1350	$self->{title_widget}{h} = $h;
1110	$self->{title}->size_allocate ($w, $h);	1351	$self->{title_widget}->invoke_size_allocate ($w, $h);
1111	}	1352	}
1112		1353
1113	my $border = $self->border;	1354	my $border = $self->border;
1114		1355
1115	$h -= List::Util::max 0, $border * 2;	1356	$h -= List::Util::max 0, $border * 2;
1116	$w -= List::Util::max 0, $border * 2;	1357	$w -= List::Util::max 0, $border * 2;
		1358
		1359	$self->child->configure ($border, $border, $w, $h);
		1360
		1361	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1362	if $self->{close_button};
		1363
		1364	1
		1365	}
		1366
		1367	sub invoke_delete {
		1368	my ($self) = @_;
		1369
		1370	$self->hide;
1117		1371
1118	$self->child->configure ($border, $border, $w, $h);	1372	1
1119	}	1373	}
1120		1374
1121	sub button_down {	1375	sub invoke_button_down {
1122	my ($self, $ev, $x, $y) = @_;	1376	my ($self, $ev, $x, $y) = @_;
1123		1377
1124	my ($w, $h) = @$self{qw(w h)};	1378	my ($w, $h) = @$self{qw(w h)};
1125	my $border = $self->border;	1379	my $border = $self->border;
1126		1380
…		…
1142	my $dy = $ev->{y} - $oy;	1396	my $dy = $ev->{y} - $oy;
1143		1397
1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1398	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1399	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146		1400
		1401	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147	$self->realloc;	1402	$self->realloc;
1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149	};	1403	};
1150		1404
1151	} elsif ($lr ^ $td) {	1405	} elsif ($lr ^ $td) {
1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1406	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153	my ($bx, $by) = ($self->{x}, $self->{y});	1407	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1156	my ($ev, $x, $y) = @_;	1410	my ($ev, $x, $y) = @_;
1157		1411
1158	($x, $y) = ($ev->{x}, $ev->{y});	1412	($x, $y) = ($ev->{x}, $ev->{y});
1159		1413
1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1414	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1415	# HACK: the next line is required to enforce placement
		1416	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161	};	1417	};
		1418	} else {
		1419	return 0;
		1420	}
		1421
1162	}	1422	1
1163	}	1423	}
1164		1424
1165	sub button_up {	1425	sub invoke_button_up {
1166	my ($self, $ev, $x, $y) = @_;	1426	my ($self, $ev, $x, $y) = @_;
1167		1427
1168	delete $self->{motion};	1428	! ! delete $self->{motion}
1169	}	1429	}
1170		1430
1171	sub mouse_motion {	1431	sub invoke_mouse_motion {
1172	my ($self, $ev, $x, $y) = @_;	1432	my ($self, $ev, $x, $y) = @_;
1173		1433
1174	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1435
		1436	! ! $self->{motion}
		1437	}
		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
1175	}	1445	}
1176		1446
1177	sub _draw {	1447	sub _draw {
1178	my ($self) = @_;	1448	my ($self) = @_;
1179		1449
…		…
1205		1475
1206	glDisable GL_TEXTURE_2D;	1476	glDisable GL_TEXTURE_2D;
1207		1477
1208	$child->draw;	1478	$child->draw;
1209		1479
1210	if ($self->{title}) {	1480	if ($self->{title_widget}) {
1211	glTranslate 0, $border - $self->{h};	1481	glTranslate 0, $border - $self->{h};
1212	$self->{title}->_draw;	1482	$self->{title_widget}->_draw;
		1483
		1484	glTranslate 0, - ($border - $self->{h});
1213	}	1485	}
		1486
		1487	$self->{close_button}->draw
		1488	if $self->{close_button};
1214	}	1489	}
1215		1490
1216	#############################################################################	1491	#############################################################################
1217		1492
1218	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1219		1494
1220	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1221		1496
1222	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1223		1498
1224	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1225		1500
1226	sub new {	1501	sub new {
1227	my $class = shift;	1502	my $class = shift;
1228		1503
1229	$class->SUPER::new (	1504	$class->SUPER::new (
1230	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1231	@_,	1507	@_,
1232	)	1508	)
1233	}	1509	}
1234		1510
1235	sub children {	1511	sub children {
1236	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237	}	1513	}
1238		1514
1239	sub add {	1515	sub add {
1240	my ($self, $x, $y, $child) = @_;	1516	my ($self) = shift;
1241		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
1242	$child->set_parent ($self);	1520	$child->set_parent ($self);
1243	$self->{children}[$y][$x] = $child;	1521	$self->{children}[$y][$x] = $child;
		1522	}
1244		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
1245	$self->realloc;	1526	$self->realloc;
		1527	}
		1528
		1529	sub remove {
		1530	my ($self, $child) = @_;
		1531
		1532	# TODO: not yet implemented
1246	}	1533	}
1247		1534
1248	# TODO: move to container class maybe? send children a signal on removal?	1535	# TODO: move to container class maybe? send children a signal on removal?
1249	sub clear {	1536	sub clear {
1250	my ($self) = @_;	1537	my ($self) = @_;
…		…
1291	(sum @$ws),	1578	(sum @$ws),
1292	(sum @$hs),	1579	(sum @$hs),
1293	)	1580	)
1294	}	1581	}
1295		1582
1296	sub size_allocate {	1583	sub invoke_size_allocate {
1297	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1298		1585
1299	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1300		1587
1301	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1302	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1303		1590
1304	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1305	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1306	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1307	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1308		1595
1309	# linearly scale sizes
1310	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1311	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1312		1597
1313	CFClient::UI::harmonize $ws;	1598	CFPlus::UI::harmonize $ws;
		1599
		1600	my @row_expand = @{$self->{row_expand}};
		1601	@row_expand = (1) x @$ws unless @row_expand;
		1602	my $row_expand = (sum @row_expand) || 1;
		1603
		1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1605
1314	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1315		1607
1316	my $y;	1608	my $y;
1317		1609
1318	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1319	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1333	}	1625	}
1334		1626
1335	$y += $row_h;	1627	$y += $row_h;
1336	}	1628	}
1337		1629
		1630	1
1338	}	1631	}
1339		1632
1340	sub find_widget {	1633	sub find_widget {
1341	my ($self, $x, $y) = @_;	1634	my ($self, $x, $y) = @_;
1342		1635
…		…
1361	}	1654	}
1362	}	1655	}
1363		1656
1364	#############################################################################	1657	#############################################################################
1365		1658
1366	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1367		1660
1368	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1369		1662
1370	sub size_request {	1663	sub size_request {
1371	my ($self) = @_;	1664	my ($self) = @_;
1372		1665
1373	$self->{vertical}	1666	$self->{vertical}
…		…
1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1672	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1673	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1381	)	1674	)
1382	}	1675	}
1383		1676
1384	sub size_allocate {	1677	sub invoke_size_allocate {
1385	my ($self, $w, $h) = @_;	1678	my ($self, $w, $h) = @_;
1386		1679
1387	my $space = $self->{vertical} ? $h : $w;	1680	my $space = $self->{vertical} ? $h : $w;
1388	my $children = $self->{children};	1681	my @children = $self->visible_children;
1389		1682
1390	my @req;	1683	my @req;
1391		1684
1392	if ($self->{homogeneous}) {	1685	if ($self->{homogeneous}) {
1393	@req = ($space / (@$children || 1)) x @$children;	1686	@req = ($space / (@children || 1)) x @children;
1394	} else {	1687	} else {
1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1688	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396	my $req = List::Util::sum @req;	1689	my $req = List::Util::sum @req;
1397		1690
1398	if ($req > $space) {	1691	if ($req > $space) {
1399	# ah well, not enough space	1692	# ah well, not enough space
1400	$_ *= $space / $req for @req;	1693	$_ *= $space / $req for @req;
1401	} else {	1694	} else {
1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1695	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403		1696
1404	$space = ($space - $req) / $expand; # remaining space to give away	1697	$space = ($space - $req) / $expand; # remaining space to give away
1405		1698
1406	$req[$_] += $space * $children->[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1407	for 0 .. $#$children;	1700	for 0 .. $#children;
1408	}	1701	}
1409	}	1702	}
1410		1703
1411	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1412		1705
1413	my $pos = 0;	1706	my $pos = 0;
1414	for (0 .. $#$children) {	1707	for (0 .. $#children) {
1415	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1709	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1417		1710
1418	$pos += $alloc;	1711	$pos += $alloc;
1419	}	1712	}
1420		1713
1421	1	1714	1
1422	}	1715	}
1423		1716
1424	#############################################################################	1717	#############################################################################
1425		1718
1426	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1427		1720
1428	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1429		1722
1430	sub new {	1723	sub new {
1431	my $class = shift;	1724	my $class = shift;
1432		1725
1433	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1436	)	1729	)
1437	}	1730	}
1438		1731
1439	#############################################################################	1732	#############################################################################
1440		1733
1441	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1442		1735
1443	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1444		1737
1445	sub new {	1738	sub new {
1446	my $class = shift;	1739	my $class = shift;
1447		1740
1448	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1451	)	1744	)
1452	}	1745	}
1453		1746
1454	#############################################################################	1747	#############################################################################
1455		1748
1456	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1457		1750
1458	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1459		1752
1460	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1461		1754
1462	sub new {	1755	sub new {
1463	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1464		1757
1465	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1468	#active_bg => none	1761	#active_bg => none
1469	#font => default_font	1762	#font => default_font
1470	#text => initial text	1763	#text => initial text
1471	#markup => initial narkup	1764	#markup => initial narkup
1472	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1473	ellipsise => 3, # end	1767	ellipsise => 3, # end
1474	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1475	fontsize => 1,	1769	fontsize => 1,
1476	align => -1,	1770	align => -1,
1477	valign => -1,	1771	valign => -1,
1478	padding_x => 2,	1772	padding_x => 2,
1479	padding_y => 2,	1773	padding_y => 2,
1480	can_events => 0,	1774	can_events => 0,
1481	%arg	1775	%arg
1482	);	1776	);
1483		1777
1484	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1485	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1486	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1487	$self->{template} = $layout;	1781	$self->{template} = $layout;
1488	}	1782	}
1489		1783
1490	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1494	}	1788	}
1495		1789
1496	$self	1790	$self
1497	}	1791	}
1498		1792
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 {	1793	sub update {
1510	my ($self) = @_;	1794	my ($self) = @_;
1511		1795
1512	delete $self->{texture};	1796	delete $self->{texture};
1513	$self->SUPER::update;	1797	$self->SUPER::update;
1514	}	1798	}
1515		1799
		1800	sub realloc {
		1801	my ($self) = @_;
		1802
		1803	delete $self->{ox};
		1804	$self->SUPER::realloc;
		1805	}
		1806
1516	sub set_text {	1807	sub set_text {
1517	my ($self, $text) = @_;	1808	my ($self, $text) = @_;
1518		1809
1519	return if $self->{text} eq "T$text";	1810	return if $self->{text} eq "T$text";
1520	$self->{text} = "T$text";	1811	$self->{text} = "T$text";
1521		1812
1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523	$self->{layout}->set_text ($text);	1813	$self->{layout}->set_text ($text);
1524		1814
		1815	delete $self->{size_req};
1525	$self->realloc;	1816	$self->realloc;
1526	$self->update;	1817	$self->update;
1527	}	1818	}
1528		1819
1529	sub set_markup {	1820	sub set_markup {
…		…
1532	return if $self->{text} eq "M$markup";	1823	return if $self->{text} eq "M$markup";
1533	$self->{text} = "M$markup";	1824	$self->{text} = "M$markup";
1534		1825
1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1826	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536		1827
1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538	$self->{layout}->set_markup ($markup);	1828	$self->{layout}->set_markup ($markup);
1539		1829
		1830	delete $self->{size_req};
1540	$self->realloc;	1831	$self->realloc;
1541	$self->update;	1832	$self->update;
1542	}	1833	}
1543		1834
1544	sub size_request {	1835	sub size_request {
1545	my ($self) = @_;	1836	my ($self) = @_;
1546		1837
		1838	$self->{size_req} ||= do {
1547	$self->{layout}->set_font ($self->{font}) if $self->{font};	1839	$self->{layout}->set_font ($self->{font}) if $self->{font};
1548	$self->{layout}->set_width ($self->{max_w} || -1);	1840	$self->{layout}->set_width ($self->{max_w} || -1);
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1841	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1842	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1843	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1844
1553	my ($w, $h) = $self->{layout}->size;	1845	my ($w, $h) = $self->{layout}->size;
1554		1846
1555	if (exists $self->{template}) {	1847	if (exists $self->{template}) {
1556	$self->{template}->set_font ($self->{font}) if $self->{font};	1848	$self->{template}->set_font ($self->{font}) if $self->{font};
		1849	$self->{template}->set_width ($self->{max_w} || -1);
1557	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1850	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558		1851
1559	my ($w2, $h2) = $self->{template}->size;	1852	my ($w2, $h2) = $self->{template}->size;
1560		1853
1561	$w = List::Util::max $w, $w2;	1854	$w = List::Util::max $w, $w2;
1562	$h = List::Util::max $h, $h2;	1855	$h = List::Util::max $h, $h2;
		1856	}
		1857
		1858	[$w, $h]
1563	}	1859	};
1564		1860
1565	($w, $h)	1861	@{ $self->{size_req} }
1566	}	1862	}
1567		1863
		1864	sub baseline_shift {
		1865	$_[0]{layout}->descent
		1866	}
		1867
1568	sub size_allocate {	1868	sub invoke_size_allocate {
1569	my ($self, $w, $h) = @_;	1869	my ($self, $w, $h) = @_;
1570		1870
1571	delete $self->{ox};	1871	delete $self->{ox};
1572		1872
1573	delete $self->{texture}	1873	delete $self->{texture}
1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1874	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1875
		1876	1
1575	}	1877	}
1576		1878
1577	sub set_fontsize {	1879	sub set_fontsize {
1578	my ($self, $fontsize) = @_;	1880	my ($self, $fontsize) = @_;
1579		1881
1580	$self->{fontsize} = $fontsize;	1882	$self->{fontsize} = $fontsize;
		1883	delete $self->{size_req};
1581	delete $self->{texture};	1884	delete $self->{texture};
1582		1885
1583	$self->realloc;	1886	$self->realloc;
1584	}	1887	}
1585		1888
		1889	sub reconfigure {
		1890	my ($self) = @_;
		1891
		1892	delete $self->{size_req};
		1893	delete $self->{texture};
		1894
		1895	$self->SUPER::reconfigure;
		1896	}
		1897
1586	sub _draw {	1898	sub _draw {
1587	my ($self) = @_;	1899	my ($self) = @_;
1588		1900
1589	$self->SUPER::_draw; # draw background, if applicable	1901	$self->SUPER::_draw; # draw background, if applicable
1590		1902
1591	my $tex = $self->{texture} ||= do {	1903	my $size = $self->{texture} ||= do {
1592	$self->{layout}->set_foreground (@{$self->{fg}});	1904	$self->{layout}->set_foreground (@{$self->{fg}});
1593	$self->{layout}->set_font ($self->{font}) if $self->{font};	1905	$self->{layout}->set_font ($self->{font}) if $self->{font};
1594	$self->{layout}->set_width ($self->{w});	1906	$self->{layout}->set_width ($self->{w});
1595	$self->{layout}->set_ellipsise ($self->{ellipsise});	1907	$self->{layout}->set_ellipsise ($self->{ellipsise});
1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1908	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1909	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1910
1599	new_from_layout CFClient::Texture $self->{layout}	1911	[$self->{layout}->size]
1600	};	1912	};
1601		1913
1602	unless (exists $self->{ox}) {	1914	unless (exists $self->{ox}) {
1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1915	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1916	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605	: ($self->{w} - $tex->{w}) * 0.5);	1917	: ($self->{w} - $size->[0]) * 0.5);
1606		1918
1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1919	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1920	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609	: ($self->{h} - $tex->{h}) * 0.5);	1921	: ($self->{h} - $size->[1]) * 0.5);
1610	};	1922	};
1611		1923
1612	glEnable GL_TEXTURE_2D;	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1614		1926
1615	if ($tex->{format} == GL_ALPHA) {	1927	$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	}	1928	}
1624		1929
1625	#############################################################################	1930	#############################################################################
1626		1931
1627	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1628		1933
1629	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1630		1935
1631	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1632		1937
1633	sub new {	1938	sub new {
1634	my $class = shift;	1939	my $class = shift;
1635		1940
1636	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1640	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1641	can_hover => 1,	1946	can_hover => 1,
1642	can_focus => 1,	1947	can_focus => 1,
1643	valign => 0,	1948	valign => 0,
1644	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1645	#text => ...	1951	#text => ...
		1952	#hidden => "*",
1646	@_	1953	@_
1647	)	1954	)
1648	}	1955	}
1649		1956
1650	sub _set_text {	1957	sub _set_text {
…		…
1652		1959
1653	delete $self->{cur_h};	1960	delete $self->{cur_h};
1654		1961
1655	return if $self->{text} eq $text;	1962	return if $self->{text} eq $text;
1656		1963
1657	delete $self->{texture};
1658
1659	$self->{last_activity} = $::NOW;	1964	$self->{last_activity} = $::NOW;
1660	$self->{text} = $text;	1965	$self->{text} = $text;
1661		1966
1662	$text =~ s/./*/g if $self->{hidden};	1967	$text =~ s/./*/g if $self->{hidden};
1663	$self->{layout}->set_text ("$text ");	1968	$self->{layout}->set_text ("$text ");
		1969	delete $self->{size_req};
1664		1970
1665	$self->_emit (changed => $self->{text});	1971	$self->emit (changed => $self->{text});
		1972
		1973	$self->realloc;
		1974	$self->update;
1666	}	1975	}
1667		1976
1668	sub set_text {	1977	sub set_text {
1669	my ($self, $text) = @_;	1978	my ($self, $text) = @_;
1670		1979
1671	$self->{cursor} = length $text;	1980	$self->{cursor} = length $text;
1672	$self->_set_text ($text);	1981	$self->_set_text ($text);
1673
1674	$self->realloc;
1675	}	1982	}
1676		1983
1677	sub get_text {	1984	sub get_text {
1678	$_[0]{text}	1985	$_[0]{text}
1679	}	1986	}
…		…
1684	my ($w, $h) = $self->SUPER::size_request;	1991	my ($w, $h) = $self->SUPER::size_request;
1685		1992
1686	($w + 1, $h) # add 1 for cursor	1993	($w + 1, $h) # add 1 for cursor
1687	}	1994	}
1688		1995
1689	sub key_down {	1996	sub invoke_key_down {
1690	my ($self, $ev) = @_;	1997	my ($self, $ev) = @_;
1691		1998
1692	my $mod = $ev->{mod};	1999	my $mod = $ev->{mod};
1693	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1694	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1695		2002
1696	my $text = $self->get_text;	2003	my $text = $self->get_text;
		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1697		2006
1698	if ($uni == 8) {	2007	if ($uni == 8) {
1699	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1700	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1701	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1702	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1703	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1704	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1705	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1706	} elsif ($sym == CFClient::SDLK_HOME) {	2015	} elsif ($sym == CFPlus::SDLK_HOME) {
		2016	# what a hack
		2017	$self->{cursor} =
		2018	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2019	? length $1
		2020	: 0;
		2021	} elsif ($sym == CFPlus::SDLK_END) {
		2022	# uh, again
		2023	$self->{cursor} =
		2024	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2025	? $self->{cursor} + length $1
		2026	: length $self->{text};
		2027	} elsif ($uni == 21) { # ctrl-u
		2028	$text = "";
1707	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1708	} elsif ($sym == CFClient::SDLK_END) {
1709	$self->{cursor} = length $text;
1710	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1711	$self->_emit ('escape');	2031	$self->emit ('escape');
1712	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1713	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
		2036	} else {
		2037	return 0;
1714	}	2038	}
1715		2039
1716	$self->_set_text ($text);	2040	$self->_set_text ($text);
1717		2041
1718	$self->realloc;	2042	$self->realloc;
1719	}	2043	$self->update;
1720		2044
		2045	1
		2046	}
		2047
1721	sub focus_in {	2048	sub invoke_focus_in {
1722	my ($self) = @_;	2049	my ($self) = @_;
1723		2050
1724	$self->{last_activity} = $::NOW;	2051	$self->{last_activity} = $::NOW;
1725		2052
1726	$self->SUPER::focus_in;	2053	$self->SUPER::invoke_focus_in
1727	}	2054	}
1728		2055
1729	sub button_down {	2056	sub invoke_button_down {
1730	my ($self, $ev, $x, $y) = @_;	2057	my ($self, $ev, $x, $y) = @_;
1731		2058
1732	$self->SUPER::button_down ($ev, $x, $y);	2059	$self->SUPER::invoke_button_down ($ev, $x, $y);
1733		2060
1734	my $idx = $self->{layout}->xy_to_index ($x, $y);	2061	my $idx = $self->{layout}->xy_to_index ($x, $y);
1735		2062
1736	# byte-index to char-index	2063	# byte-index to char-index
1737	my $text = $self->{text};	2064	my $text = $self->{text};
1738	utf8::encode $text;	2065	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739	$self->{cursor} = length substr $text, 0, $idx;	2066	$self->{cursor} = length $text;
1740		2067
1741	$self->_set_text ($self->{text});	2068	$self->_set_text ($self->{text});
1742	$self->update;	2069	$self->update;
		2070
		2071	1
1743	}	2072	}
1744		2073
1745	sub mouse_motion {	2074	sub invoke_mouse_motion {
1746	my ($self, $ev, $x, $y) = @_;	2075	my ($self, $ev, $x, $y) = @_;
1747	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2076	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2077
		2078	1
1748	}	2079	}
1749		2080
1750	sub _draw {	2081	sub _draw {
1751	my ($self) = @_;	2082	my ($self) = @_;
1752		2083
1753	local $self->{fg} = $self->{fg};	2084	local $self->{fg} = $self->{fg};
1754		2085
1755	if ($FOCUS == $self) {	2086	if ($FOCUS == $self) {
1756	glColor @{$self->{active_bg}};	2087	glColor_premultiply @{$self->{active_bg}};
1757	$self->{fg} = $self->{active_fg};	2088	$self->{fg} = $self->{active_fg};
1758	} else {	2089	} else {
1759	glColor @{$self->{bg}};	2090	glColor_premultiply @{$self->{bg}};
1760	}	2091	}
1761		2092
1762	glEnable GL_BLEND;	2093	glEnable GL_BLEND;
1763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2094	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764	glBegin GL_QUADS;	2095	glBegin GL_QUADS;
1765	glVertex 0 , 0;	2096	glVertex 0 , 0;
1766	glVertex 0 , $self->{h};	2097	glVertex 0 , $self->{h};
1767	glVertex $self->{w}, $self->{h};	2098	glVertex $self->{w}, $self->{h};
1768	glVertex $self->{w}, 0;	2099	glVertex $self->{w}, 0;
…		…
1779	utf8::encode $text;	2110	utf8::encode $text;
1780		2111
1781	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1782	}	2113	}
1783		2114
1784	glColor @{$self->{fg}};
1785	glBegin GL_LINES;	2115	glBegin GL_LINES;
1786	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2116	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};	2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1788	glEnd;	2118	glEnd;
1789	}	2119	}
1790	}	2120	}
1791		2121
		2122	#############################################################################
		2123
1792	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1793		2125
1794	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1795		2127
1796	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1797		2129
1798	sub key_down {	2130	sub invoke_key_down {
1799	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1800		2132
1801	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1802		2134
1803	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1804	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1805	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
		2138
1806	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1807	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1808	$self->_emit (activate => $txt);	2141	$self->emit (activate => $txt);
1809	$self->update;	2142	$self->update;
1810		2143
1811	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1812	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1813	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1814	}	2147	}
1815	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1816	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1818	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1819	}	2152	}
1820	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1821	}	2154	}
1822		2155
1823	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1824	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1825	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826		2159
1827	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1828	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1829	} else {	2162	} else {
1830	$self->set_text ($self->{history_saveback});	2163	$self->set_text ($self->{history_saveback});
1831	}	2164	}
1832		2165
1833	} else {	2166	} else {
1834	$self->SUPER::key_down ($ev);	2167	return $self->SUPER::invoke_key_down ($ev)
		2168	}
		2169
1835	}	2170	1
1836
1837	}	2171	}
1838		2172
1839	#############################################################################	2173	#############################################################################
1840		2174
		2175	package CFPlus::UI::TextEdit;
		2176
		2177	our @ISA = CFPlus::UI::EntryBase::;
		2178
		2179	use CFPlus::OpenGL;
		2180
		2181	sub move_cursor_ver {
		2182	my ($self, $dy) = @_;
		2183
		2184	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2185
		2186	$y += $dy;
		2187
		2188	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2189	$self->{cursor} = $index;
		2190	delete $self->{cur_h};
		2191	$self->update;
		2192	return;
		2193	}
		2194	}
		2195
		2196	sub invoke_key_down {
		2197	my ($self, $ev) = @_;
		2198
		2199	my $sym = $ev->{sym};
		2200
		2201	if ($sym == CFPlus::SDLK_UP) {
		2202	$self->move_cursor_ver (-1);
		2203	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2204	$self->move_cursor_ver (+1);
		2205	} else {
		2206	return $self->SUPER::invoke_key_down ($ev)
		2207	}
		2208
		2209	1
		2210	}
		2211
		2212	#############################################################################
		2213
1841	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1842		2215
1843	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1844		2217
1845	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1846		2219
1847	my @tex =	2220	my @tex =
1848	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
1850		2223
1851	sub new {	2224	sub new {
1852	my $class = shift;	2225	my $class = shift;
1853		2226
…		…
1862	can_events => 1,	2235	can_events => 1,
1863	@_	2236	@_
1864	)	2237	)
1865	}	2238	}
1866		2239
1867	sub activate { }
1868
1869	sub button_up {	2240	sub invoke_button_up {
1870	my ($self, $ev, $x, $y) = @_;	2241	my ($self, $ev, $x, $y) = @_;
1871		2242
1872	$self->emit ("activate")	2243	$self->emit ("activate")
1873	if $x >= 0 && $x < $self->{w}	2244	if $x >= 0 && $x < $self->{w}
1874	&& $y >= 0 && $y < $self->{h};	2245	&& $y >= 0 && $y < $self->{h};
		2246
		2247	1
1875	}	2248	}
1876		2249
1877	sub _draw {	2250	sub _draw {
1878	my ($self) = @_;	2251	my ($self) = @_;
1879		2252
1880	local $self->{fg} = $self->{fg};	2253	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882	if ($GRAB == $self) {
1883	$self->{fg} = $self->{active_fg};
1884	}
1885		2254
1886	glEnable GL_TEXTURE_2D;	2255	glEnable GL_TEXTURE_2D;
1887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888	glColor 0, 0, 0, 1;	2257	glColor 0, 0, 0, 1;
1889		2258
…		…
1894	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
1895	}	2264	}
1896		2265
1897	#############################################################################	2266	#############################################################################
1898		2267
1899	package CFClient::UI::CheckBox;	2268	package CFPlus::UI::CheckBox;
1900		2269
1901	our @ISA = CFClient::UI::DrawBG::;	2270	our @ISA = CFPlus::UI::DrawBG::;
1902		2271
1903	my @tex =	2272	my @tex =
1904	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1905	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2274	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1906		2275
1907	use CFClient::OpenGL;	2276	use CFPlus::OpenGL;
1908		2277
1909	sub new {	2278	sub new {
1910	my $class = shift;	2279	my $class = shift;
1911		2280
1912	$class->SUPER::new (	2281	$class->SUPER::new (
…		…
1926	my ($self) = @_;	2295	my ($self) = @_;
1927		2296
1928	(6) x 2	2297	(6) x 2
1929	}	2298	}
1930		2299
		2300	sub toggle {
		2301	my ($self) = @_;
		2302
		2303	$self->{state} = !$self->{state};
		2304	$self->emit (changed => $self->{state});
		2305	$self->update;
		2306	}
		2307
1931	sub button_down {	2308	sub invoke_button_down {
1932	my ($self, $ev, $x, $y) = @_;	2309	my ($self, $ev, $x, $y) = @_;
1933		2310
1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2311	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2312	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936	$self->{state} = !$self->{state};	2313	$self->toggle;
1937	$self->_emit (changed => $self->{state});	2314	} else {
		2315	return 0
		2316	}
		2317
1938	}	2318	1
1939	}	2319	}
1940		2320
1941	sub _draw {	2321	sub _draw {
1942	my ($self) = @_;	2322	my ($self) = @_;
1943		2323
…		…
1958	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
1959	}	2339	}
1960		2340
1961	#############################################################################	2341	#############################################################################
1962		2342
1963	package CFClient::UI::Image;	2343	package CFPlus::UI::Image;
1964		2344
1965	our @ISA = CFClient::UI::Base::;	2345	our @ISA = CFPlus::UI::Base::;
1966		2346
1967	use CFClient::OpenGL;	2347	use CFPlus::OpenGL;
1968	use Carp qw/confess/;
1969		2348
1970	our %loaded_images;	2349	our %texture_cache;
1971		2350
1972	sub new {	2351	sub new {
1973	my $class = shift;	2352	my $class = shift;
1974		2353
1975	my $self = $class->SUPER::new (can_events => 0, @_);	2354	my $self = $class->SUPER::new (
		2355	can_events => 0,
		2356	@_,
		2357	);
1976		2358
1977	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2359	$self->{path} || $self->{tex}
		2360	or Carp::croak "'path' or 'tex' attributes required";
1978		2361
1979	$loaded_images{$self->{image}} ||=	2362	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1980	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2363	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1981		2364
1982	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2365	CFPlus::weaken $texture_cache{$self->{path}};
1983		2366
1984	Scalar::Util::weaken $loaded_images{$self->{image}};	2367	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986	$self->{aspect} = $tex->{w} / $tex->{h};
1987		2368
1988	$self	2369	$self
1989	}	2370	}
1990		2371
		2372	sub STORABLE_freeze {
		2373	my ($self, $cloning) = @_;
		2374
		2375	$self->{path}
		2376	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2377
		2378	$self->{path}
		2379	}
		2380
		2381	sub STORABLE_attach {
		2382	my ($self, $cloning, $path) = @_;
		2383
		2384	$self->new (path => $path)
		2385	}
		2386
1991	sub size_request {	2387	sub size_request {
1992	my ($self) = @_;	2388	my ($self) = @_;
1993		2389
1994	($self->{tex}->{w}, $self->{tex}->{h})	2390	($self->{tex}{w}, $self->{tex}{h})
1995	}	2391	}
1996		2392
1997	sub _draw {	2393	sub _draw {
1998	my ($self) = @_;	2394	my ($self) = @_;
1999		2395
…		…
2009	}	2405	}
2010		2406
2011	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2012	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013		2409
2014	$tex->draw_quad_alpha (0, 0, $w, $h);	2410	$tex->draw_quad (0, 0, $w, $h);
2015		2411
2016	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
2017	}	2413	}
2018		2414
2019	#############################################################################	2415	#############################################################################
2020		2416
		2417	package CFPlus::UI::ImageButton;
		2418
		2419	our @ISA = CFPlus::UI::Image::;
		2420
		2421	use CFPlus::OpenGL;
		2422
		2423	my %textures;
		2424
		2425	sub new {
		2426	my $class = shift;
		2427
		2428	my $self = $class->SUPER::new (
		2429	padding_x => 4,
		2430	padding_y => 4,
		2431	fg => [1, 1, 1],
		2432	active_fg => [0, 0, 1],
		2433	can_hover => 1,
		2434	align => 0,
		2435	valign => 0,
		2436	can_events => 1,
		2437	@_
		2438	);
		2439	}
		2440
		2441	sub invoke_button_up {
		2442	my ($self, $ev, $x, $y) = @_;
		2443
		2444	$self->emit ("activate")
		2445	if $x >= 0 && $x < $self->{w}
		2446	&& $y >= 0 && $y < $self->{h};
		2447
		2448	1
		2449	}
		2450
		2451	#############################################################################
		2452
2021	package CFClient::UI::VGauge;	2453	package CFPlus::UI::VGauge;
2022		2454
2023	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
2024		2456
2025	use List::Util qw(min max);	2457	use List::Util qw(min max);
2026		2458
2027	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2028		2460
2029	my %tex = (	2461	my %tex = (
2030	food => [	2462	food => [
2031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2032	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2033	],	2465	],
2034	grace => [	2466	grace => [
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	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/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2037	],	2469	],
2038	hp => [	2470	hp => [
2039	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2040	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2041	],	2473	],
2042	mana => [	2474	mana => [
2043	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	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/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2045	],	2477	],
2046	);	2478	);
2047		2479
2048	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2108	my $ycut1 = max 0, min 1, $ycut;	2540	my $ycut1 = max 0, min 1, $ycut;
2109	my $ycut2 = max 0, min 1, $ycut - 1;	2541	my $ycut2 = max 0, min 1, $ycut - 1;
2110		2542
2111	my $h1 = $self->{h} * (1 - $ycut1);	2543	my $h1 = $self->{h} * (1 - $ycut1);
2112	my $h2 = $self->{h} * (1 - $ycut2);	2544	my $h2 = $self->{h} * (1 - $ycut2);
		2545	my $h3 = $self->{h};
		2546
		2547	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2113		2548
2114	glEnable GL_BLEND;	2549	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2550	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2551	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2552	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2554
2119	glBindTexture GL_TEXTURE_2D, $t1->{name};	2555	glBindTexture GL_TEXTURE_2D, $t1->{name};
2120	glBegin GL_QUADS;	2556	glBegin GL_QUADS;
…		…
2135		2571
2136	if ($t3) {	2572	if ($t3) {
2137	glBindTexture GL_TEXTURE_2D, $t3->{name};	2573	glBindTexture GL_TEXTURE_2D, $t3->{name};
2138	glBegin GL_QUADS;	2574	glBegin GL_QUADS;
2139	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2575	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2576	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2577	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2578	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143	glEnd;	2579	glEnd;
2144	}	2580	}
2145		2581
2146	glDisable GL_BLEND;	2582	glDisable GL_BLEND;
2147	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2148	}	2584	}
2149		2585
2150	#############################################################################	2586	#############################################################################
2151		2587
2152	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2153		2589
2154	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2155		2591
2156	sub new {	2592	sub new {
2157	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2158		2594
2159	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2161	can_hover => 1,	2597	can_hover => 1,
2162	can_events => 1,	2598	can_events => 1,
2163	%arg,	2599	%arg,
2164	);	2600	);
2165		2601
2166	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2602	$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);	2603	$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");	2604	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2169		2605
2170	$self	2606	$self
2171	}	2607	}
2172		2608
2173	sub set_fontsize {	2609	sub set_fontsize {
…		…
2194	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2195	}	2631	}
2196		2632
2197	#############################################################################	2633	#############################################################################
2198		2634
2199	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2200		2636
2201	use strict;	2637	use strict;
2202		2638
2203	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2204		2640
2205	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2206		2642
2207	my @tex =	2643	my @tex =
2208	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2209	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2210		2646
2211	sub new {	2647	sub new {
2212	my $class = shift;	2648	my $class = shift;
2213		2649
…		…
2234	$self->update;	2670	$self->update;
2235		2671
2236	$self	2672	$self
2237	}	2673	}
2238		2674
2239	sub changed { }
2240
2241	sub set_range {	2675	sub set_range {
2242	my ($self, $range) = @_;	2676	my ($self, $range) = @_;
2243		2677
2244	($range, $self->{range}) = ($self->{range}, $range);	2678	($range, $self->{range}) = ($self->{range}, $range);
2245		2679
2246	$self->update
2247	if "@$range" ne "@{$self->{range}}";	2680	if ("@$range" ne "@{$self->{range}}") {
		2681	$self->update;
		2682	$self->set_value ($self->{range}[0]);
		2683	}
2248	}	2684	}
2249		2685
2250	sub set_value {	2686	sub set_value {
2251	my ($self, $value) = @_;	2687	my ($self, $value) = @_;
2252		2688
…		…
2263	if $unit;	2699	if $unit;
2264		2700
2265	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2701	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266		2702
2267	if ($value != $old_value) {	2703	if ($value != $old_value) {
2268	$self->_emit (changed => $value);	2704	$self->emit (changed => $value);
2269	$self->update;	2705	$self->update;
2270	}	2706	}
2271	}	2707	}
2272		2708
2273	sub size_request {	2709	sub size_request {
2274	my ($self) = @_;	2710	my ($self) = @_;
2275		2711
2276	($self->{req_w}, $self->{req_h})	2712	($self->{req_w}, $self->{req_h})
2277	}	2713	}
2278		2714
2279	sub button_down {	2715	sub invoke_button_down {
2280	my ($self, $ev, $x, $y) = @_;	2716	my ($self, $ev, $x, $y) = @_;
2281		2717
2282	$self->SUPER::button_down ($ev, $x, $y);	2718	$self->SUPER::invoke_button_down ($ev, $x, $y);
2283		2719
2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2720	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285		2721
2286	$self->mouse_motion ($ev, $x, $y);	2722	$self->invoke_mouse_motion ($ev, $x, $y)
2287	}	2723	}
2288		2724
2289	sub mouse_motion {	2725	sub invoke_mouse_motion {
2290	my ($self, $ev, $x, $y) = @_;	2726	my ($self, $ev, $x, $y) = @_;
2291		2727
2292	if ($GRAB == $self) {	2728	if ($GRAB == $self) {
2293	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2729	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294		2730
2295	my (undef, $lo, $hi, $page) = @{$self->{range}};	2731	my (undef, $lo, $hi, $page) = @{$self->{range}};
2296		2732
2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2733	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298		2734
2299	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2735	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2736	} else {
		2737	return 0;
		2738	}
		2739
2300	}	2740	1
		2741	}
		2742
		2743	sub invoke_mouse_wheel {
		2744	my ($self, $ev) = @_;
		2745
		2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
		2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2751
		2752	! ! $delta
2301	}	2753	}
2302		2754
2303	sub update {	2755	sub update {
2304	my ($self) = @_;	2756	my ($self) = @_;
2305		2757
2306	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2758	delete $self->{knob_w};
		2759	$self->SUPER::update;
		2760	}
		2761
		2762	sub _draw {
		2763	my ($self) = @_;
		2764
		2765	unless ($self->{knob_w}) {
2307	$self->set_value ($self->{range}[0]);	2766	$self->set_value ($self->{range}[0]);
2308		2767
2309	my ($value, $lo, $hi, $page) = @{$self->{range}};	2768	my ($value, $lo, $hi, $page) = @{$self->{range}};
2310	my $range = ($hi - $page - $lo) || 1e-100;	2769	my $range = ($hi - $page - $lo) || 1e-100;
2311		2770
…		…
2317	$value = ($value - $lo) / $range;	2776	$value = ($value - $lo) / $range;
2318	$value = $value * $self->{scale} + $self->{offset};	2777	$value = $value * $self->{scale} + $self->{offset};
2319		2778
2320	$self->{knob_x} = $value - $knob_w * 0.5;	2779	$self->{knob_x} = $value - $knob_w * 0.5;
2321	$self->{knob_w} = $knob_w;	2780	$self->{knob_w} = $knob_w;
2322	});	2781	}
2323
2324	$self->SUPER::update;
2325	}
2326
2327	sub _draw {
2328	my ($self) = @_;
2329		2782
2330	$self->SUPER::_draw ();	2783	$self->SUPER::_draw ();
2331		2784
2332	glScale $self->{w}, $self->{h};	2785	glScale $self->{w}, $self->{h};
2333		2786
…		…
2353	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2354	}	2807	}
2355		2808
2356	#############################################################################	2809	#############################################################################
2357		2810
2358	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2359		2812
2360	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2361		2814
2362	sub new {	2815	sub new {
2363	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2364		2817
2365	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2366		2819
2367	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2368	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2369	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2370	to_value => sub { shift },	2823	to_value => sub { shift },
2371	from_value => sub { shift },	2824	from_value => sub { shift },
2372	%arg,	2825	%arg,
2373	);	2826	);
2374		2827
…		…
2394	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2395	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2396		2849
2397	#############################################################################	2850	#############################################################################
2398		2851
2399	package CFClient::UI::TextView;	2852	package CFPlus::UI::TextScroller;
2400		2853
2401	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2402		2855
2403	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2404		2857
2405	sub new {	2858	sub new {
2406	my $class = shift;	2859	my $class = shift;
2407		2860
2408	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
2409	fontsize => 1,	2862	fontsize => 1,
2410	can_events => 0,	2863	can_events => 1,
		2864	indent => 0,
2411	#font => default_font	2865	#font => default_font
2412	@_,	2866	@_,
2413		2867
2414	layout => (new CFClient::Layout 1),	2868	layout => (new CFPlus::Layout),
2415	par => [],	2869	par => [],
		2870	max_par => 0,
2416	height => 0,	2871	height => 0,
2417	children => [	2872	children => [
2418	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2419	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2420	],	2875	],
2421	);	2876	);
2422		2877
2423	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2424		2879
…		…
2430		2885
2431	$self->{fontsize} = $fontsize;	2886	$self->{fontsize} = $fontsize;
2432	$self->reflow;	2887	$self->reflow;
2433	}	2888	}
2434		2889
		2890	sub size_request {
		2891	my ($self) = @_;
		2892
		2893	my ($empty, $slider) = @{ $self->{children} };
		2894
		2895	local $self->{children} = [$empty, $slider];
		2896	$self->SUPER::size_request
		2897	}
		2898
2435	sub size_allocate {	2899	sub invoke_size_allocate {
2436	my ($self, $w, $h) = @_;	2900	my ($self, $w, $h) = @_;
2437		2901
2438	$self->SUPER::size_allocate ($w, $h);	2902	my ($empty, $slider, @other) = @{ $self->{children} };
		2903	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439		2904
2440	$self->{layout}->set_font ($self->{font}) if $self->{font};	2905	$self->{layout}->set_font ($self->{font}) if $self->{font};
2441	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2906	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442	$self->{layout}->set_width ($self->{children}[0]{w});	2907	$self->{layout}->set_width ($empty->{w});
		2908	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443		2909
2444	$self->reflow;	2910	$self->reflow;
2445	}
2446		2911
2447	sub text_size {	2912	local $self->{children} = [$empty, $slider];
		2913	$self->SUPER::invoke_size_allocate ($w, $h)
		2914	}
		2915
		2916	sub invoke_mouse_wheel {
2448	my ($self, $text, $indent) = @_;	2917	my ($self, $ev) = @_;
		2918
		2919	return 0 unless $ev->{dy}; # only vertical movements
		2920
		2921	$self->{children}[1]->emit (mouse_wheel => $ev);
		2922
		2923	1
		2924	}
		2925
		2926	sub get_layout {
		2927	my ($self, $para) = @_;
2449		2928
2450	my $layout = $self->{layout};	2929	my $layout = $self->{layout};
2451		2930
		2931	$layout->set_font ($self->{font}) if $self->{font};
		2932	$layout->set_foreground (@{$para->{fg}});
2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2933	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453	$layout->set_width ($self->{children}[0]{w} - $indent);	2934	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2935	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454	$layout->set_markup ($text);	2936	$layout->set_markup ($para->{markup});
		2937
		2938	$layout->set_shapes (
		2939	map
		2940	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2941	@{$para->{widget}}
2455		2942	);
		2943
2456	$layout->size	2944	$layout
2457	}	2945	}
2458		2946
2459	sub reflow {	2947	sub reflow {
2460	my ($self) = @_;	2948	my ($self) = @_;
2461		2949
…		…
2468		2956
2469	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2470	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
2471	}	2959	}
2472		2960
		2961	sub current_paragraph {
		2962	my ($self) = @_;
		2963
		2964	$self->{top_paragraph} - 1
		2965	}
		2966
		2967	sub scroll_to {
		2968	my ($self, $para) = @_;
		2969
		2970	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2971
		2972	$self->{scroll_to} = $para;
		2973	$self->update;
		2974	}
		2975
2473	sub clear {	2976	sub clear {
2474	my ($self) = @_;	2977	my ($self) = @_;
		2978
		2979	my (undef, undef, @other) = @{ $self->{children} };
		2980	$self->remove ($_) for @other;
2475		2981
2476	$self->{par} = [];	2982	$self->{par} = [];
2477	$self->{height} = 0;	2983	$self->{height} = 0;
2478	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479	}	2985	}
2480		2986
2481	sub add_paragraph {	2987	sub add_paragraph {
2482	my ($self, $color, $text, $indent) = @_;	2988	my $self = shift;
2483		2989
2484	for my $line (split /\n/, $text) {	2990	for my $para (@_) {
2485	my ($w, $h) = $self->text_size ($line);	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
		2997	w => 1e10,
		2998	wrapped => 1,
		2999	};
		3000
		3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3002	push @{$self->{par}}, $para;
		3003	}
		3004
		3005	if (my $max = $self->{max_par}) {
		3006	shift @{$self->{par}} while @{$self->{par}} > $max;
		3007	}
		3008
		3009	$self->{need_reflow}++;
		3010	$self->update;
		3011	}
		3012
		3013	sub scroll_to_bottom {
		3014	my ($self) = @_;
		3015
		3016	$self->{scroll_to} = $#{$self->{par}};
		3017	$self->update;
		3018	}
		3019
		3020	sub force_uptodate {
		3021	my ($self) = @_;
		3022
		3023	if (delete $self->{need_reflow}) {
		3024	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3025
		3026	my $height = 0;
		3027
		3028	for my $para (@{$self->{par}}) {
		3029	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3030	my $layout = $self->get_layout ($para);
		3031	my ($w, $h) = $layout->size;
		3032
		3033	$para->{w} = $w + $para->{indent};
		3034	$para->{h} = $h;
		3035	$para->{wrapped} = $layout->has_wrapped;
		3036	}
		3037
		3038	$para->{y} = $height;
		3039	$height += $para->{h};
		3040	}
		3041
2486	$self->{height} += $h;	3042	$self->{height} = $height;
2487	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3043	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2488	}
2489		3044
2490	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3045	delete $self->{texture};
		3046	}
		3047
		3048	if (my $paridx = delete $self->{scroll_to}) {
		3049	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3050	}
2491	}	3051	}
2492		3052
2493	sub update {	3053	sub update {
2494	my ($self) = @_;	3054	my ($self) = @_;
2495		3055
…		…
2497		3057
2498	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2499		3059
2500	delete $self->{texture};	3060	delete $self->{texture};
2501		3061
2502	$ROOT->on_post_alloc ($self, sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2503	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504		3066
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 {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2532	glClearColor 0.5, 0.5, 0.5, 0;	3068	glClearColor 0, 0, 0, 0;
2533	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2534		3070
		3071	package CFPlus::UI::Base;
		3072	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3073	(0, 0, $self->{w}, $self->{h});
		3074
		3075	my $top = int $self->{children}[1]{range}[0];
		3076
		3077	my $paridx = 0;
		3078	my $top_paragraph;
2535	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2536		3080
2537	my $y0 = $top;	3081	my $y0 = $top;
2538	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2539		3083
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}}) {	3084	for my $para (@{$self->{par}}) {
2551	my $h = $par->[1];	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2552		3087
2553	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2554	$layout->set_foreground (@{ $par->[2] });	3089	my $layout = $self->get_layout ($para);
2555	$layout->set_width ($W - $par->[3]);
2556	$layout->set_markup ($par->[4]);
2557		3090
2558	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3091	$layout->render ($para->{indent}, $y - $y0);
2559		3092
2560	glRasterPos $par->[3], $y - $y0;	3093	if (my @w = @{ $para->{widget} }) {
2561	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3094	my @s = $layout->get_shapes;
		3095
		3096	for (@w) {
		3097	my ($dx, $dy) = splice @s, 0, 2, ();
		3098
		3099	$_->{x} = $dx + $para->{indent};
		3100	$_->{y} = $dy + $y - $y0;
		3101
		3102	$_->draw;
		3103	}
		3104	}
2562	}	3105	}
2563		3106
2564	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2565	}	3109	}
2566		3110
2567	glDisable GL_BLEND;	3111	$self->{top_paragraph} = $top_paragraph;
2568	};	3112	};
2569	});	3113	});
2570	}	3114	}
2571		3115
		3116	sub reconfigure {
		3117	my ($self) = @_;
		3118
		3119	$self->SUPER::reconfigure;
		3120
		3121	$_->{w} = 1e10 for @{ $self->{par} };
		3122	$self->reflow;
		3123	}
		3124
2572	sub _draw {	3125	sub _draw {
2573	my ($self) = @_;	3126	my ($self) = @_;
2574		3127
2575	glEnable GL_TEXTURE_2D;	3128	glEnable GL_TEXTURE_2D;
2576	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3129	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577	glColor 1, 1, 1, 1;	3130	glColor 0, 0, 0, 1;
2578	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3131	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579	glDisable GL_TEXTURE_2D;	3132	glDisable GL_TEXTURE_2D;
2580		3133
2581	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2582
2583	}	3135	}
2584		3136
2585	#############################################################################	3137	#############################################################################
2586		3138
2587	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2588		3140
2589	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2590		3142
2591	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2592		3144
2593	sub moveto {	3145	sub moveto {
2594	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2595		3147
2596	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2624	glPopMatrix;	3176	glPopMatrix;
2625	}	3177	}
2626		3178
2627	#############################################################################	3179	#############################################################################
2628		3180
2629	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2630		3182
2631	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2632		3184
2633	sub new {	3185	sub new {
2634	my $class = shift;	3186	my $class = shift;
2635		3187
2636	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2648	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2649	}	3201	}
2650		3202
2651	#############################################################################	3203	#############################################################################
2652		3204
2653	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2654		3206
2655	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2656		3208
2657	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2658		3210
2659	sub new {	3211	sub new {
2660	my $class = shift;	3212	my $class = shift;
2661		3213
2662	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2665	)	3217	)
2666	}	3218	}
2667		3219
2668	sub set_tooltip_from {	3220	sub set_tooltip_from {
2669	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2670		3225
2671	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2672		3227
2673	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2674	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3230	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676	. "req $widget->{req_w} $widget->{req_h}\n"	3231	. "req $widget->{req_w} $widget->{req_h}\n"
2677	. "visible $widget->{visible}";	3232	. "visible $widget->{visible}";
2678	}	3233	}
2679		3234
		3235	$tooltip =~ s/^\n+//;
		3236	$tooltip =~ s/\n+$//;
		3237
2680	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2681	markup => $tooltip,	3239	markup => $tooltip,
2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683	fontsize => 0.8,	3241	fontsize => 0.8,
2684	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2685	ellipsise => 0,	3243	ellipsise => 0,
2686	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2687	);	3245	);
2688	}	3246	}
2689		3247
…		…
2693	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3251	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694		3252
2695	($w + 4, $h + 4)	3253	($w + 4, $h + 4)
2696	}	3254	}
2697		3255
2698	sub size_allocate {	3256	sub invoke_size_allocate {
2699	my ($self, $w, $h) = @_;	3257	my ($self, $w, $h) = @_;
2700		3258
2701	$self->SUPER::size_allocate ($w - 4, $h - 4);	3259	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702	}	3260	}
2703		3261
2704	sub visibility_change {	3262	sub invoke_visibility_change {
2705	my ($self, $visible) = @_;	3263	my ($self, $visible) = @_;
2706		3264
2707	return unless $visible;	3265	return unless $visible;
2708		3266
2709	$self->{root}->on_post_alloc ("move_$self" => sub {	3267	$self->{root}->on_post_alloc ("move_$self" => sub {
2710	my $widget = $self->{owner}	3268	my $widget = $self->{owner}
2711	or return;	3269	or return;
2712		3270
		3271	if ($widget->{visible}) {
2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714		3273
2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716	if $x + $self->{w} > $::WIDTH;	3275	if $x + $self->{w} > $self->{root}{w};
2717		3276
2718	$self->move_abs ($x, $y);	3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
2719	});	3281	});
2720	}	3282	}
2721		3283
2722	sub _draw {	3284	sub _draw {
2723	my ($self) = @_;	3285	my ($self) = @_;
…		…
2747	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
2748	}	3310	}
2749		3311
2750	#############################################################################	3312	#############################################################################
2751		3313
2752	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
2753		3315
2754	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
2755		3317
2756	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
2757		3319
2758	sub new {	3320	sub new {
2759	my $class = shift;	3321	my $class = shift;
2760		3322
2761	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
2763	can_events => 0,	3325	can_events => 0,
2764	@_,	3326	@_,
2765	);	3327	);
2766		3328
2767	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
2768	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
2769		3331
2770	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
2771	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772	hard => 1,	3334	hard => 1,
2773	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
2796	sub _draw {	3358	sub _draw {
2797	my ($self) = @_;	3359	my ($self) = @_;
2798		3360
2799	return unless $::CONN;	3361	return unless $::CONN;
2800		3362
		3363	$self->SUPER::_draw;
		3364
2801	my $face;	3365	my $face;
2802		3366
2803	if ($self->{frame}) {	3367	if ($self->{frame}) {
2804	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
2805		3369
…		…
2810	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3374	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811		3375
2812	if ($tex) {	3376	if ($tex) {
2813	glEnable GL_TEXTURE_2D;	3377	glEnable GL_TEXTURE_2D;
2814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815	glColor 1, 1, 1, 1;	3379	glColor 0, 0, 0, 1;
2816	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3380	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817	glDisable GL_TEXTURE_2D;	3381	glDisable GL_TEXTURE_2D;
2818	}	3382	}
2819	}	3383	}
2820		3384
2821	sub DESTROY {	3385	sub destroy {
2822	my ($self) = @_;	3386	my ($self) = @_;
2823		3387
2824	$self->{timer}->cancel	3388	$self->{timer}->cancel
2825	if $self->{timer};	3389	if $self->{timer};
2826		3390
2827	$self->SUPER::DESTROY;	3391	$self->SUPER::destroy;
2828	}	3392	}
2829		3393
2830	#############################################################################	3394	#############################################################################
2831		3395
		3396	package CFPlus::UI::Buttonbar;
		3397
		3398	our @ISA = CFPlus::UI::HBox::;
		3399
		3400	# TODO: should actually wrap buttons and other goodies.
		3401
		3402	#############################################################################
		3403
2832	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
2833		3405
2834	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
2835		3407
2836	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
2837		3409
2838	sub new {	3410	sub new {
2839	my $class = shift;	3411	my $class = shift;
2840		3412
2841	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
2842	items => [],	3414	items => [],
2843	z => 100,	3415	z => 100,
2844	@_,	3416	@_,
2845	);	3417	);
2846		3418
2847	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848		3420
2849	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
2850	my ($widget, $cb) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
2851		3423
2852	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
2853	if (!ref $widget) {	3425	if (!ref $widget) {
		3426	if ($widget =~ /\t/) {
		3427	my ($left, $right) = split /\t/, $widget, 2;
		3428
2854	$widget = new CFClient::UI::Label	3429	$widget = new CFPlus::UI::HBox
2855	can_hover => 1,	3430	can_hover => 1,
2856	can_events => 1,	3431	can_events => 1,
		3432	tooltip => $tooltip,
		3433	children => [
		3434	(new CFPlus::UI::Label markup => $left, expand => 1),
		3435	(new CFPlus::UI::Label markup => $right, align => +1),
		3436	],
		3437	;
		3438
		3439	} else {
		3440	$widget = new CFPlus::UI::Label
		3441	can_hover => 1,
		3442	can_events => 1,
2857	text => $widget;	3443	markup => $widget,
		3444	tooltip => $tooltip;
		3445	}
2858	}	3446	}
2859		3447
2860	$self->{item}{$widget} = $item;	3448	$self->{item}{$widget} = $item;
2861		3449
2862	$self->{vbox}->add ($widget);	3450	$self->{vbox}->add ($widget);
…		…
2867		3455
2868	# popup given the event (must be a mouse button down event currently)	3456	# popup given the event (must be a mouse button down event currently)
2869	sub popup {	3457	sub popup {
2870	my ($self, $ev) = @_;	3458	my ($self, $ev) = @_;
2871		3459
2872	$self->_emit ("popdown");	3460	$self->emit ("popdown");
2873		3461
2874	# maybe save $GRAB? must be careful about events...	3462	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	3463	$GRAB = $self;
2876	$self->{button} = $ev->{button};	3464	$self->{button} = $ev->{button};
2877		3465
2878	$self->show;	3466	$self->show;
2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3467	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880	}	3468	}
2881		3469
2882	sub mouse_motion {	3470	sub invoke_mouse_motion {
2883	my ($self, $ev, $x, $y) = @_;	3471	my ($self, $ev, $x, $y) = @_;
2884		3472
2885	# TODO: should use vbox->find_widget or so	3473	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3474	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	3475	$self->{hover} = $self->{item}{$HOVER};
2888	}
2889		3476
		3477	0
		3478	}
		3479
2890	sub button_up {	3480	sub invoke_button_up {
2891	my ($self, $ev, $x, $y) = @_;	3481	my ($self, $ev, $x, $y) = @_;
2892		3482
2893	if ($ev->{button} == $self->{button}) {	3483	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	3484	undef $GRAB;
2895	$self->hide;	3485	$self->hide;
2896		3486
2897	$self->_emit ("popdown");	3487	$self->emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	3488	$self->{hover}[1]->() if $self->{hover};
		3489	} else {
		3490	return 0
		3491	}
		3492
2899	}	3493	1
2900	}	3494	}
2901		3495
2902	#############################################################################	3496	#############################################################################
2903		3497
2904	package CFClient::UI::Statusbox;	3498	package CFPlus::UI::Multiplexer;
2905		3499
2906	our @ISA = CFClient::UI::VBox::;	3500	our @ISA = CFPlus::UI::Container::;
2907		3501
2908	sub new {	3502	sub new {
2909	my $class = shift;	3503	my $class = shift;
2910		3504
2911	$class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	@_,
		3507	);
		3508
		3509	$self->{current} = $self->{children}[0]
		3510	if @{ $self->{children} };
		3511
		3512	$self
		3513	}
		3514
		3515	sub add {
		3516	my ($self, @widgets) = @_;
		3517
		3518	$self->SUPER::add (@widgets);
		3519
		3520	$self->{current} = $self->{children}[0]
		3521	if @{ $self->{children} };
		3522	}
		3523
		3524	sub get_current_page {
		3525	my ($self) = @_;
		3526
		3527	$self->{current}
		3528	}
		3529
		3530	sub set_current_page {
		3531	my ($self, $page_or_widget) = @_;
		3532
		3533	my $widget = ref $page_or_widget
		3534	? $page_or_widget
		3535	: $self->{children}[$page_or_widget];
		3536
		3537	$self->{current} = $widget;
		3538	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3539
		3540	$self->emit (page_changed => $self->{current});
		3541
		3542	$self->realloc;
		3543	}
		3544
		3545	sub visible_children {
		3546	$_[0]{current}
		3547	}
		3548
		3549	sub size_request {
		3550	my ($self) = @_;
		3551
		3552	$self->{current}->size_request
		3553	}
		3554
		3555	sub invoke_size_allocate {
		3556	my ($self, $w, $h) = @_;
		3557
		3558	$self->{current}->configure (0, 0, $w, $h);
		3559
		3560	1
		3561	}
		3562
		3563	sub _draw {
		3564	my ($self) = @_;
		3565
		3566	$self->{current}->draw;
		3567	}
		3568
		3569	#############################################################################
		3570
		3571	package CFPlus::UI::Notebook;
		3572
		3573	our @ISA = CFPlus::UI::VBox::;
		3574
		3575	sub new {
		3576	my $class = shift;
		3577
		3578	my $self = $class->SUPER::new (
		3579	buttonbar => (new CFPlus::UI::Buttonbar),
		3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3581	# filter => # will be put between multiplexer and $self
		3582	@_,
		3583	);
		3584
		3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3586	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3587
		3588	$self
		3589	}
		3590
		3591	sub add {
		3592	my ($self, $title, $widget, $tooltip) = @_;
		3593
		3594	CFPlus::weaken $self;
		3595
		3596	$self->{buttonbar}->add (new CFPlus::UI::Button
		3597	markup => $title,
		3598	tooltip => $tooltip,
		3599	on_activate => sub { $self->set_current_page ($widget) },
		3600	);
		3601
		3602	$self->{multiplexer}->add ($widget);
		3603	}
		3604
		3605	sub get_current_page {
		3606	my ($self) = @_;
		3607
		3608	$self->{multiplexer}->get_current_page
		3609	}
		3610
		3611	sub set_current_page {
		3612	my ($self, $page) = @_;
		3613
		3614	$self->{multiplexer}->set_current_page ($page);
		3615	$self->emit (page_changed => $self->{multiplexer}{current});
		3616	}
		3617
		3618	#############################################################################
		3619
		3620	package CFPlus::UI::Selector;
		3621
		3622	use utf8;
		3623
		3624	our @ISA = CFPlus::UI::Button::;
		3625
		3626	sub new {
		3627	my $class = shift;
		3628
		3629	my $self = $class->SUPER::new (
		3630	options => [], # [value, title, longdesc], ...
		3631	value => undef,
		3632	@_,
		3633	);
		3634
		3635	$self->_set_value ($self->{value});
		3636
		3637	$self
		3638	}
		3639
		3640	sub invoke_button_down {
		3641	my ($self, $ev) = @_;
		3642
		3643	my @menu_items;
		3644
		3645	for (@{ $self->{options} }) {
		3646	my ($value, $title, $tooltip) = @$_;
		3647
		3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3649	}
		3650
		3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3652	}
		3653
		3654	sub _set_value {
		3655	my ($self, $value) = @_;
		3656
		3657	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3658	or return;
		3659
		3660	$self->{value} = $item->[0];
		3661	$self->set_markup ("$item->[1] ⇓");
		3662	$self->set_tooltip ($item->[2]);
		3663	}
		3664
		3665	sub set_value {
		3666	my ($self, $value) = @_;
		3667
		3668	return unless $self->{value} ne $value;
		3669
		3670	$self->_set_value ($value);
		3671	$self->emit (changed => $value);
		3672	}
		3673
		3674	#############################################################################
		3675
		3676	package CFPlus::UI::Statusbox;
		3677
		3678	our @ISA = CFPlus::UI::VBox::;
		3679
		3680	sub new {
		3681	my $class = shift;
		3682
		3683	my $self = $class->SUPER::new (
2912	fontsize => 0.8,	3684	fontsize => 0.8,
2913	@_,	3685	@_,
2914	)	3686	);
		3687
		3688	CFPlus::weaken (my $this = $self);
		3689
		3690	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3691
		3692	$self
2915	}	3693	}
2916		3694
2917	sub reorder {	3695	sub reorder {
2918	my ($self) = @_;	3696	my ($self) = @_;
2919	my $NOW = time;	3697	my $NOW = Time::HiRes::time;
		3698
		3699	# freeze display when hovering over any label
		3700	return if $CFPlus::UI::TOOLTIP->{owner}
		3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3702	values %{ $self->{item} };
2920		3703
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3706	}
2924		3707
…		…
2927	my @items = sort {	3710	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3711	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3712	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3713	} values %{ $self->{item} };
2931		3714
		3715	$self->{timer}->interval (1);
		3716
2932	my $count = 10 + 1;	3717	my $count = 10 + 1;
2933	for my $item (@items) {	3718	for my $item (@items) {
2934	last unless --$count;	3719	last unless --$count;
2935		3720
2936	push @widgets, $item->{label} ||= do {	3721	my $label = $item->{label} ||= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3722	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3723	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3724	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3725	: $item->{text};
2941		3726
2942	for ($short) {	3727	for ($short) {
2943	s/^\s+//;	3728	s/^\s+//;
2944	s/\s+/ /g;	3729	s/\s+/ /g;
2945	}	3730	}
2946		3731
2947	new CFClient::UI::Label	3732	new CFPlus::UI::Label
2948	markup => $short,	3733	markup => $short,
2949	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3738	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3739	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3740	can_events => 1,
2956	can_hover => 1	3741	can_hover => 1
2957	};	3742	};
		3743
		3744	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3745	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3746	$label->update;
		3747	$label->set_max_size (undef, $label->{req_h} * $diff)
		3748	if $diff < 1;
		3749	$self->{timer}->interval (1/30);
		3750	} else {
		3751	$label->{fg}[3] = $item->{fg}[3] || 1;
		3752	}
		3753
		3754	push @widgets, $label;
2958	}	3755	}
2959		3756
2960	$self->clear;	3757	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3758	$self->SUPER::add (reverse @widgets);
2962	}	3759	}
…		…
2967	$text =~ s/^\s+//;	3764	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	3765	$text =~ s/\s+$//;
2969		3766
2970	return unless $text;	3767	return unless $text;
2971		3768
2972	my $timeout = time + ((delete $arg{timeout}) || 60);	3769	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973		3770
2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3771	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975		3772
2976	if (my $item = $self->{item}{$group}) {	3773	if (my $item = $self->{item}{$group}) {
2977	if ($item->{text} eq $text) {	3774	if ($item->{text} eq $text) {
2978	$item->{count}++;	3775	$item->{count}++;
2979	} else {	3776	} else {
2980	$item->{count} = 1;	3777	$item->{count} = 1;
2981	$item->{text} = $item->{tooltip} = $text;	3778	$item->{text} = $item->{tooltip} = $text;
2982	}	3779	}
2983	$item->{id} = ++$self->{id};	3780	$item->{id} += 0.2;#d#
2984	$item->{timeout} = $timeout;	3781	$item->{timeout} = $timeout;
2985	delete $item->{label};	3782	delete $item->{label};
2986	} else {	3783	} else {
2987	$self->{item}{$group} = {	3784	$self->{item}{$group} = {
2988	id => ++$self->{id},	3785	id => ++$self->{id},
…		…
2994	count => 1,	3791	count => 1,
2995	%arg,	3792	%arg,
2996	};	3793	};
2997	}	3794	}
2998		3795
		3796	$ROOT->on_refresh (reorder => sub {
2999	$self->reorder;	3797	$self->reorder;
		3798	});
3000	}	3799	}
3001		3800
3002	sub reconfigure {	3801	sub reconfigure {
3003	my ($self) = @_;	3802	my ($self) = @_;
3004		3803
…		…
3007		3806
3008	$self->reorder;	3807	$self->reorder;
3009	$self->SUPER::reconfigure;	3808	$self->SUPER::reconfigure;
3010	}	3809	}
3011		3810
		3811	sub destroy {
		3812	my ($self) = @_;
		3813
		3814	$self->{timer}->cancel;
		3815
		3816	$self->SUPER::destroy;
		3817	}
		3818
3012	#############################################################################	3819	#############################################################################
3013		3820
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;	3821	package CFPlus::UI::Root;
3311		3822
3312	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3313		3824
		3825	use List::Util qw(min max);
		3826
3314	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3315		3828
3316	sub new {	3829	sub new {
3317	my $class = shift;	3830	my $class = shift;
3318		3831
3319	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3320	visible => 1,	3833	visible => 1,
3321	@_,	3834	@_,
3322	);	3835	);
3323		3836
3324	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3325		3838
3326	$self	3839	$self
3327	}	3840	}
3328		3841
3329	sub size_request {	3842	sub size_request {
…		…
3344	$coord = $max - $size if $coord > $max - $size;	3857	$coord = $max - $size if $coord > $max - $size;
3345		3858
3346	int $coord + 0.5	3859	int $coord + 0.5
3347	}	3860	}
3348		3861
3349	sub size_allocate {	3862	sub invoke_size_allocate {
3350	my ($self, $w, $h) = @_;	3863	my ($self, $w, $h) = @_;
3351		3864
3352	for my $child ($self->children) {	3865	for my $child ($self->children) {
3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3866	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3354		3867
…		…
3358	$X = _to_pixel $X, $W, $self->{w};	3871	$X = _to_pixel $X, $W, $self->{w};
3359	$Y = _to_pixel $Y, $H, $self->{h};	3872	$Y = _to_pixel $Y, $H, $self->{h};
3360		3873
3361	$child->configure ($X, $Y, $W, $H);	3874	$child->configure ($X, $Y, $W, $H);
3362	}	3875	}
		3876
		3877	1
3363	}	3878	}
3364		3879
3365	sub coord2local {	3880	sub coord2local {
3366	my ($self, $x, $y) = @_;	3881	my ($self, $x, $y) = @_;
3367		3882
…		…
3452		3967
3453	delete $queue{$widget+0};	3968	delete $queue{$widget+0};
3454		3969
3455	my ($w, $h) = $widget->size_request;	3970	my ($w, $h) = $widget->size_request;
3456		3971
3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3972	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3973	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3974
		3975	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3976	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459		3977
3460	$w = $widget->{force_w} if exists $widget->{force_w};	3978	$w = $widget->{force_w} if exists $widget->{force_w};
3461	$h = $widget->{force_h} if exists $widget->{force_h};	3979	$h = $widget->{force_h} if exists $widget->{force_h};
3462		3980
3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3981	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3489		4007
3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4008	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491		4009
3492	$w = 0 if $w < 0;	4010	$w = 0 if $w < 0;
3493	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
		4012
		4013	$w = max $widget->{min_w}, $w;
		4014	$h = max $widget->{min_h}, $h;
		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
		4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3494		4021
3495	$w = int $w + 0.5;	4022	$w = int $w + 0.5;
3496	$h = int $h + 0.5;	4023	$h = int $h + 0.5;
3497		4024
3498	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4025	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
…		…
3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3523	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3524	glLoadIdentity;	4051	glLoadIdentity;
3525		4052
3526	{	4053	{
3527	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
3528		4055
3529	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3530	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
3531	}
3532		4058
3533	$self->_draw;	4059	$self->_draw;
		4060	}
3534	}	4061	}
3535		4062
3536	#############################################################################	4063	#############################################################################
3537		4064
3538	package CFClient::UI;	4065	package CFPlus::UI;
3539		4066
3540	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
3541	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3542		4069
3543	1	4070	1
3544		4071

Diff Legend

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