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.344 by root, Sun Aug 13 16:29:36 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
… …
848} 909}
849 910
850sub _draw { 911sub _draw {
851 my ($self) = @_; 912 my ($self) = @_;
852 913
853 my ($w, $h) = @$self{qw(w h)};
854
855 my $tex = $self->{texture} 914 my $tex = $self->{texture}
856 or return; 915 or return;
857 916
858 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 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; 919 glColor 0, 0, 0, 1;
863 920
864 $tex->draw_quad (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
865 922
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
868} 924}
869 925
870############################################################################# 926#############################################################################
871 927
872package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
873 929
874our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
875 931
876sub new { 932sub new {
877 my $class = shift; 933 my $class = shift;
878 934
879 $class->SUPER::new ( 935 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
893 949
894 ($w, $h) 950 ($w, $h)
895} 951}
896 952
897sub size_allocate { 953sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
899 955
900 my $child = $self->child; 956 my $child = $self->child;
901 957
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 960
905 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
906 $self->update; 962 $self->update;
963
964 1
907} 965}
908 966
909sub set_offset { 967sub set_offset {
910 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
911 969
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 997 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 999 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1001 }
944} 1002}
945 1003
946sub _render { 1004sub _render {
947 my ($self) = @_; 1005 my ($self) = @_;
948 1006
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 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}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1009
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1011
954 $self->SUPER::_render; 1012 $self->SUPER::_render;
955} 1013}
956 1014
957############################################################################# 1015#############################################################################
958 1016
959package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
960 1018
961our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
962 1020
963sub new { 1021sub new {
964 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
965 1023
966 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
967 1025
968 my $self; 1026 my $self;
969 1027
970 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1029 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1031 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
975 }, 1033 },
976 ; 1034 ;
977 1035
978 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
980 slider => $slider, 1039 slider => $slider,
981 %arg, 1040 %arg,
982 ); 1041 );
983 1042
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
986 1045
987 $self 1046 $self
988} 1047}
989 1048
1049#TODO# update range on size_allocate depending on child
1050
990sub add { 1051sub add {
991 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
992 1053
993 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
994} 1055}
995 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
996sub update { 1073sub update {
997 my ($self) = @_; 1074 my ($self) = @_;
998 1075
999 $self->SUPER::update; 1076 $self->SUPER::update;
1000 1077
1001 # todo: overwrite size_allocate of child 1078 $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} 1079}
1005 1080
1006sub size_allocate { 1081sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
1008 1083
1084 $self->update_slider;
1085
1009 $self->SUPER::size_allocate ($w, $h); 1086 $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} 1087}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1088
1018############################################################################# 1089#############################################################################
1019 1090
1020package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1021 1092
1022our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1023 1094
1024use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1025 1096
1026sub new { 1097sub new {
1027 my $class = shift; 1098 my $class = shift;
1028 1099
1029 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1056} 1127}
1057 1128
1058############################################################################# 1129#############################################################################
1059 1130
1060package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1061 1132
1062our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1063 1134
1064use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1065 1136
1066my $bg = 1137my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1; 1139 mipmap => 1, wrap => 1;
1069 1140
1070my @border = 1141my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1142 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); 1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1144
1074sub new { 1145sub new {
1075 my ($class, %arg) = @_; 1146 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1147
1079 my $self = $class->SUPER::new ( 1148 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1149 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1150 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1151 border => 0.6,
1083 can_events => 1, 1152 can_events => 1,
1084 min_w => 16, 1153 min_w => 64,
1085 min_h => 16, 1154 min_h => 32,
1086 %arg, 1155 %arg,
1087 ); 1156 );
1088 1157
1089 $self->{title} = new CFClient::UI::Label 1158 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1159 align => 0,
1091 valign => 1, 1160 valign => 1,
1092 text => $title, 1161 text => $self->{title},
1093 fontsize => $self->{border} 1162 fontsize => $self->{border},
1094 if defined $title; 1163 if exists $self->{title};
1164
1165 if ($self->{has_close_button}) {
1166 $self->{close_button} =
1167 new CFPlus::UI::ImageButton
1168 path => 'x1_close.png',
1169 on_activate => sub { $self->emit ("delete") };
1170
1171 $self->CFPlus::UI::Container::add ($self->{close_button});
1172 }
1095 1173
1096 $self 1174 $self
1097} 1175}
1098 1176
1099sub add { 1177sub add {
1100 my ($self, @widgets) = @_; 1178 my ($self, @widgets) = @_;
1101 1179
1102 $self->SUPER::add (@widgets); 1180 $self->SUPER::add (@widgets);
1181 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1182 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1183}
1105 1184
1106sub border { 1185sub border {
1107 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
1108} 1187}
1109 1188
1110sub size_request { 1189sub size_request {
1111 my ($self) = @_; 1190 my ($self) = @_;
1112 1191
1113 $self->{title}->size_request 1192 $self->{title_widget}->size_request
1114 if $self->{title}; 1193 if $self->{title_widget};
1194
1195 $self->{close_button}->size_request
1196 if $self->{close_button};
1115 1197
1116 my ($w, $h) = $self->SUPER::size_request; 1198 my ($w, $h) = $self->SUPER::size_request;
1117 1199
1118 ( 1200 (
1119 $w + $self->border * 2, 1201 $w + $self->border * 2,
1120 $h + $self->border * 2, 1202 $h + $self->border * 2,
1121 ) 1203 )
1122} 1204}
1123 1205
1124sub size_allocate { 1206sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1207 my ($self, $w, $h) = @_;
1126 1208
1127 if ($self->{title}) { 1209 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1210 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1211 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1212 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1213 }
1132 1214
1133 my $border = $self->border; 1215 my $border = $self->border;
1134 1216
1135 $h -= List::Util::max 0, $border * 2; 1217 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1218 $w -= List::Util::max 0, $border * 2;
1219
1220 $self->child->configure ($border, $border, $w, $h);
1221
1222 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1223 if $self->{close_button};
1224
1225 1
1226}
1227
1228sub invoke_delete {
1229 my ($self) = @_;
1230
1231 $self->hide;
1137 1232
1138 $self->child->configure ($border, $border, $w, $h); 1233 1
1139} 1234}
1140 1235
1141sub button_down { 1236sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1143 1238
1144 my ($w, $h) = @$self{qw(w h)}; 1239 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1240 my $border = $self->border;
1146 1241
… …
1177 1272
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1273 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1274
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1275 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1276 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1277 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1278 };
1184 } else { 1279 } else {
1185 return 0; 1280 return 0;
1186 } 1281 }
1187 1282
1188 1 1283 1
1189} 1284}
1190 1285
1191sub button_up { 1286sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1287 my ($self, $ev, $x, $y) = @_;
1193 1288
1194 !!delete $self->{motion} 1289 ! ! delete $self->{motion}
1195} 1290}
1196 1291
1197sub mouse_motion { 1292sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1293 my ($self, $ev, $x, $y) = @_;
1199 1294
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1295 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1296
1202 !!$self->{motion} 1297 ! ! $self->{motion}
1298}
1299
1300sub invoke_visibility_change {
1301 my ($self, $visible) = @_;
1302
1303 delete $self->{motion} unless $visible;
1304
1305 0
1203} 1306}
1204 1307
1205sub _draw { 1308sub _draw {
1206 my ($self) = @_; 1309 my ($self) = @_;
1207 1310
… …
1233 1336
1234 glDisable GL_TEXTURE_2D; 1337 glDisable GL_TEXTURE_2D;
1235 1338
1236 $child->draw; 1339 $child->draw;
1237 1340
1238 if ($self->{title}) { 1341 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1342 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1343 $self->{title_widget}->_draw;
1344
1345 glTranslate 0, - ($border - $self->{h});
1241 } 1346 }
1347
1348 $self->{close_button}->draw
1349 if $self->{close_button};
1242} 1350}
1243 1351
1244############################################################################# 1352#############################################################################
1245 1353
1246package CFClient::UI::Table; 1354package CFPlus::UI::Table;
1247 1355
1248our @ISA = CFClient::UI::Base::; 1356our @ISA = CFPlus::UI::Base::;
1249 1357
1250use List::Util qw(max sum); 1358use List::Util qw(max sum);
1251 1359
1252use CFClient::OpenGL; 1360use CFPlus::OpenGL;
1253 1361
1254sub new { 1362sub new {
1255 my $class = shift; 1363 my $class = shift;
1256 1364
1257 $class->SUPER::new ( 1365 $class->SUPER::new (
… …
1263sub children { 1371sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1373}
1266 1374
1267sub add { 1375sub add {
1268 my ($self, $x, $y, $child) = @_; 1376 my ($self) = shift;
1269 1377
1378 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1380 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1381 $self->{children}[$y][$x] = $child;
1382 }
1272 1383
1384 $self->{force_realloc} = 1;
1385 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1386 $self->realloc;
1387}
1388
1389sub remove {
1390 my ($self, $child) = @_;
1391
1392 # TODO: not yet implemented
1274} 1393}
1275 1394
1276# TODO: move to container class maybe? send children a signal on removal? 1395# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1396sub clear {
1278 my ($self) = @_; 1397 my ($self) = @_;
… …
1319 (sum @$ws), 1438 (sum @$ws),
1320 (sum @$hs), 1439 (sum @$hs),
1321 ) 1440 )
1322} 1441}
1323 1442
1324sub size_allocate { 1443sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1326 1445
1327 my ($ws, $hs) = $self->get_wh; 1446 my ($ws, $hs) = $self->get_wh;
1328 1447
1329 my $req_w = (sum @$ws) || 1; 1448 my $req_w = (sum @$ws) || 1;
… …
1336 1455
1337 # linearly scale sizes 1456 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1459
1341 CFClient::UI::harmonize $ws; 1460 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1461 CFPlus::UI::harmonize $hs;
1343 1462
1344 my $y; 1463 my $y;
1345 1464
1346 for my $r (0 .. $#{$self->{children}}) { 1465 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1466 my $row = $self->{children}[$r]
… …
1361 } 1480 }
1362 1481
1363 $y += $row_h; 1482 $y += $row_h;
1364 } 1483 }
1365 1484
1485 1
1366} 1486}
1367 1487
1368sub find_widget { 1488sub find_widget {
1369 my ($self, $x, $y) = @_; 1489 my ($self, $x, $y) = @_;
1370 1490
… …
1389 } 1509 }
1390} 1510}
1391 1511
1392############################################################################# 1512#############################################################################
1393 1513
1394package CFClient::UI::Box; 1514package CFPlus::UI::Box;
1395 1515
1396our @ISA = CFClient::UI::Container::; 1516our @ISA = CFPlus::UI::Container::;
1397 1517
1398sub size_request { 1518sub size_request {
1399 my ($self) = @_; 1519 my ($self) = @_;
1400 1520
1401 $self->{vertical} 1521 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1528 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1529 )
1410} 1530}
1411 1531
1412sub size_allocate { 1532sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1533 my ($self, $w, $h) = @_;
1414 1534
1415 my $space = $self->{vertical} ? $h : $w; 1535 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1536 my @children = $self->visible_children;
1417 1537
1418 my @req; 1538 my @req;
1419 1539
1420 if ($self->{homogeneous}) { 1540 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1541 @req = ($space / (@children || 1)) x @children;
1422 } else { 1542 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1543 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1544 my $req = List::Util::sum @req;
1425 1545
1426 if ($req > $space) { 1546 if ($req > $space) {
1427 # ah well, not enough space 1547 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1548 $_ *= $space / $req for @req;
1429 } else { 1549 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1550 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1551
1432 $space = ($space - $req) / $expand; # remaining space to give away 1552 $space = ($space - $req) / $expand; # remaining space to give away
1433 1553
1434 $req[$_] += $space * $children->[$_]{expand} 1554 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1555 for 0 .. $#children;
1436 } 1556 }
1437 } 1557 }
1438 1558
1439 CFClient::UI::harmonize \@req; 1559 CFPlus::UI::harmonize \@req;
1440 1560
1441 my $pos = 0; 1561 my $pos = 0;
1442 for (0 .. $#$children) { 1562 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1563 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1564 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1565
1446 $pos += $alloc; 1566 $pos += $alloc;
1447 } 1567 }
1448 1568
1449 1 1569 1
1450} 1570}
1451 1571
1452############################################################################# 1572#############################################################################
1453 1573
1454package CFClient::UI::HBox; 1574package CFPlus::UI::HBox;
1455 1575
1456our @ISA = CFClient::UI::Box::; 1576our @ISA = CFPlus::UI::Box::;
1457 1577
1458sub new { 1578sub new {
1459 my $class = shift; 1579 my $class = shift;
1460 1580
1461 $class->SUPER::new ( 1581 $class->SUPER::new (
… …
1464 ) 1584 )
1465} 1585}
1466 1586
1467############################################################################# 1587#############################################################################
1468 1588
1469package CFClient::UI::VBox; 1589package CFPlus::UI::VBox;
1470 1590
1471our @ISA = CFClient::UI::Box::; 1591our @ISA = CFPlus::UI::Box::;
1472 1592
1473sub new { 1593sub new {
1474 my $class = shift; 1594 my $class = shift;
1475 1595
1476 $class->SUPER::new ( 1596 $class->SUPER::new (
… …
1479 ) 1599 )
1480} 1600}
1481 1601
1482############################################################################# 1602#############################################################################
1483 1603
1484package CFClient::UI::Label; 1604package CFPlus::UI::Label;
1485 1605
1486our @ISA = CFClient::UI::DrawBG::; 1606our @ISA = CFPlus::UI::DrawBG::;
1487 1607
1488use CFClient::OpenGL; 1608use CFPlus::OpenGL;
1489 1609
1490sub new { 1610sub new {
1491 my ($class, %arg) = @_; 1611 my ($class, %arg) = @_;
1492 1612
1493 my $self = $class->SUPER::new ( 1613 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1616 #active_bg => none
1497 #font => default_font 1617 #font => default_font
1498 #text => initial text 1618 #text => initial text
1499 #markup => initial narkup 1619 #markup => initial narkup
1500 #max_w => maximum pixel width 1620 #max_w => maximum pixel width
1621 #style => 0, # render flags
1501 ellipsise => 3, # end 1622 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1624 fontsize => 1,
1504 align => -1, 1625 align => -1,
1505 valign => -1, 1626 valign => -1,
1506 padding_x => 2, 1627 padding_x => 2,
1507 padding_y => 2, 1628 padding_y => 2,
1508 can_events => 0, 1629 can_events => 0,
1509 %arg 1630 %arg
1510 ); 1631 );
1511 1632
1512 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1636 $self->{template} = $layout;
1516 } 1637 }
1517 1638
1518 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1522 } 1643 }
1523 1644
1524 $self 1645 $self
1525} 1646}
1526 1647
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1648sub update {
1538 my ($self) = @_; 1649 my ($self) = @_;
1539 1650
1540 delete $self->{texture}; 1651 delete $self->{texture};
1541 $self->SUPER::update; 1652 $self->SUPER::update;
1542} 1653}
1543 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1544sub set_text { 1662sub set_text {
1545 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1546 1664
1547 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1549 1667
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1552 1669
1670 delete $self->{size_req};
1553 $self->realloc; 1671 $self->realloc;
1554 $self->update; 1672 $self->update;
1555} 1673}
1556 1674
1557sub set_markup { 1675sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1562 1680
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1682
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1567 1684
1685 delete $self->{size_req};
1568 $self->realloc; 1686 $self->realloc;
1569 $self->update; 1687 $self->update;
1570} 1688}
1571 1689
1572sub size_request { 1690sub size_request {
1573 my ($self) = @_; 1691 my ($self) = @_;
1574 1692
1693 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1699
1581 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1582 1701
1583 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1706
1587 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1588 1708
1589 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1591 } 1714 };
1592 1715
1593 ($w, $h) 1716 @{ $self->{size_req} }
1594} 1717}
1595 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1596sub size_allocate { 1723sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1598 1725
1599 delete $self->{ox}; 1726 delete $self->{ox};
1600 1727
1601 delete $self->{texture} 1728 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1603} 1732}
1604 1733
1605sub set_fontsize { 1734sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1607 1736
1608 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1609 delete $self->{texture}; 1739 delete $self->{texture};
1610 1740
1611 $self->realloc; 1741 $self->realloc;
1612} 1742}
1613 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1614sub _draw { 1753sub _draw {
1615 my ($self) = @_; 1754 my ($self) = @_;
1616 1755
1617 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1618 1757
1619 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 1765
1627 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1628 }; 1767 };
1629 1768
1630 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1634 1773
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 1777 };
1639 1778
1640 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 1781
1643 if ($tex->{format} == GL_ALPHA) { 1782 $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} 1783}
1652 1784
1653############################################################################# 1785#############################################################################
1654 1786
1655package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1656 1788
1657our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1658 1790
1659use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1660 1792
1661sub new { 1793sub new {
1662 my $class = shift; 1794 my $class = shift;
1663 1795
1664 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1669 can_hover => 1, 1801 can_hover => 1,
1670 can_focus => 1, 1802 can_focus => 1,
1671 valign => 0, 1803 valign => 0,
1672 can_events => 1, 1804 can_events => 1,
1673 #text => ... 1805 #text => ...
1806 #hidden => "*",
1674 @_ 1807 @_
1675 ) 1808 )
1676} 1809}
1677 1810
1678sub _set_text { 1811sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1819 $self->{text} = $text;
1687 1820
1688 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1690 1824
1691 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1692 $self->update; 1828 $self->update;
1693} 1829}
1694 1830
1695sub set_text { 1831sub set_text {
1696 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1697 1833
1698 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1835 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1836}
1703 1837
1704sub get_text { 1838sub get_text {
1705 $_[0]{text} 1839 $_[0]{text}
1706} 1840}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1712 1846
1713 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1714} 1848}
1715 1849
1716sub key_down { 1850sub invoke_key_down {
1717 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1718 1852
1719 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1724 1858
1725 if ($uni == 8) { 1859 if ($uni == 8) {
1726 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1728 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1729 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1730 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1731 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1732 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1734 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1736 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1872 $self->emit ('escape');
1739 } elsif ($uni) { 1873 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1875 } else {
1742 return 0; 1876 return 0;
1743 } 1877 }
… …
1747 $self->realloc; 1881 $self->realloc;
1748 1882
1749 1 1883 1
1750} 1884}
1751 1885
1752sub focus_in { 1886sub invoke_focus_in {
1753 my ($self) = @_; 1887 my ($self) = @_;
1754 1888
1755 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1756 1890
1757 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1758} 1892}
1759 1893
1760sub button_down { 1894sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1762 1896
1763 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1898
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1900
1767 # byte-index to char-index 1901 # byte-index to char-index
1768 my $text = $self->{text}; 1902 my $text = $self->{text};
1769 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1771 1905
1772 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1773 $self->update; 1907 $self->update;
1774 1908
1775 1 1909 1
1776} 1910}
1777 1911
1778sub mouse_motion { 1912sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1915
1782 0 1916 1
1783} 1917}
1784 1918
1785sub _draw { 1919sub _draw {
1786 my ($self) = @_; 1920 my ($self) = @_;
1787 1921
… …
1814 utf8::encode $text; 1948 utf8::encode $text;
1815 1949
1816 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1817 } 1951 }
1818 1952
1819 glColor @{$self->{fg}};
1820 glBegin GL_LINES; 1953 glBegin GL_LINES;
1821 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1822 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1823 glEnd; 1956 glEnd;
1824 } 1957 }
1825} 1958}
1826 1959
1827package CFClient::UI::Entry; 1960package CFPlus::UI::Entry;
1828 1961
1829our @ISA = CFClient::UI::EntryBase::; 1962our @ISA = CFPlus::UI::EntryBase::;
1830 1963
1831use CFClient::OpenGL; 1964use CFPlus::OpenGL;
1832 1965
1833sub key_down { 1966sub invoke_key_down {
1834 my ($self, $ev) = @_; 1967 my ($self, $ev) = @_;
1835 1968
1836 my $sym = $ev->{sym}; 1969 my $sym = $ev->{sym};
1837 1970
1838 if ($sym == 13) { 1971 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1972 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1973 my $txt = $self->get_text;
1974
1841 $self->{history_pointer} = -1; 1975 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1976 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1977 $self->emit (activate => $txt);
1844 $self->update; 1978 $self->update;
1845 1979
1846 } elsif ($sym == CFClient::SDLK_UP) { 1980 } elsif ($sym == CFPlus::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1981 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1982 $self->{history_saveback} = $self->get_text;
1849 } 1983 }
1850 if (@{$self->{history} || []} > 0) { 1984 if (@{$self->{history} || []} > 0) {
1851 $self->{history_pointer}++; 1985 $self->{history_pointer}++;
… …
1853 $self->{history_pointer} = @{$self->{history} || []} - 1; 1987 $self->{history_pointer} = @{$self->{history} || []} - 1;
1854 } 1988 }
1855 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1989 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1856 } 1990 }
1857 1991
1858 } elsif ($sym == CFClient::SDLK_DOWN) { 1992 } elsif ($sym == CFPlus::SDLK_DOWN) {
1859 $self->{history_pointer}--; 1993 $self->{history_pointer}--;
1860 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1994 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861 1995
1862 if ($self->{history_pointer} >= 0) { 1996 if ($self->{history_pointer} >= 0) {
1863 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1997 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1864 } else { 1998 } else {
1865 $self->set_text ($self->{history_saveback}); 1999 $self->set_text ($self->{history_saveback});
1866 } 2000 }
1867 2001
1868 } else { 2002 } else {
1869 return $self->SUPER::key_down ($ev) 2003 return $self->SUPER::invoke_key_down ($ev)
1870 } 2004 }
1871 2005
1872 1 2006 1
1873} 2007}
1874 2008
1875############################################################################# 2009#############################################################################
1876 2010
1877package CFClient::UI::Button; 2011package CFPlus::UI::Button;
1878 2012
1879our @ISA = CFClient::UI::Label::; 2013our @ISA = CFPlus::UI::Label::;
1880 2014
1881use CFClient::OpenGL; 2015use CFPlus::OpenGL;
1882 2016
1883my @tex = 2017my @tex =
1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1885 qw(b1_button_active.png); 2019 qw(b1_button_active.png);
1886 2020
1887sub new { 2021sub new {
1888 my $class = shift; 2022 my $class = shift;
1889 2023
… …
1898 can_events => 1, 2032 can_events => 1,
1899 @_ 2033 @_
1900 ) 2034 )
1901} 2035}
1902 2036
1903sub activate { }
1904
1905sub button_up { 2037sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2038 my ($self, $ev, $x, $y) = @_;
1907 2039
1908 $self->emit ("activate") 2040 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2041 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2042 && $y >= 0 && $y < $self->{h};
… …
1913} 2045}
1914 2046
1915sub _draw { 2047sub _draw {
1916 my ($self) = @_; 2048 my ($self) = @_;
1917 2049
1918 local $self->{fg} = $self->{fg}; 2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 2051
1924 glEnable GL_TEXTURE_2D; 2052 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2054 glColor 0, 0, 0, 1;
1927 2055
… …
1932 $self->SUPER::_draw; 2060 $self->SUPER::_draw;
1933} 2061}
1934 2062
1935############################################################################# 2063#############################################################################
1936 2064
1937package CFClient::UI::CheckBox; 2065package CFPlus::UI::CheckBox;
1938 2066
1939our @ISA = CFClient::UI::DrawBG::; 2067our @ISA = CFPlus::UI::DrawBG::;
1940 2068
1941my @tex = 2069my @tex =
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2070 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2071 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944 2072
1945use CFClient::OpenGL; 2073use CFPlus::OpenGL;
1946 2074
1947sub new { 2075sub new {
1948 my $class = shift; 2076 my $class = shift;
1949 2077
1950 $class->SUPER::new ( 2078 $class->SUPER::new (
… …
1964 my ($self) = @_; 2092 my ($self) = @_;
1965 2093
1966 (6) x 2 2094 (6) x 2
1967} 2095}
1968 2096
2097sub toggle {
2098 my ($self) = @_;
2099
2100 $self->{state} = !$self->{state};
2101 $self->emit (changed => $self->{state});
2102 $self->update;
2103}
2104
1969sub button_down { 2105sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2106 my ($self, $ev, $x, $y) = @_;
1971 2107
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2108 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2109 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2110 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2111 } else {
1977 return 0 2112 return 0
1978 } 2113 }
1979 2114
1980 1 2115 1
… …
2000 glDisable GL_TEXTURE_2D; 2135 glDisable GL_TEXTURE_2D;
2001} 2136}
2002 2137
2003############################################################################# 2138#############################################################################
2004 2139
2005package CFClient::UI::Image; 2140package CFPlus::UI::Image;
2006 2141
2007our @ISA = CFClient::UI::Base::; 2142our @ISA = CFPlus::UI::Base::;
2008 2143
2009use CFClient::OpenGL; 2144use CFPlus::OpenGL;
2010use Carp qw/confess/;
2011 2145
2012our %loaded_images; 2146our %texture_cache;
2013 2147
2014sub new { 2148sub new {
2015 my $class = shift; 2149 my $class = shift;
2016 2150
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2151 my $self = $class->SUPER::new (
2152 can_events => 0,
2153 @_,
2154 );
2018 2155
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2156 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required";
2020 2158
2021 $loaded_images{$self->{image}} ||= 2159 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2023 2161
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2162 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2163
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2165
2030 $self 2166 $self
2031} 2167}
2032 2168
2169sub STORABLE_freeze {
2170 my ($self, $cloning) = @_;
2171
2172 $self->{path}
2173 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2174
2175 $self->{path}
2176}
2177
2178sub STORABLE_attach {
2179 my ($self, $cloning, $path) = @_;
2180
2181 $self->new (path => $path)
2182}
2183
2033sub size_request { 2184sub size_request {
2034 my ($self) = @_; 2185 my ($self) = @_;
2035 2186
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2187 ($self->{tex}{w}, $self->{tex}{h})
2037} 2188}
2038 2189
2039sub _draw { 2190sub _draw {
2040 my ($self) = @_; 2191 my ($self) = @_;
2041 2192
… …
2051 } 2202 }
2052 2203
2053 glEnable GL_TEXTURE_2D; 2204 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2206
2056 $tex->draw_quad_alpha (0, 0, $w, $h); 2207 $tex->draw_quad (0, 0, $w, $h);
2057 2208
2058 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
2059} 2210}
2060 2211
2061############################################################################# 2212#############################################################################
2062 2213
2214package CFPlus::UI::ImageButton;
2215
2216our @ISA = CFPlus::UI::Image::;
2217
2218use CFPlus::OpenGL;
2219
2220my %textures;
2221
2222sub new {
2223 my $class = shift;
2224
2225 my $self = $class->SUPER::new (
2226 padding_x => 4,
2227 padding_y => 4,
2228 fg => [1, 1, 1],
2229 active_fg => [0, 0, 1],
2230 can_hover => 1,
2231 align => 0,
2232 valign => 0,
2233 can_events => 1,
2234 @_
2235 );
2236}
2237
2238sub invoke_button_up {
2239 my ($self, $ev, $x, $y) = @_;
2240
2241 $self->emit ("activate")
2242 if $x >= 0 && $x < $self->{w}
2243 && $y >= 0 && $y < $self->{h};
2244
2245 1
2246}
2247
2248#############################################################################
2249
2063package CFClient::UI::VGauge; 2250package CFPlus::UI::VGauge;
2064 2251
2065our @ISA = CFClient::UI::Base::; 2252our @ISA = CFPlus::UI::Base::;
2066 2253
2067use List::Util qw(min max); 2254use List::Util qw(min max);
2068 2255
2069use CFClient::OpenGL; 2256use CFPlus::OpenGL;
2070 2257
2071my %tex = ( 2258my %tex = (
2072 food => [ 2259 food => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2260 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2261 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075 ], 2262 ],
2076 grace => [ 2263 grace => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2264 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/ 2265 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2079 ], 2266 ],
2080 hp => [ 2267 hp => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2268 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2269 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083 ], 2270 ],
2084 mana => [ 2271 mana => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2272 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/ 2273 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2087 ], 2274 ],
2088); 2275);
2089 2276
2090# eg. VGauge->new (gauge => 'food'), default gauge: food 2277# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2337 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2338 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2339
2153 my $h1 = $self->{h} * (1 - $ycut1); 2340 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2341 my $h2 = $self->{h} * (1 - $ycut2);
2342 my $h3 = $self->{h};
2343
2344 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2345
2156 glEnable GL_BLEND; 2346 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2347 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2348 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2349 glEnable GL_TEXTURE_2D;
… …
2178 2368
2179 if ($t3) { 2369 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2370 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2371 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2372 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2373 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2374 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2375 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2376 glEnd;
2187 } 2377 }
2188 2378
2189 glDisable GL_BLEND; 2379 glDisable GL_BLEND;
2190 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2191} 2381}
2192 2382
2193############################################################################# 2383#############################################################################
2194 2384
2195package CFClient::UI::Gauge; 2385package CFPlus::UI::Gauge;
2196 2386
2197our @ISA = CFClient::UI::VBox::; 2387our @ISA = CFPlus::UI::VBox::;
2198 2388
2199sub new { 2389sub new {
2200 my ($class, %arg) = @_; 2390 my ($class, %arg) = @_;
2201 2391
2202 my $self = $class->SUPER::new ( 2392 my $self = $class->SUPER::new (
… …
2204 can_hover => 1, 2394 can_hover => 1,
2205 can_events => 1, 2395 can_events => 1,
2206 %arg, 2396 %arg,
2207 ); 2397 );
2208 2398
2209 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2399 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2210 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2400 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2211 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2401 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2212 2402
2213 $self 2403 $self
2214} 2404}
2215 2405
2216sub set_fontsize { 2406sub set_fontsize {
… …
2237 $self->{value}->set_text ($val); 2427 $self->{value}->set_text ($val);
2238} 2428}
2239 2429
2240############################################################################# 2430#############################################################################
2241 2431
2242package CFClient::UI::Slider; 2432package CFPlus::UI::Slider;
2243 2433
2244use strict; 2434use strict;
2245 2435
2246use CFClient::OpenGL; 2436use CFPlus::OpenGL;
2247 2437
2248our @ISA = CFClient::UI::DrawBG::; 2438our @ISA = CFPlus::UI::DrawBG::;
2249 2439
2250my @tex = 2440my @tex =
2251 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2252 qw(s1_slider.png s1_slider_bg.png); 2442 qw(s1_slider.png s1_slider_bg.png);
2253 2443
2254sub new { 2444sub new {
2255 my $class = shift; 2445 my $class = shift;
2256 2446
… …
2277 $self->update; 2467 $self->update;
2278 2468
2279 $self 2469 $self
2280} 2470}
2281 2471
2282sub changed { }
2283
2284sub set_range { 2472sub set_range {
2285 my ($self, $range) = @_; 2473 my ($self, $range) = @_;
2286 2474
2287 ($range, $self->{range}) = ($self->{range}, $range); 2475 ($range, $self->{range}) = ($self->{range}, $range);
2288 2476
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2477 if ("@$range" ne "@{$self->{range}}") {
2478 $self->update;
2479 $self->set_value ($self->{range}[0]);
2480 }
2291} 2481}
2292 2482
2293sub set_value { 2483sub set_value {
2294 my ($self, $value) = @_; 2484 my ($self, $value) = @_;
2295 2485
… …
2306 if $unit; 2496 if $unit;
2307 2497
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2498 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2499
2310 if ($value != $old_value) { 2500 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2501 $self->emit (changed => $value);
2312 $self->update; 2502 $self->update;
2313 } 2503 }
2314} 2504}
2315 2505
2316sub size_request { 2506sub size_request {
2317 my ($self) = @_; 2507 my ($self) = @_;
2318 2508
2319 ($self->{req_w}, $self->{req_h}) 2509 ($self->{req_w}, $self->{req_h})
2320} 2510}
2321 2511
2322sub button_down { 2512sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2513 my ($self, $ev, $x, $y) = @_;
2324 2514
2325 $self->SUPER::button_down ($ev, $x, $y); 2515 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2516
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2518
2329 $self->mouse_motion ($ev, $x, $y) 2519 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2520}
2331 2521
2332sub mouse_motion { 2522sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2523 my ($self, $ev, $x, $y) = @_;
2334 2524
2335 if ($GRAB == $self) { 2525 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2526 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2527
… …
2343 } else { 2533 } else {
2344 return 0; 2534 return 0;
2345 } 2535 }
2346 2536
2347 1 2537 1
2538}
2539
2540sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_;
2542
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2546
2547 ! ! $delta
2348} 2548}
2349 2549
2350sub update { 2550sub update {
2351 my ($self) = @_; 2551 my ($self) = @_;
2352 2552
… …
2401 glDisable GL_TEXTURE_2D; 2601 glDisable GL_TEXTURE_2D;
2402} 2602}
2403 2603
2404############################################################################# 2604#############################################################################
2405 2605
2406package CFClient::UI::ValSlider; 2606package CFPlus::UI::ValSlider;
2407 2607
2408our @ISA = CFClient::UI::HBox::; 2608our @ISA = CFPlus::UI::HBox::;
2409 2609
2410sub new { 2610sub new {
2411 my ($class, %arg) = @_; 2611 my ($class, %arg) = @_;
2412 2612
2413 my $range = delete $arg{range}; 2613 my $range = delete $arg{range};
2414 2614
2415 my $self = $class->SUPER::new ( 2615 my $self = $class->SUPER::new (
2416 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2616 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2417 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2617 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2418 to_value => sub { shift }, 2618 to_value => sub { shift },
2419 from_value => sub { shift }, 2619 from_value => sub { shift },
2420 %arg, 2620 %arg,
2421 ); 2621 );
2422 2622
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2642sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2643sub set_value { shift->{slider}->set_value (@_) }
2444 2644
2445############################################################################# 2645#############################################################################
2446 2646
2447package CFClient::UI::TextView; 2647package CFPlus::UI::TextScroller;
2448 2648
2449our @ISA = CFClient::UI::HBox::; 2649our @ISA = CFPlus::UI::HBox::;
2450 2650
2451use CFClient::OpenGL; 2651use CFPlus::OpenGL;
2452 2652
2453sub new { 2653sub new {
2454 my $class = shift; 2654 my $class = shift;
2455 2655
2456 my $self = $class->SUPER::new ( 2656 my $self = $class->SUPER::new (
2457 fontsize => 1, 2657 fontsize => 1,
2458 can_events => 0, 2658 can_events => 1,
2659 indent => 0,
2459 #font => default_font 2660 #font => default_font
2460 @_, 2661 @_,
2461 2662
2462 layout => (new CFClient::Layout 1), 2663 layout => (new CFPlus::Layout),
2463 par => [], 2664 par => [],
2464 height => 0, 2665 height => 0,
2465 children => [ 2666 children => [
2466 (new CFClient::UI::Empty expand => 1), 2667 (new CFPlus::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 2668 (new CFPlus::UI::Slider vertical => 1),
2468 ], 2669 ],
2469 ); 2670 );
2470 2671
2471 $self->{children}[1]->connect (changed => sub { $self->update }); 2672 $self->{children}[1]->connect (changed => sub { $self->update });
2472 2673
… …
2478 2679
2479 $self->{fontsize} = $fontsize; 2680 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2681 $self->reflow;
2481} 2682}
2482 2683
2684sub size_request {
2685 my ($self) = @_;
2686
2687 my ($empty, $slider) = @{ $self->{children} };
2688
2689 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request
2691}
2692
2483sub size_allocate { 2693sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2694 my ($self, $w, $h) = @_;
2485 2695
2486 $self->SUPER::size_allocate ($w, $h); 2696 my ($empty, $slider, @other) = @{ $self->{children} };
2697 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2698
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2699 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2701 $self->{layout}->set_width ($empty->{w});
2702 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2703
2492 $self->reflow; 2704 $self->reflow;
2493}
2494 2705
2495sub text_size { 2706 local $self->{children} = [$empty, $slider];
2707 $self->SUPER::invoke_size_allocate ($w, $h)
2708}
2709
2710sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 2711 my ($self, $ev) = @_;
2712
2713 return 0 unless $ev->{dy}; # only vertical movements
2714
2715 $self->{children}[1]->emit (mouse_wheel => $ev);
2716
2717 1
2718}
2719
2720sub get_layout {
2721 my ($self, $para) = @_;
2497 2722
2498 my $layout = $self->{layout}; 2723 my $layout = $self->{layout};
2499 2724
2725 $layout->set_font ($self->{font}) if $self->{font};
2726 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2727 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2728 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2729 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2730 $layout->set_markup ($para->{markup});
2731
2732 $layout->set_shapes (
2733 map
2734 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2735 @{$para->{widget}}
2503 2736 );
2737
2504 $layout->size 2738 $layout
2505} 2739}
2506 2740
2507sub reflow { 2741sub reflow {
2508 my ($self) = @_; 2742 my ($self) = @_;
2509 2743
… …
2518 $self->{children}[1]->set_value ($offset); 2752 $self->{children}[1]->set_value ($offset);
2519} 2753}
2520 2754
2521sub clear { 2755sub clear {
2522 my ($self) = @_; 2756 my ($self) = @_;
2757
2758 my (undef, undef, @other) = @{ $self->{children} };
2759 $self->remove ($_) for @other;
2523 2760
2524 $self->{par} = []; 2761 $self->{par} = [];
2525 $self->{height} = 0; 2762 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2763 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2764}
2528 2765
2529sub add_paragraph { 2766sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2767 my $self = shift;
2531 2768
2532 for my $line (split /\n/, $text) { 2769 for my $para (@_) {
2533 my ($w, $h) = $self->text_size ($line); 2770 $para = {
2534 $self->{height} += $h; 2771 fg => [1, 1, 1, 1],
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2772 indent => 0,
2536 } 2773 markup => "",
2774 widget => [],
2775 ref $para ? %$para : (markup => $para),
2776 w => 1e10,
2777 wrapped => 1,
2778 };
2537 2779
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para;
2782 }
2783
2784 $self->{need_reflow}++;
2785 $self->update;
2786}
2787
2788sub scroll_to_bottom {
2789 my ($self) = @_;
2790
2791 $self->{scroll_to_bottom} = 1;
2792 $self->update;
2539} 2793}
2540 2794
2541sub update { 2795sub update {
2542 my ($self) = @_; 2796 my ($self) = @_;
2543 2797
… …
2545 2799
2546 return unless $self->{h} > 0; 2800 return unless $self->{h} > 0;
2547 2801
2548 delete $self->{texture}; 2802 delete $self->{texture};
2549 2803
2550 $ROOT->on_post_alloc ($self, sub { 2804 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2806
2553 if (delete $self->{need_reflow}) { 2807 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2808 my $height = 0;
2555 2809
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2812 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2813 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2814
2566 $_->[1] = $h; 2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2567 } 2818 }
2568 2819
2569 $height += $_->[1]; 2820 $height += $para->{h};
2570 } 2821 }
2571 2822
2572 $self->{height} = $height; 2823 $self->{height} = $height;
2573 2824
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2826
2576 delete $self->{texture}; 2827 delete $self->{texture};
2577 } 2828 }
2578 2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2835 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2836 glClear GL_COLOR_BUFFER_BIT;
2582 2837
2583 my $top = int $self->{children}[1]{range}[0]; 2838 my $top = int $self->{children}[1]{range}[0];
2584 2839
2585 my $y0 = $top; 2840 my $y0 = $top;
2586 my $y1 = $top + $H; 2841 my $y1 = $top + $H;
2587 2842
2588 my $y = 0; 2843 my $y = 0;
2589 2844
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}}) { 2845 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2846 my $h = $para->{h};
2600 2847
2601 if ($y0 < $y + $h && $y < $y1) { 2848 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 2849
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2850 my $layout = $self->get_layout ($para);
2607 2851
2608 glRasterPos $par->[3], $y - $y0; 2852 $layout->render ($para->{indent}, $y - $y0);
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2853
2854 if (my @w = @{ $para->{widget} }) {
2855 my @s = $layout->get_shapes;
2856
2857 for (@w) {
2858 my ($dx, $dy) = splice @s, 0, 2, ();
2859
2860 $_->{x} = $dx + $para->{indent};
2861 $_->{y} = $dy + $y - $y0;
2862
2863 $_->draw;
2864 }
2865 }
2610 } 2866 }
2611 2867
2612 $y += $h; 2868 $y += $h;
2613 } 2869 }
2614
2615 glDisable GL_BLEND;
2616 }; 2870 };
2617 }); 2871 });
2618} 2872}
2619 2873
2874sub reconfigure {
2875 my ($self) = @_;
2876
2877 $self->SUPER::reconfigure;
2878
2879 $_->{w} = 1e10 for @{ $self->{par} };
2880 $self->reflow;
2881}
2882
2620sub _draw { 2883sub _draw {
2621 my ($self) = @_; 2884 my ($self) = @_;
2622 2885
2623 glEnable GL_TEXTURE_2D; 2886 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2888 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2889 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2890 glDisable GL_TEXTURE_2D;
2628 2891
2629 $self->{children}[1]->draw; 2892 $self->{children}[1]->draw;
2630
2631} 2893}
2632 2894
2633############################################################################# 2895#############################################################################
2634 2896
2635package CFClient::UI::Animator; 2897package CFPlus::UI::Animator;
2636 2898
2637use CFClient::OpenGL; 2899use CFPlus::OpenGL;
2638 2900
2639our @ISA = CFClient::UI::Bin::; 2901our @ISA = CFPlus::UI::Bin::;
2640 2902
2641sub moveto { 2903sub moveto {
2642 my ($self, $x, $y) = @_; 2904 my ($self, $x, $y) = @_;
2643 2905
2644 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2906 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2672 glPopMatrix; 2934 glPopMatrix;
2673} 2935}
2674 2936
2675############################################################################# 2937#############################################################################
2676 2938
2677package CFClient::UI::Flopper; 2939package CFPlus::UI::Flopper;
2678 2940
2679our @ISA = CFClient::UI::Button::; 2941our @ISA = CFPlus::UI::Button::;
2680 2942
2681sub new { 2943sub new {
2682 my $class = shift; 2944 my $class = shift;
2683 2945
2684 my $self = $class->SUPER::new ( 2946 my $self = $class->SUPER::new (
… …
2696 $self->{other}->toggle_visibility; 2958 $self->{other}->toggle_visibility;
2697} 2959}
2698 2960
2699############################################################################# 2961#############################################################################
2700 2962
2701package CFClient::UI::Tooltip; 2963package CFPlus::UI::Tooltip;
2702 2964
2703our @ISA = CFClient::UI::Bin::; 2965our @ISA = CFPlus::UI::Bin::;
2704 2966
2705use CFClient::OpenGL; 2967use CFPlus::OpenGL;
2706 2968
2707sub new { 2969sub new {
2708 my $class = shift; 2970 my $class = shift;
2709 2971
2710 $class->SUPER::new ( 2972 $class->SUPER::new (
… …
2713 ) 2975 )
2714} 2976}
2715 2977
2716sub set_tooltip_from { 2978sub set_tooltip_from {
2717 my ($self, $widget) = @_; 2979 my ($self, $widget) = @_;
2980
2981 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2982 if $widget->{tooltip} =~ /^#(.*)$/;
2718 2983
2719 my $tooltip = $widget->{tooltip}; 2984 my $tooltip = $widget->{tooltip};
2720 2985
2721 if ($ENV{CFPLUS_DEBUG} & 2) { 2986 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2987 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2988 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2989 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2990 . "visible $widget->{visible}";
2726 } 2991 }
2727 2992
2993 $tooltip =~ s/^\n+//;
2994 $tooltip =~ s/\n+$//;
2995
2728 $self->add (new CFClient::UI::Label 2996 $self->add (new CFPlus::UI::Label
2729 markup => $tooltip, 2997 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2998 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2999 fontsize => 0.8,
2732 fg => [0, 0, 0, 1], 3000 style => 1, # FLAG_INVERSE
2733 ellipsise => 0, 3001 ellipsise => 0,
2734 font => ($widget->{tooltip_font} || $::FONT_PROP), 3002 font => ($widget->{tooltip_font} || $::FONT_PROP),
2735 ); 3003 );
2736} 3004}
2737 3005
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3009 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 3010
2743 ($w + 4, $h + 4) 3011 ($w + 4, $h + 4)
2744} 3012}
2745 3013
2746sub size_allocate { 3014sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 3015 my ($self, $w, $h) = @_;
2748 3016
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 3017 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 3018}
2751 3019
2752sub visibility_change { 3020sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 3021 my ($self, $visible) = @_;
2754 3022
2755 return unless $visible; 3023 return unless $visible;
2756 3024
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 3025 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner} 3026 my $widget = $self->{owner}
2759 or return; 3027 or return;
2760 3028
3029 if ($widget->{visible}) {
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3030 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 3031
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3032 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 3033 if $x + $self->{w} > $self->{root}{w};
2765 3034
2766 $self->move_abs ($x, $y); 3035 $self->move_abs ($x, $y);
3036 } else {
3037 $self->hide;
3038 }
2767 }); 3039 });
2768} 3040}
2769 3041
2770sub _draw { 3042sub _draw {
2771 my ($self) = @_; 3043 my ($self) = @_;
… …
2795 $self->SUPER::_draw; 3067 $self->SUPER::_draw;
2796} 3068}
2797 3069
2798############################################################################# 3070#############################################################################
2799 3071
2800package CFClient::UI::Face; 3072package CFPlus::UI::Face;
2801 3073
2802our @ISA = CFClient::UI::Base::; 3074our @ISA = CFPlus::UI::DrawBG::;
2803 3075
2804use CFClient::OpenGL; 3076use CFPlus::OpenGL;
2805 3077
2806sub new { 3078sub new {
2807 my $class = shift; 3079 my $class = shift;
2808 3080
2809 my $self = $class->SUPER::new ( 3081 my $self = $class->SUPER::new (
… …
2844sub _draw { 3116sub _draw {
2845 my ($self) = @_; 3117 my ($self) = @_;
2846 3118
2847 return unless $::CONN; 3119 return unless $::CONN;
2848 3120
3121 $self->SUPER::_draw;
3122
2849 my $face; 3123 my $face;
2850 3124
2851 if ($self->{frame}) { 3125 if ($self->{frame}) {
2852 my $anim = $::CONN->{anim}[$self->{anim}]; 3126 my $anim = $::CONN->{anim}[$self->{anim}];
2853 3127
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3133
2860 if ($tex) { 3134 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3135 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3137 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3138 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3139 glDisable GL_TEXTURE_2D;
2866 } 3140 }
2867} 3141}
2868 3142
2869sub DESTROY { 3143sub destroy {
2870 my ($self) = @_; 3144 my ($self) = @_;
2871 3145
2872 $self->{timer}->cancel 3146 $self->{timer}->cancel
2873 if $self->{timer}; 3147 if $self->{timer};
2874 3148
2875 $self->SUPER::DESTROY; 3149 $self->SUPER::destroy;
2876} 3150}
2877 3151
2878############################################################################# 3152#############################################################################
2879 3153
2880package CFClient::UI::Buttonbar; 3154package CFPlus::UI::Buttonbar;
2881 3155
2882our @ISA = CFClient::UI::HBox::; 3156our @ISA = CFPlus::UI::HBox::;
2883 3157
2884# TODO: should actualyl wrap buttons and other goodies. 3158# TODO: should actualyl wrap buttons and other goodies.
2885 3159
2886############################################################################# 3160#############################################################################
2887 3161
2888package CFClient::UI::Menu; 3162package CFPlus::UI::Menu;
2889 3163
2890our @ISA = CFClient::UI::FancyFrame::; 3164our @ISA = CFPlus::UI::FancyFrame::;
2891 3165
2892use CFClient::OpenGL; 3166use CFPlus::OpenGL;
2893 3167
2894sub new { 3168sub new {
2895 my $class = shift; 3169 my $class = shift;
2896 3170
2897 my $self = $class->SUPER::new ( 3171 my $self = $class->SUPER::new (
2898 items => [], 3172 items => [],
2899 z => 100, 3173 z => 100,
2900 @_, 3174 @_,
2901 ); 3175 );
2902 3176
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3177 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2904 3178
2905 for my $item (@{ $self->{items} }) { 3179 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3180 my ($widget, $cb, $tooltip) = @$item;
2907 3181
2908 # handle various types of items, only text for now 3182 # handle various types of items, only text for now
2909 if (!ref $widget) { 3183 if (!ref $widget) {
3184 if ($widget =~ /\t/) {
3185 my ($left, $right) = split /\t/, $widget, 2;
3186
2910 $widget = new CFClient::UI::Label 3187 $widget = new CFPlus::UI::HBox
2911 can_hover => 1, 3188 can_hover => 1,
2912 can_events => 1, 3189 can_events => 1,
3190 tooltip => $tooltip,
3191 children => [
3192 (new CFPlus::UI::Label markup => $left, expand => 1),
3193 (new CFPlus::UI::Label markup => $right, align => +1),
3194 ],
3195 ;
3196
3197 } else {
3198 $widget = new CFPlus::UI::Label
3199 can_hover => 1,
3200 can_events => 1,
2913 text => $widget; 3201 markup => $widget,
3202 tooltip => $tooltip;
3203 }
2914 } 3204 }
2915 3205
2916 $self->{item}{$widget} = $item; 3206 $self->{item}{$widget} = $item;
2917 3207
2918 $self->{vbox}->add ($widget); 3208 $self->{vbox}->add ($widget);
… …
2923 3213
2924# popup given the event (must be a mouse button down event currently) 3214# popup given the event (must be a mouse button down event currently)
2925sub popup { 3215sub popup {
2926 my ($self, $ev) = @_; 3216 my ($self, $ev) = @_;
2927 3217
2928 $self->_emit ("popdown"); 3218 $self->emit ("popdown");
2929 3219
2930 # maybe save $GRAB? must be careful about events... 3220 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3221 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3222 $self->{button} = $ev->{button};
2933 3223
2934 $self->show; 3224 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3225 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3226}
2937 3227
2938sub mouse_motion { 3228sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2940 3230
2941 # TODO: should use vbox->find_widget or so 3231 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3232 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3233 $self->{hover} = $self->{item}{$HOVER};
2944 3234
2945 0 3235 0
2946} 3236}
2947 3237
2948sub button_up { 3238sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3239 my ($self, $ev, $x, $y) = @_;
2950 3240
2951 if ($ev->{button} == $self->{button}) { 3241 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3242 undef $GRAB;
2953 $self->hide; 3243 $self->hide;
2954 3244
2955 $self->_emit ("popdown"); 3245 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3246 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3247 } else {
2958 return 0 3248 return 0
2959 } 3249 }
2960 3250
2961 1 3251 1
2962} 3252}
2963 3253
2964############################################################################# 3254#############################################################################
2965 3255
2966package CFClient::UI::Multiplexer; 3256package CFPlus::UI::Multiplexer;
2967 3257
2968our @ISA = CFClient::UI::Container::; 3258our @ISA = CFPlus::UI::Container::;
2969 3259
2970sub new { 3260sub new {
2971 my $class = shift; 3261 my $class = shift;
2972 3262
2973 my $self = $class->SUPER::new ( 3263 my $self = $class->SUPER::new (
… …
2987 3277
2988 $self->{current} = $self->{children}[0] 3278 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3279 if @{ $self->{children} };
2990} 3280}
2991 3281
3282sub get_current_page {
3283 my ($self) = @_;
3284
3285 $self->{current}
3286}
3287
2992sub set_current_page { 3288sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3289 my ($self, $page_or_widget) = @_;
2994 3290
2995 my $widget = ref $page_or_widget 3291 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3292 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3293 : $self->{children}[$page_or_widget];
2998 3294
2999 $self->{current} = $widget; 3295 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3296 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3297
3002 $self->_emit (page_changed => $self->{current}); 3298 $self->emit (page_changed => $self->{current});
3003 3299
3004 $self->realloc; 3300 $self->realloc;
3005} 3301}
3006 3302
3007sub visible_children { 3303sub visible_children {
… …
3012 my ($self) = @_; 3308 my ($self) = @_;
3013 3309
3014 $self->{current}->size_request 3310 $self->{current}->size_request
3015} 3311}
3016 3312
3017sub size_allocate { 3313sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3314 my ($self, $w, $h) = @_;
3019 3315
3020 $self->{current}->configure (0, 0, $w, $h); 3316 $self->{current}->configure (0, 0, $w, $h);
3317
3318 1
3021} 3319}
3022 3320
3023sub _draw { 3321sub _draw {
3024 my ($self) = @_; 3322 my ($self) = @_;
3025 3323
3026 $self->{current}->draw; 3324 $self->{current}->draw;
3027} 3325}
3028 3326
3029############################################################################# 3327#############################################################################
3030 3328
3031package CFClient::UI::Notebook; 3329package CFPlus::UI::Notebook;
3032 3330
3033our @ISA = CFClient::UI::VBox::; 3331our @ISA = CFPlus::UI::VBox::;
3034 3332
3035sub new { 3333sub new {
3036 my $class = shift; 3334 my $class = shift;
3037 3335
3038 my $self = $class->SUPER::new ( 3336 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar), 3337 buttonbar => (new CFPlus::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3338 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self 3339 # filter => # will be put between multiplexer and $self
3042 @_, 3340 @_,
3043 ); 3341 );
3044 3342
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3343 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3051sub add { 3349sub add {
3052 my ($self, $title, $widget, $tooltip) = @_; 3350 my ($self, $title, $widget, $tooltip) = @_;
3053 3351
3054 Scalar::Util::weaken $self; 3352 Scalar::Util::weaken $self;
3055 3353
3056 $self->{buttonbar}->add (new CFClient::UI::Button 3354 $self->{buttonbar}->add (new CFPlus::UI::Button
3057 markup => $title, 3355 markup => $title,
3058 tooltip => $tooltip, 3356 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) }, 3357 on_activate => sub { $self->set_current_page ($widget) },
3060 ); 3358 );
3061 3359
3062 $self->{multiplexer}->add ($widget); 3360 $self->{multiplexer}->add ($widget);
3063} 3361}
3064 3362
3363sub get_current_page {
3364 my ($self) = @_;
3365
3366 $self->{multiplexer}->get_current_page
3367}
3368
3065sub set_current_page { 3369sub set_current_page {
3066 my ($self, $page) = @_; 3370 my ($self, $page) = @_;
3067 3371
3068 $self->{multiplexer}->set_current_page ($page); 3372 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3373 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3374}
3071 3375
3072############################################################################# 3376#############################################################################
3073 3377
3074package CFClient::UI::Statusbox; 3378package CFPlus::UI::Selector;
3075 3379
3380use utf8;
3381
3076our @ISA = CFClient::UI::VBox::; 3382our @ISA = CFPlus::UI::Button::;
3077 3383
3078sub new { 3384sub new {
3079 my $class = shift; 3385 my $class = shift;
3080 3386
3081 $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
3388 options => [], # [value, title, longdesc], ...
3389 value => undef,
3390 @_,
3391 );
3392
3393 $self->_set_value ($self->{value});
3394
3395 $self
3396}
3397
3398sub invoke_button_down {
3399 my ($self, $ev) = @_;
3400
3401 my @menu_items;
3402
3403 for (@{ $self->{options} }) {
3404 my ($value, $title, $tooltip) = @$_;
3405
3406 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3407 }
3408
3409 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3410}
3411
3412sub _set_value {
3413 my ($self, $value) = @_;
3414
3415 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3416 or return;
3417
3418 $self->{value} = $item->[0];
3419 $self->set_markup ("$item->[1] ⇓");
3420 $self->set_tooltip ($item->[2]);
3421}
3422
3423sub set_value {
3424 my ($self, $value) = @_;
3425
3426 return unless $self->{value} ne $value;
3427
3428 $self->_set_value ($value);
3429 $self->emit (changed => $value);
3430}
3431
3432#############################################################################
3433
3434package CFPlus::UI::Statusbox;
3435
3436our @ISA = CFPlus::UI::VBox::;
3437
3438sub new {
3439 my $class = shift;
3440
3441 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3442 fontsize => 0.8,
3083 @_, 3443 @_,
3084 ) 3444 );
3445
3446 Scalar::Util::weaken (my $this = $self);
3447
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3449
3450 $self
3085} 3451}
3086 3452
3087sub reorder { 3453sub reorder {
3088 my ($self) = @_; 3454 my ($self) = @_;
3089 my $NOW = time; 3455 my $NOW = Time::HiRes::time;
3456
3457 # freeze display when hovering over any label
3458 return if $CFPlus::UI::TOOLTIP->{owner}
3459 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3460 values %{ $self->{item} };
3090 3461
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3462 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3463 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3464 }
3094 3465
… …
3097 my @items = sort { 3468 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3469 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3470 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3471 } values %{ $self->{item} };
3101 3472
3473 $self->{timer}->interval (1);
3474
3102 my $count = 10 + 1; 3475 my $count = 10 + 1;
3103 for my $item (@items) { 3476 for my $item (@items) {
3104 last unless --$count; 3477 last unless --$count;
3105 3478
3106 push @widgets, $item->{label} ||= do { 3479 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3480 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3481 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3482 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3483 : $item->{text};
3111 3484
3112 for ($short) { 3485 for ($short) {
3113 s/^\s+//; 3486 s/^\s+//;
3114 s/\s+/ /g; 3487 s/\s+/ /g;
3115 } 3488 }
3116 3489
3117 new CFClient::UI::Label 3490 new CFPlus::UI::Label
3118 markup => $short, 3491 markup => $short,
3119 tooltip => $item->{tooltip}, 3492 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3493 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3494 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3495 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3496 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3497 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3498 can_events => 1,
3126 can_hover => 1 3499 can_hover => 1
3127 }; 3500 };
3501
3502 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3503 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3504 $label->update;
3505 $label->set_max_size (undef, $label->{req_h} * $diff)
3506 if $diff < 1;
3507 $self->{timer}->interval (1/30);
3508 } else {
3509 $label->{fg}[3] = $item->{fg}[3] || 1;
3510 }
3511
3512 push @widgets, $label;
3128 } 3513 }
3129 3514
3130 $self->clear; 3515 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3516 $self->SUPER::add (reverse @widgets);
3132} 3517}
… …
3137 $text =~ s/^\s+//; 3522 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3523 $text =~ s/\s+$//;
3139 3524
3140 return unless $text; 3525 return unless $text;
3141 3526
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3527 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3528
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3529 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3530
3146 if (my $item = $self->{item}{$group}) { 3531 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3532 if ($item->{text} eq $text) {
3148 $item->{count}++; 3533 $item->{count}++;
3149 } else { 3534 } else {
3150 $item->{count} = 1; 3535 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3536 $item->{text} = $item->{tooltip} = $text;
3152 } 3537 }
3153 $item->{id} = ++$self->{id}; 3538 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3539 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3540 delete $item->{label};
3156 } else { 3541 } else {
3157 $self->{item}{$group} = { 3542 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3543 id => ++$self->{id},
… …
3164 count => 1, 3549 count => 1,
3165 %arg, 3550 %arg,
3166 }; 3551 };
3167 } 3552 }
3168 3553
3554 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3555 $self->reorder;
3556 });
3170} 3557}
3171 3558
3172sub reconfigure { 3559sub reconfigure {
3173 my ($self) = @_; 3560 my ($self) = @_;
3174 3561
… …
3177 3564
3178 $self->reorder; 3565 $self->reorder;
3179 $self->SUPER::reconfigure; 3566 $self->SUPER::reconfigure;
3180} 3567}
3181 3568
3569sub destroy {
3570 my ($self) = @_;
3571
3572 $self->{timer}->cancel;
3573
3574 $self->SUPER::destroy;
3575}
3576
3182############################################################################# 3577#############################################################################
3183 3578
3184package CFClient::UI::Inventory; 3579package CFPlus::UI::Inventory;
3185 3580
3186our @ISA = CFClient::UI::ScrolledWindow::; 3581our @ISA = CFPlus::UI::Table::;
3187 3582
3188sub new { 3583sub new {
3189 my $class = shift; 3584 my $class = shift;
3190 3585
3191 my $self = $class->SUPER::new ( 3586 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3587 col_expand => [0, 1, 0],
3588 items => [],
3193 @_, 3589 @_,
3194 ); 3590 );
3195 3591
3592 $self->set_sort_order (undef);
3593
3196 $self 3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3197} 3630}
3198 3631
3199sub set_items { 3632sub set_items {
3200 my ($self, $items) = @_; 3633 my ($self, $items) = @_;
3201 3634
3202 $self->{child}->clear; 3635 $self->{items} = [$items ? values %$items : ()];
3203 return unless $items; 3636 $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} 3637}
3223 3638
3224############################################################################# 3639#############################################################################
3225 3640
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; 3641package CFPlus::UI::SpellList;
3424 3642
3425our @ISA = CFClient::UI::Table::; 3643our @ISA = CFPlus::UI::Table::;
3426 3644
3427sub new { 3645sub new {
3428 my $class = shift; 3646 my $class = shift;
3429 3647
3430 my $self = $class->SUPER::new ( 3648 my $self = $class->SUPER::new (
… …
3432 commands => [], 3650 commands => [],
3433 @_, 3651 @_,
3434 ) 3652 )
3435} 3653}
3436 3654
3437# XXX: Do sorting? Argl... 3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3438sub add_spell { 3740sub add_spell {
3439 my ($self, $spell) = @_; 3741 my ($self, $spell) = @_;
3742
3440 $self->{spells}->{$spell->{name}} = $spell; 3743 $self->{spell}->{$spell->{name}} = $spell;
3441 3744 $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} 3745}
3470 3746
3471sub remove_spell { 3747sub remove_spell {
3472 my ($self, $spell) = @_; 3748 my ($self, $spell) = @_;
3749
3473 delete $self->{spells}->{$spell->{name}}; 3750 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3751 $self->rebuild_spell_list;
3475} 3752}
3476 3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3477############################################################################# 3761#############################################################################
3478 3762
3479package CFClient::UI::Root; 3763package CFPlus::UI::Root;
3480 3764
3481our @ISA = CFClient::UI::Container::; 3765our @ISA = CFPlus::UI::Container::;
3482 3766
3767use List::Util qw(min max);
3768
3483use CFClient::OpenGL; 3769use CFPlus::OpenGL;
3484 3770
3485sub new { 3771sub new {
3486 my $class = shift; 3772 my $class = shift;
3487 3773
3488 my $self = $class->SUPER::new ( 3774 my $self = $class->SUPER::new (
… …
3513 $coord = $max - $size if $coord > $max - $size; 3799 $coord = $max - $size if $coord > $max - $size;
3514 3800
3515 int $coord + 0.5 3801 int $coord + 0.5
3516} 3802}
3517 3803
3518sub size_allocate { 3804sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3805 my ($self, $w, $h) = @_;
3520 3806
3521 for my $child ($self->children) { 3807 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3808 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3809
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3813 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3814 $Y = _to_pixel $Y, $H, $self->{h};
3529 3815
3530 $child->configure ($X, $Y, $W, $H); 3816 $child->configure ($X, $Y, $W, $H);
3531 } 3817 }
3818
3819 1
3532} 3820}
3533 3821
3534sub coord2local { 3822sub coord2local {
3535 my ($self, $x, $y) = @_; 3823 my ($self, $x, $y) = @_;
3536 3824
… …
3621 3909
3622 delete $queue{$widget+0}; 3910 delete $queue{$widget+0};
3623 3911
3624 my ($w, $h) = $widget->size_request; 3912 my ($w, $h) = $widget->size_request;
3625 3913
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3914 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3915 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3916
3917 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3918 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3919
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3920 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3921 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3922
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3923 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3658 3949
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3950 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 3951
3661 $w = 0 if $w < 0; 3952 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 3953 $h = 0 if $h < 0;
3954
3955 $w = max $widget->{min_w}, $w;
3956 $h = max $widget->{min_h}, $h;
3957
3958# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3959# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3960
3961 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3962 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3663 3963
3664 $w = int $w + 0.5; 3964 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 3965 $h = int $h + 0.5;
3666 3966
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3967 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3991 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692 glMatrixMode GL_MODELVIEW; 3992 glMatrixMode GL_MODELVIEW;
3693 glLoadIdentity; 3993 glLoadIdentity;
3694 3994
3695 { 3995 {
3696 package CFClient::UI::Base; 3996 package CFPlus::UI::Base;
3697 3997
3698 ($draw_x, $draw_y, $draw_w, $draw_h) = 3998 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h}); 3999 (0, 0, $self->{w}, $self->{h});
3700 } 4000 }
3701 4001
3702 $self->_draw; 4002 $self->_draw;
3703} 4003}
3704 4004
3705############################################################################# 4005#############################################################################
3706 4006
3707package CFClient::UI; 4007package CFPlus::UI;
3708 4008
3709$ROOT = new CFClient::UI::Root; 4009$ROOT = new CFPlus::UI::Root;
3710$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4010$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3711 4011
37121 40121
3713 4013

Diff Legend

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