ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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