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

Diff Legend

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