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

Diff Legend

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