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

Diff Legend

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