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.363 by root, Sun Dec 10 00:06:49 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
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 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
94 } 110 }
95 111
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
97 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
99 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $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; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
192 reconfigure_widgets; 207 reconfigure_widgets;
193} 208}
194 209
195############################################################################# 210#############################################################################
196 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
197package CFClient::UI::Base; 220package CFPlus::UI::Base;
198 221
199use strict; 222use strict;
200 223
201use CFClient::OpenGL; 224use CFPlus::OpenGL;
202 225
203sub new { 226sub new {
204 my $class = shift; 227 my $class = shift;
205 228
206 my $self = bless { 229 my $self = bless {
… …
211 h => undef, 234 h => undef,
212 can_events => 1, 235 can_events => 1,
213 @_ 236 @_
214 }, $class; 237 }, $class;
215 238
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 240
218 for (keys %$self) { 241 for (keys %$self) {
219 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
221 } 244 }
222 } 245 }
223 246
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $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}; 249 $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}; 250 $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}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 252
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 255
233 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
238 261
239sub destroy { 262sub destroy {
240 my ($self) = @_; 263 my ($self) = @_;
241 264
242 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
243 %$self = (); 267 %$self = ();
244} 268}
245 269
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
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
513}
514
515my %has_coords = (
516 button_down => 1,
517 button_up => 1,
518 mouse_motion => 1,
519 mouse_wheel => 1,
520);
521
522sub emit {
523 my ($self, $signal, @args) = @_;
524
525 # I do not really like this solution, but I do not like duplication
526 # and needlessly verbose code, either.
527 my @append
528 = $has_coords{$signal}
529 ? $args[0]->xy ($self)
530 : ();
531
532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
533
534 for my $cb (
535 @{$self->{signal_cb}{$signal} || []}, # before
536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args)
462} 543}
463 544
464sub find_widget { 545sub find_widget {
465 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
466 547
… …
474} 555}
475 556
476sub set_parent { 557sub set_parent {
477 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
478 559
479 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 561 $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} 562}
505 563
506sub realloc { 564sub realloc {
507 my ($self) = @_; 565 my ($self) = @_;
508 566
… …
541 return unless $self->{h} && $self->{w}; 599 return unless $self->{h} && $self->{w};
542 600
543 # update screen rectangle 601 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 602 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 603 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 604
549 # skip widgets that are entirely outside the drawing area 605 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 608
… …
575 glVertex $self->{w} - 1, 0; 631 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 632 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 633 glVertex 0 , $self->{h} - 1;
578 glEnd; 634 glEnd;
579 glPopMatrix; 635 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 637 }
582 638
583 $self->_draw; 639 $self->_draw;
584 glPopMatrix; 640 glPopMatrix;
585} 641}
… …
588 my ($self) = @_; 644 my ($self) = @_;
589 645
590 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
591} 647}
592 648
649my $cntx;#d#
593sub DESTROY { 650sub DESTROY {
594 my ($self) = @_; 651 my ($self) = @_;
595 652
653 return if CFPlus::in_destruct;
654
655 eval { $self->destroy };
656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
596 delete $WIDGET{$self+0}; 658 delete $WIDGET{$self+0};
597 #$self->deactivate;
598} 659}
599 660
600############################################################################# 661#############################################################################
601 662
602package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
603 664
604our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
605 666
606use strict; 667use strict;
607use CFClient::OpenGL; 668use CFPlus::OpenGL;
608 669
609sub new { 670sub new {
610 my $class = shift; 671 my $class = shift;
611 672
612 # range [value, low, high, page] 673 # range [value, low, high, page]
… …
643 } 704 }
644} 705}
645 706
646############################################################################# 707#############################################################################
647 708
648package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
649 710
650our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
651 712
652sub new { 713sub new {
653 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
655} 716}
… …
662 723
663sub draw { } 724sub draw { }
664 725
665############################################################################# 726#############################################################################
666 727
667package CFClient::UI::Container; 728package CFPlus::UI::Container;
668 729
669our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
670 731
671sub new { 732sub new {
672 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
673 734
674 my $children = delete $arg{children}; 735 my $children = delete $arg{children};
… …
683 if $children; 744 if $children;
684 745
685 $self 746 $self
686} 747}
687 748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
688sub add { 757sub add {
689 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
690 759
691 $_->set_parent ($self) 760 $_->set_parent ($self)
692 for @widgets; 761 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
753} 822}
754 823
755############################################################################# 824#############################################################################
756 825
757package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
758 827
759our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
760 829
761sub new { 830sub new {
762 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
763 832
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 834
766 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
767} 836}
768 837
769sub add { 838sub add {
770 my ($self, $child) = @_; 839 my ($self, $child) = @_;
771 840
772 $self->{children} = []; 841 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 842 $self->SUPER::add ($child);
775} 843}
776 844
777sub remove { 845sub remove {
778 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
779 847
780 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
781 849
782 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
783 unless @{$self->{children}}; 851 unless @{$self->{children}};
784} 852}
785 853
786sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
787 855
788sub size_request { 856sub size_request {
789 $_[0]{children}[0]->size_request 857 $_[0]{children}[0]->size_request
790} 858}
791 859
792sub size_allocate { 860sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 861 my ($self, $w, $h) = @_;
794 862
795 $self->{children}[0]->configure (0, 0, $w, $h); 863 $self->{children}[0]->configure (0, 0, $w, $h);
864
865 1
796} 866}
797 867
798############################################################################# 868#############################################################################
799 869
800# back-buffered drawing area 870# back-buffered drawing area
801 871
802package CFClient::UI::Window; 872package CFPlus::UI::Window;
803 873
804our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
805 875
806use CFClient::OpenGL; 876use CFPlus::OpenGL;
807 877
808sub new { 878sub new {
809 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
810 880
811 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
816 886
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 887 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 888 $self->SUPER::update;
819} 889}
820 890
821sub size_allocate { 891sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 892 my ($self, $w, $h) = @_;
823 893
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 894 $self->update;
895
896 $self->SUPER::invoke_size_allocate ($w, $h)
826} 897}
827 898
828sub _render { 899sub _render {
829 my ($self) = @_; 900 my ($self) = @_;
830 901
… …
832} 903}
833 904
834sub render_child { 905sub render_child {
835 my ($self) = @_; 906 my ($self) = @_;
836 907
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 908 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
840 911
841 { 912 {
842 package CFClient::UI::Base; 913 package CFPlus::UI::Base;
843 914
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
846 } 919 }
847
848 $self->_render;
849 }; 920 };
850} 921}
851 922
852sub _draw { 923sub _draw {
853 my ($self) = @_; 924 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 925
857 my $tex = $self->{texture} 926 my $tex = $self->{texture}
858 or return; 927 or return;
859 928
860 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
863 932
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
865 934
866 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
867} 936}
868 937
869############################################################################# 938#############################################################################
870 939
871package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
872 941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
891 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
892 961
893 ($w, $h) 962 ($w, $h)
894} 963}
895 964
896sub size_allocate { 965sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
898 967
899 my $child = $self->child; 968 my $child = $self->child;
900 969
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 972
904 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
905 $self->update; 974 $self->update;
975
976 1
906} 977}
907 978
908sub set_offset { 979sub set_offset {
909 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
910 981
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1009 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1011 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1013 }
943} 1014}
944 1015
945sub _render { 1016sub _render {
946 my ($self) = @_; 1017 my ($self) = @_;
947 1018
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1019 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}; 1020 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1021
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1023
953 $self->SUPER::_render; 1024 $self->SUPER::_render;
954} 1025}
955 1026
956############################################################################# 1027#############################################################################
957 1028
958package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
959 1030
960our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
961 1032
962sub new { 1033sub new {
963 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
964 1035
965 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
966 1037
967 my $self; 1038 my $self;
968 1039
969 my $slider = new CFClient::UI::Slider 1040 my $slider = new CFPlus::UI::Slider
970 vertical => 1, 1041 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1042 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1043 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1044 $self->{vp}->set_offset (0, $_[1]);
974 }, 1045 },
975 ; 1046 ;
976 1047
977 $self = $class->SUPER::new ( 1048 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
979 slider => $slider, 1051 slider => $slider,
980 %arg, 1052 %arg,
981 ); 1053 );
982 1054
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1055 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1056 $self->add ($child) if $child;
985 1057
986 $self 1058 $self
987} 1059}
988 1060
1061#TODO# update range on size_allocate depending on child
1062
989sub add { 1063sub add {
990 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
991 1065
992 $self->{vp}->add ($self->{child} = $widget); 1066 $self->{vp}->add ($self->{child} = $widget);
993} 1067}
994 1068
1069sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_;
1071
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev);
1075
1076 1
1077}
1078
1079sub update_slider {
1080 my ($self) = @_;
1081
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1083}
1084
995sub update { 1085sub update {
996 my ($self) = @_; 1086 my ($self) = @_;
997 1087
998 $self->SUPER::update; 1088 $self->SUPER::update;
999 1089
1000 # todo: overwrite size_allocate of child 1090 $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} 1091}
1004 1092
1005sub size_allocate { 1093sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1094 my ($self, $w, $h) = @_;
1007 1095
1096 $self->update_slider;
1097
1008 $self->SUPER::size_allocate ($w, $h); 1098 $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} 1099}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1100
1017############################################################################# 1101#############################################################################
1018 1102
1019package CFClient::UI::Frame; 1103package CFPlus::UI::Frame;
1020 1104
1021our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
1022 1106
1023use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1024 1108
1025sub new { 1109sub new {
1026 my $class = shift; 1110 my $class = shift;
1027 1111
1028 $class->SUPER::new ( 1112 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1138 $self->SUPER::_draw;
1055} 1139}
1056 1140
1057############################################################################# 1141#############################################################################
1058 1142
1059package CFClient::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1060 1144
1061our @ISA = CFClient::UI::Bin::; 1145our @ISA = CFPlus::UI::Bin::;
1062 1146
1063use CFClient::OpenGL; 1147use 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 1148
1073sub new { 1149sub new {
1074 my ($class, %arg) = @_; 1150 my ($class, %arg) = @_;
1075 1151
1076 my $title = delete $arg{title}; 1152 if ((exists $arg{label}) && !ref $arg{label}) {
1153 $arg{label} = new CFPlus::UI::Label
1154 align => 1,
1155 valign => 0,
1156 text => $arg{label},
1157 fontsize => ($arg{border} || 0.8) * 0.75;
1158 }
1159
1160 my $self = $class->SUPER::new (
1161 # label => "",
1162 fg => [0.6, 0.3, 0.1],
1163 border => 0.8,
1164 style => 'single',
1165 %arg,
1166 );
1167
1168 $self
1169}
1170
1171sub add {
1172 my ($self, @widgets) = @_;
1173
1174 $self->SUPER::add (@widgets);
1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1176}
1177
1178sub border {
1179 int $_[0]{border} * $::FONTSIZE
1180}
1181
1182sub size_request {
1183 my ($self) = @_;
1184
1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
1187
1188 my ($w, $h) = $self->SUPER::size_request;
1189
1190 (
1191 $w + $self->border * 2,
1192 $h + $self->border * 2,
1193 )
1194}
1195
1196sub invoke_size_allocate {
1197 my ($self, $w, $h) = @_;
1198
1199 my $border = $self->border;
1200
1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
1203
1204 if (my $label = $self->{label}) {
1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
1209
1210 $self->child->configure ($border, $border, $w, $h);
1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1248
1249my $bg =
1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1251 mipmap => 1, wrap => 1;
1252
1253my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256
1257sub new {
1258 my ($class, %arg) = @_;
1077 1259
1078 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1261 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1262 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1263 border => 0.6,
1082 can_events => 1, 1264 can_events => 1,
1083 min_w => 16, 1265 min_w => 64,
1084 min_h => 16, 1266 min_h => 32,
1085 %arg, 1267 %arg,
1086 ); 1268 );
1087 1269
1088 $self->{title} = new CFClient::UI::Label 1270 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1271 align => 0,
1090 valign => 1, 1272 valign => 1,
1091 text => $title, 1273 text => $self->{title},
1092 fontsize => $self->{border} 1274 fontsize => $self->{border},
1093 if defined $title; 1275 if exists $self->{title};
1276
1277 if ($self->{has_close_button}) {
1278 $self->{close_button} =
1279 new CFPlus::UI::ImageButton
1280 path => 'x1_close.png',
1281 on_activate => sub { $self->emit ("delete") };
1282
1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1284 }
1094 1285
1095 $self 1286 $self
1096} 1287}
1097 1288
1098sub add { 1289sub add {
1099 my ($self, @widgets) = @_; 1290 my ($self, @widgets) = @_;
1100 1291
1101 $self->SUPER::add (@widgets); 1292 $self->SUPER::add (@widgets);
1293 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1295}
1104 1296
1105sub border { 1297sub border {
1106 int $_[0]{border} * $::FONTSIZE 1298 int $_[0]{border} * $::FONTSIZE
1107} 1299}
1108 1300
1109sub size_request { 1301sub size_request {
1110 my ($self) = @_; 1302 my ($self) = @_;
1111 1303
1112 $self->{title}->size_request 1304 $self->{title_widget}->size_request
1113 if $self->{title}; 1305 if $self->{title_widget};
1306
1307 $self->{close_button}->size_request
1308 if $self->{close_button};
1114 1309
1115 my ($w, $h) = $self->SUPER::size_request; 1310 my ($w, $h) = $self->SUPER::size_request;
1116 1311
1117 ( 1312 (
1118 $w + $self->border * 2, 1313 $w + $self->border * 2,
1119 $h + $self->border * 2, 1314 $h + $self->border * 2,
1120 ) 1315 )
1121} 1316}
1122 1317
1123sub size_allocate { 1318sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1125 1320
1126 if ($self->{title}) { 1321 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1322 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1323 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1324 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1325 }
1131 1326
1132 my $border = $self->border; 1327 my $border = $self->border;
1133 1328
1134 $h -= List::Util::max 0, $border * 2; 1329 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1330 $w -= List::Util::max 0, $border * 2;
1331
1332 $self->child->configure ($border, $border, $w, $h);
1333
1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1335 if $self->{close_button};
1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1136 1344
1137 $self->child->configure ($border, $border, $w, $h); 1345 1
1138} 1346}
1139 1347
1140sub button_down { 1348sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
1142 1350
1143 my ($w, $h) = @$self{qw(w h)}; 1351 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1352 my $border = $self->border;
1145 1353
… …
1176 1384
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1385 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1386
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1387 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1388 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1389 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1390 };
1183 } else { 1391 } else {
1184 return 0; 1392 return 0;
1185 } 1393 }
1186 1394
1187 1 1395 1
1188} 1396}
1189 1397
1190sub button_up { 1398sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1399 my ($self, $ev, $x, $y) = @_;
1192 1400
1193 !!delete $self->{motion} 1401 ! ! delete $self->{motion}
1194} 1402}
1195 1403
1196sub mouse_motion { 1404sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
1198 1406
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1408
1201 !!$self->{motion} 1409 ! ! $self->{motion}
1410}
1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
1202} 1418}
1203 1419
1204sub _draw { 1420sub _draw {
1205 my ($self) = @_; 1421 my ($self) = @_;
1206 1422
… …
1232 1448
1233 glDisable GL_TEXTURE_2D; 1449 glDisable GL_TEXTURE_2D;
1234 1450
1235 $child->draw; 1451 $child->draw;
1236 1452
1237 if ($self->{title}) { 1453 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1454 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1455 $self->{title_widget}->_draw;
1456
1457 glTranslate 0, - ($border - $self->{h});
1240 } 1458 }
1459
1460 $self->{close_button}->draw
1461 if $self->{close_button};
1241} 1462}
1242 1463
1243############################################################################# 1464#############################################################################
1244 1465
1245package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1246 1467
1247our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1248 1469
1249use List::Util qw(max sum); 1470use List::Util qw(max sum);
1250 1471
1251use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1252 1473
1253sub new { 1474sub new {
1254 my $class = shift; 1475 my $class = shift;
1255 1476
1256 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1262sub children { 1483sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1485}
1265 1486
1266sub add { 1487sub add {
1267 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1268 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1492 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1271 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1498 $self->realloc;
1499}
1500
1501sub remove {
1502 my ($self, $child) = @_;
1503
1504 # TODO: not yet implemented
1273} 1505}
1274 1506
1275# TODO: move to container class maybe? send children a signal on removal? 1507# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1508sub clear {
1277 my ($self) = @_; 1509 my ($self) = @_;
… …
1318 (sum @$ws), 1550 (sum @$ws),
1319 (sum @$hs), 1551 (sum @$hs),
1320 ) 1552 )
1321} 1553}
1322 1554
1323sub size_allocate { 1555sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1556 my ($self, $w, $h) = @_;
1325 1557
1326 my ($ws, $hs) = $self->get_wh; 1558 my ($ws, $hs) = $self->get_wh;
1327 1559
1328 my $req_w = (sum @$ws) || 1; 1560 my $req_w = (sum @$ws) || 1;
… …
1335 1567
1336 # linearly scale sizes 1568 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1571
1340 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1341 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1342 1574
1343 my $y; 1575 my $y;
1344 1576
1345 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1360 } 1592 }
1361 1593
1362 $y += $row_h; 1594 $y += $row_h;
1363 } 1595 }
1364 1596
1597 1
1365} 1598}
1366 1599
1367sub find_widget { 1600sub find_widget {
1368 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
1369 1602
… …
1388 } 1621 }
1389} 1622}
1390 1623
1391############################################################################# 1624#############################################################################
1392 1625
1393package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1394 1627
1395our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1396 1629
1397sub size_request { 1630sub size_request {
1398 my ($self) = @_; 1631 my ($self) = @_;
1399 1632
1400 $self->{vertical} 1633 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1640 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1641 )
1409} 1642}
1410 1643
1411sub size_allocate { 1644sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1413 1646
1414 my $space = $self->{vertical} ? $h : $w; 1647 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1648 my @children = $self->visible_children;
1416 1649
1417 my @req; 1650 my @req;
1418 1651
1419 if ($self->{homogeneous}) { 1652 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1653 @req = ($space / (@children || 1)) x @children;
1421 } else { 1654 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1656 my $req = List::Util::sum @req;
1424 1657
1425 if ($req > $space) { 1658 if ($req > $space) {
1426 # ah well, not enough space 1659 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1660 $_ *= $space / $req for @req;
1428 } else { 1661 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1663
1431 $space = ($space - $req) / $expand; # remaining space to give away 1664 $space = ($space - $req) / $expand; # remaining space to give away
1432 1665
1433 $req[$_] += $space * $children->[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1667 for 0 .. $#children;
1435 } 1668 }
1436 } 1669 }
1437 1670
1438 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1439 1672
1440 my $pos = 0; 1673 my $pos = 0;
1441 for (0 .. $#$children) { 1674 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1676 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1677
1445 $pos += $alloc; 1678 $pos += $alloc;
1446 } 1679 }
1447 1680
1448 1 1681 1
1449} 1682}
1450 1683
1451############################################################################# 1684#############################################################################
1452 1685
1453package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1454 1687
1455our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1456 1689
1457sub new { 1690sub new {
1458 my $class = shift; 1691 my $class = shift;
1459 1692
1460 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1463 ) 1696 )
1464} 1697}
1465 1698
1466############################################################################# 1699#############################################################################
1467 1700
1468package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1469 1702
1470our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1471 1704
1472sub new { 1705sub new {
1473 my $class = shift; 1706 my $class = shift;
1474 1707
1475 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1478 ) 1711 )
1479} 1712}
1480 1713
1481############################################################################# 1714#############################################################################
1482 1715
1483package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1484 1717
1485our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1486 1719
1487use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1488 1721
1489sub new { 1722sub new {
1490 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1491 1724
1492 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1728 #active_bg => none
1496 #font => default_font 1729 #font => default_font
1497 #text => initial text 1730 #text => initial text
1498 #markup => initial narkup 1731 #markup => initial narkup
1499 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1500 ellipsise => 3, # end 1734 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1736 fontsize => 1,
1503 align => -1, 1737 align => -1,
1504 valign => -1, 1738 valign => -1,
1505 padding_x => 2, 1739 padding_x => 2,
1506 padding_y => 2, 1740 padding_y => 2,
1507 can_events => 0, 1741 can_events => 0,
1508 %arg 1742 %arg
1509 ); 1743 );
1510 1744
1511 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1748 $self->{template} = $layout;
1515 } 1749 }
1516 1750
1517 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1521 } 1755 }
1522 1756
1523 $self 1757 $self
1524} 1758}
1525 1759
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1760sub update {
1537 my ($self) = @_; 1761 my ($self) = @_;
1538 1762
1539 delete $self->{texture}; 1763 delete $self->{texture};
1540 $self->SUPER::update; 1764 $self->SUPER::update;
… …
1551 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1552 1776
1553 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1555 1779
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1781
1558 delete $self->{req_h}; 1782 delete $self->{size_req};
1559
1560 $self->realloc; 1783 $self->realloc;
1561 $self->update; 1784 $self->update;
1562} 1785}
1563 1786
1564sub set_markup { 1787sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1569 1792
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1794
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1796
1574 delete $self->{req_h}; 1797 delete $self->{size_req};
1575
1576 $self->realloc; 1798 $self->realloc;
1577 $self->update; 1799 $self->update;
1578} 1800}
1579 1801
1580sub size_request { 1802sub size_request {
1581 my ($self) = @_; 1803 my ($self) = @_;
1582 1804
1583 if (exists $self->{req_h}) { 1805 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1806 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1807 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1808 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1811
1592 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1593 1813
1594 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1595 $self->{template}->set_font ($self->{font}) if $self->{font}; 1815 $self->{template}->set_font ($self->{font}) if $self->{font};
1816 $self->{template}->set_width ($self->{max_w} || -1);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1818
1598 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1599 1820
1600 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1822 $h = List::Util::max $h, $h2;
1602 } 1823 }
1603 1824
1604 ($w, $h) 1825 [$w, $h]
1605 } 1826 };
1606}
1607 1827
1828 @{ $self->{size_req} }
1829}
1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1608sub size_allocate { 1835sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1610 1837
1611 delete $self->{ox}; 1838 delete $self->{ox};
1612 1839
1613 delete $self->{texture} 1840 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1841 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1842
1843 1
1615} 1844}
1616 1845
1617sub set_fontsize { 1846sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1619 1848
1620 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1621 delete $self->{texture}; 1851 delete $self->{texture};
1622 1852
1623 $self->realloc; 1853 $self->realloc;
1624} 1854}
1625 1855
1856sub reconfigure {
1857 my ($self) = @_;
1858
1859 delete $self->{size_req};
1860 delete $self->{texture};
1861
1862 $self->SUPER::reconfigure;
1863}
1864
1626sub _draw { 1865sub _draw {
1627 my ($self) = @_; 1866 my ($self) = @_;
1628 1867
1629 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1630 1869
1631 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 1877
1639 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1640 }; 1879 };
1641 1880
1642 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1646 1885
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 1889 };
1651 1890
1652 glEnable GL_TEXTURE_2D; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1893
1655 glColor_premultiply @{$self->{fg}} 1894 $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} 1895}
1662 1896
1663############################################################################# 1897#############################################################################
1664 1898
1665package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1666 1900
1667our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1668 1902
1669use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1670 1904
1671sub new { 1905sub new {
1672 my $class = shift; 1906 my $class = shift;
1673 1907
1674 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1678 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1679 can_hover => 1, 1913 can_hover => 1,
1680 can_focus => 1, 1914 can_focus => 1,
1681 valign => 0, 1915 valign => 0,
1682 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
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) {
1981 # what a hack
1982 $self->{cursor} =
1983 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984 ? length $1
1985 : 0;
1986 } elsif ($sym == CFPlus::SDLK_END) {
1987 # uh, again
1988 $self->{cursor} =
1989 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990 ? $self->{cursor} + length $1
1991 : length $self->{text};
1992 } elsif ($uni == 21) { # ctrl-u
1993 $text = "";
1745 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1996 $self->emit ('escape');
1750 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 2001 } else {
1753 return 0; 2002 return 0;
1754 } 2003 }
1755 2004
1756 $self->_set_text ($text); 2005 $self->_set_text ($text);
1757 2006
1758 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1759 2009
1760 1 2010 1
1761} 2011}
1762 2012
1763sub focus_in { 2013sub invoke_focus_in {
1764 my ($self) = @_; 2014 my ($self) = @_;
1765 2015
1766 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1767 2017
1768 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1769} 2019}
1770 2020
1771sub button_down { 2021sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1773 2023
1774 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 2025
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 2027
1778 # byte-index to char-index 2028 # byte-index to char-index
1779 my $text = $self->{text}; 2029 my $text = $self->{text};
1780 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1782 2032
1783 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1784 $self->update; 2034 $self->update;
1785 2035
1786 1 2036 1
1787} 2037}
1788 2038
1789sub mouse_motion { 2039sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2041# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 2042
1793 0 2043 1
1794} 2044}
1795 2045
1796sub _draw { 2046sub _draw {
1797 my ($self) = @_; 2047 my ($self) = @_;
1798 2048
… …
1825 utf8::encode $text; 2075 utf8::encode $text;
1826 2076
1827 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2077 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1828 } 2078 }
1829 2079
1830 glColor @{$self->{fg}};
1831 glBegin GL_LINES; 2080 glBegin GL_LINES;
1832 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2081 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}; 2082 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1834 glEnd; 2083 glEnd;
1835 } 2084 }
1836} 2085}
1837 2086
2087#############################################################################
2088
1838package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1839 2090
1840our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1841 2092
1842use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1843 2094
1844sub key_down { 2095sub invoke_key_down {
1845 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1846 2097
1847 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1848 2099
1849 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1850 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
2103
1852 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 2106 $self->emit (activate => $txt);
1855 $self->update; 2107 $self->update;
1856 2108
1857 } elsif ($sym == CFClient::SDLK_UP) { 2109 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 2110 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 2111 $self->{history_saveback} = $self->get_text;
1860 } 2112 }
1861 if (@{$self->{history} || []} > 0) { 2113 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 2114 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 2117 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 2119 }
1868 2120
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 2122 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 2124
1873 if ($self->{history_pointer} >= 0) { 2125 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 2127 } else {
1876 $self->set_text ($self->{history_saveback}); 2128 $self->set_text ($self->{history_saveback});
1877 } 2129 }
1878 2130
1879 } else { 2131 } else {
1880 return $self->SUPER::key_down ($ev) 2132 return $self->SUPER::invoke_key_down ($ev)
1881 } 2133 }
1882 2134
1883 1 2135 1
1884} 2136}
1885 2137
1886############################################################################# 2138#############################################################################
1887 2139
2140package CFPlus::UI::TextEdit;
2141
2142our @ISA = CFPlus::UI::EntryBase::;
2143
2144use CFPlus::OpenGL;
2145
2146sub move_cursor_ver {
2147 my ($self, $dy) = @_;
2148
2149 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150
2151 $y += $dy;
2152
2153 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2154 $self->{cursor} = $index;
2155 delete $self->{cur_h};
2156 $self->update;
2157 return;
2158 }
2159}
2160
2161sub invoke_key_down {
2162 my ($self, $ev) = @_;
2163
2164 my $sym = $ev->{sym};
2165
2166 if ($sym == CFPlus::SDLK_UP) {
2167 $self->move_cursor_ver (-1);
2168 } elsif ($sym == CFPlus::SDLK_DOWN) {
2169 $self->move_cursor_ver (+1);
2170 } else {
2171 return $self->SUPER::invoke_key_down ($ev)
2172 }
2173
2174 1
2175}
2176
2177#############################################################################
2178
1888package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1889 2180
1890our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1891 2182
1892use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1893 2184
1894my @tex = 2185my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1897 2188
1898sub new { 2189sub new {
1899 my $class = shift; 2190 my $class = shift;
1900 2191
… …
1909 can_events => 1, 2200 can_events => 1,
1910 @_ 2201 @_
1911 ) 2202 )
1912} 2203}
1913 2204
1914sub activate { }
1915
1916sub button_up { 2205sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1918 2207
1919 $self->emit ("activate") 2208 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2210 && $y >= 0 && $y < $self->{h};
… …
1939 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1940} 2229}
1941 2230
1942############################################################################# 2231#############################################################################
1943 2232
1944package CFClient::UI::CheckBox; 2233package CFPlus::UI::CheckBox;
1945 2234
1946our @ISA = CFClient::UI::DrawBG::; 2235our @ISA = CFPlus::UI::DrawBG::;
1947 2236
1948my @tex = 2237my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2240
1952use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1953 2242
1954sub new { 2243sub new {
1955 my $class = shift; 2244 my $class = shift;
1956 2245
1957 $class->SUPER::new ( 2246 $class->SUPER::new (
… …
1971 my ($self) = @_; 2260 my ($self) = @_;
1972 2261
1973 (6) x 2 2262 (6) x 2
1974} 2263}
1975 2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
1976sub button_down { 2273sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2274 my ($self, $ev, $x, $y) = @_;
1978 2275
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2278 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2279 } else {
1984 return 0 2280 return 0
1985 } 2281 }
1986 2282
1987 1 2283 1
… …
2007 glDisable GL_TEXTURE_2D; 2303 glDisable GL_TEXTURE_2D;
2008} 2304}
2009 2305
2010############################################################################# 2306#############################################################################
2011 2307
2012package CFClient::UI::Image; 2308package CFPlus::UI::Image;
2013 2309
2014our @ISA = CFClient::UI::Base::; 2310our @ISA = CFPlus::UI::Base::;
2015 2311
2016use CFClient::OpenGL; 2312use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2313
2019our %loaded_images; 2314our %texture_cache;
2020 2315
2021sub new { 2316sub new {
2022 my $class = shift; 2317 my $class = shift;
2023 2318
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
2025 2323
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2324 $self->{path} || $self->{tex}
2325 or Carp::croak "'path' or 'tex' attributes required";
2027 2326
2028 $loaded_images{$self->{image}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2328 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2030 2329
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2032 2331
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2333
2037 $self 2334 $self
2038} 2335}
2039 2336
2337sub STORABLE_freeze {
2338 my ($self, $cloning) = @_;
2339
2340 $self->{path}
2341 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2342
2343 $self->{path}
2344}
2345
2346sub STORABLE_attach {
2347 my ($self, $cloning, $path) = @_;
2348
2349 $self->new (path => $path)
2350}
2351
2040sub size_request { 2352sub size_request {
2041 my ($self) = @_; 2353 my ($self) = @_;
2042 2354
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2355 ($self->{tex}{w}, $self->{tex}{h})
2044} 2356}
2045 2357
2046sub _draw { 2358sub _draw {
2047 my ($self) = @_; 2359 my ($self) = @_;
2048 2360
… …
2058 } 2370 }
2059 2371
2060 glEnable GL_TEXTURE_2D; 2372 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2374
2063 $tex->draw_quad_alpha (0, 0, $w, $h); 2375 $tex->draw_quad (0, 0, $w, $h);
2064 2376
2065 glDisable GL_TEXTURE_2D; 2377 glDisable GL_TEXTURE_2D;
2066} 2378}
2067 2379
2068############################################################################# 2380#############################################################################
2069 2381
2382package CFPlus::UI::ImageButton;
2383
2384our @ISA = CFPlus::UI::Image::;
2385
2386use CFPlus::OpenGL;
2387
2388my %textures;
2389
2390sub new {
2391 my $class = shift;
2392
2393 my $self = $class->SUPER::new (
2394 padding_x => 4,
2395 padding_y => 4,
2396 fg => [1, 1, 1],
2397 active_fg => [0, 0, 1],
2398 can_hover => 1,
2399 align => 0,
2400 valign => 0,
2401 can_events => 1,
2402 @_
2403 );
2404}
2405
2406sub invoke_button_up {
2407 my ($self, $ev, $x, $y) = @_;
2408
2409 $self->emit ("activate")
2410 if $x >= 0 && $x < $self->{w}
2411 && $y >= 0 && $y < $self->{h};
2412
2413 1
2414}
2415
2416#############################################################################
2417
2070package CFClient::UI::VGauge; 2418package CFPlus::UI::VGauge;
2071 2419
2072our @ISA = CFClient::UI::Base::; 2420our @ISA = CFPlus::UI::Base::;
2073 2421
2074use List::Util qw(min max); 2422use List::Util qw(min max);
2075 2423
2076use CFClient::OpenGL; 2424use CFPlus::OpenGL;
2077 2425
2078my %tex = ( 2426my %tex = (
2079 food => [ 2427 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2430 ],
2083 grace => [ 2431 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 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/ 2433 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2086 ], 2434 ],
2087 hp => [ 2435 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2438 ],
2091 mana => [ 2439 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 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/ 2441 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2094 ], 2442 ],
2095); 2443);
2096 2444
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2505 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2507
2160 my $h1 = $self->{h} * (1 - $ycut1); 2508 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2509 my $h2 = $self->{h} * (1 - $ycut2);
2510 my $h3 = $self->{h};
2511
2512 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2513
2163 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2515 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2516 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
… …
2185 2536
2186 if ($t3) { 2537 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2539 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2544 glEnd;
2194 } 2545 }
2195 2546
2196 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2198} 2549}
2199 2550
2200############################################################################# 2551#############################################################################
2201 2552
2202package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
2203 2554
2204our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
2205 2556
2206sub new { 2557sub new {
2207 my ($class, %arg) = @_; 2558 my ($class, %arg) = @_;
2208 2559
2209 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2562 can_hover => 1,
2212 can_events => 1, 2563 can_events => 1,
2213 %arg, 2564 %arg,
2214 ); 2565 );
2215 2566
2216 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2567 $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); 2568 $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"); 2569 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2219 2570
2220 $self 2571 $self
2221} 2572}
2222 2573
2223sub set_fontsize { 2574sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
2245} 2596}
2246 2597
2247############################################################################# 2598#############################################################################
2248 2599
2249package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
2250 2601
2251use strict; 2602use strict;
2252 2603
2253use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2254 2605
2255our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
2256 2607
2257my @tex = 2608my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
2260 2611
2261sub new { 2612sub new {
2262 my $class = shift; 2613 my $class = shift;
2263 2614
… …
2284 $self->update; 2635 $self->update;
2285 2636
2286 $self 2637 $self
2287} 2638}
2288 2639
2289sub changed { }
2290
2291sub set_range { 2640sub set_range {
2292 my ($self, $range) = @_; 2641 my ($self, $range) = @_;
2293 2642
2294 ($range, $self->{range}) = ($self->{range}, $range); 2643 ($range, $self->{range}) = ($self->{range}, $range);
2295 2644
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2645 if ("@$range" ne "@{$self->{range}}") {
2646 $self->update;
2647 $self->set_value ($self->{range}[0]);
2648 }
2298} 2649}
2299 2650
2300sub set_value { 2651sub set_value {
2301 my ($self, $value) = @_; 2652 my ($self, $value) = @_;
2302 2653
… …
2313 if $unit; 2664 if $unit;
2314 2665
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2667
2317 if ($value != $old_value) { 2668 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2669 $self->emit (changed => $value);
2319 $self->update; 2670 $self->update;
2320 } 2671 }
2321} 2672}
2322 2673
2323sub size_request { 2674sub size_request {
2324 my ($self) = @_; 2675 my ($self) = @_;
2325 2676
2326 ($self->{req_w}, $self->{req_h}) 2677 ($self->{req_w}, $self->{req_h})
2327} 2678}
2328 2679
2329sub button_down { 2680sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2331 2682
2332 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2684
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2686
2336 $self->mouse_motion ($ev, $x, $y) 2687 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2688}
2338 2689
2339sub mouse_motion { 2690sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2341 2692
2342 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2695
… …
2350 } else { 2701 } else {
2351 return 0; 2702 return 0;
2352 } 2703 }
2353 2704
2354 1 2705 1
2706}
2707
2708sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_;
2710
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2714
2715 ! ! $delta
2355} 2716}
2356 2717
2357sub update { 2718sub update {
2358 my ($self) = @_; 2719 my ($self) = @_;
2359 2720
… …
2408 glDisable GL_TEXTURE_2D; 2769 glDisable GL_TEXTURE_2D;
2409} 2770}
2410 2771
2411############################################################################# 2772#############################################################################
2412 2773
2413package CFClient::UI::ValSlider; 2774package CFPlus::UI::ValSlider;
2414 2775
2415our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFPlus::UI::HBox::;
2416 2777
2417sub new { 2778sub new {
2418 my ($class, %arg) = @_; 2779 my ($class, %arg) = @_;
2419 2780
2420 my $range = delete $arg{range}; 2781 my $range = delete $arg{range};
2421 2782
2422 my $self = $class->SUPER::new ( 2783 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2784 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2785 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 2786 to_value => sub { shift },
2426 from_value => sub { shift }, 2787 from_value => sub { shift },
2427 %arg, 2788 %arg,
2428 ); 2789 );
2429 2790
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2810sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2811sub set_value { shift->{slider}->set_value (@_) }
2451 2812
2452############################################################################# 2813#############################################################################
2453 2814
2454package CFClient::UI::TextView; 2815package CFPlus::UI::TextScroller;
2455 2816
2456our @ISA = CFClient::UI::HBox::; 2817our @ISA = CFPlus::UI::HBox::;
2457 2818
2458use CFClient::OpenGL; 2819use CFPlus::OpenGL;
2459 2820
2460sub new { 2821sub new {
2461 my $class = shift; 2822 my $class = shift;
2462 2823
2463 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2464 fontsize => 1, 2825 fontsize => 1,
2465 can_events => 0, 2826 can_events => 1,
2827 indent => 0,
2466 #font => default_font 2828 #font => default_font
2467 @_, 2829 @_,
2468 2830
2469 layout => (new CFClient::Layout 1), 2831 layout => (new CFPlus::Layout),
2470 par => [], 2832 par => [],
2471 height => 0, 2833 height => 0,
2472 children => [ 2834 children => [
2473 (new CFClient::UI::Empty expand => 1), 2835 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 2836 (new CFPlus::UI::Slider vertical => 1),
2475 ], 2837 ],
2476 ); 2838 );
2477 2839
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 2840 $self->{children}[1]->connect (changed => sub { $self->update });
2479 2841
… …
2485 2847
2486 $self->{fontsize} = $fontsize; 2848 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2849 $self->reflow;
2488} 2850}
2489 2851
2852sub size_request {
2853 my ($self) = @_;
2854
2855 my ($empty, $slider) = @{ $self->{children} };
2856
2857 local $self->{children} = [$empty, $slider];
2858 $self->SUPER::size_request
2859}
2860
2490sub size_allocate { 2861sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2862 my ($self, $w, $h) = @_;
2492 2863
2493 $self->SUPER::size_allocate ($w, $h); 2864 my ($empty, $slider, @other) = @{ $self->{children} };
2865 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2866
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2867 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2868 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2869 $self->{layout}->set_width ($empty->{w});
2870 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2871
2499 $self->reflow; 2872 $self->reflow;
2500}
2501 2873
2502sub text_size { 2874 local $self->{children} = [$empty, $slider];
2875 $self->SUPER::invoke_size_allocate ($w, $h)
2876}
2877
2878sub invoke_mouse_wheel {
2503 my ($self, $text, $indent) = @_; 2879 my ($self, $ev) = @_;
2880
2881 return 0 unless $ev->{dy}; # only vertical movements
2882
2883 $self->{children}[1]->emit (mouse_wheel => $ev);
2884
2885 1
2886}
2887
2888sub get_layout {
2889 my ($self, $para) = @_;
2504 2890
2505 my $layout = $self->{layout}; 2891 my $layout = $self->{layout};
2506 2892
2893 $layout->set_font ($self->{font}) if $self->{font};
2894 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2895 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2896 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2897 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2898 $layout->set_markup ($para->{markup});
2899
2900 $layout->set_shapes (
2901 map
2902 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2903 @{$para->{widget}}
2510 2904 );
2905
2511 $layout->size 2906 $layout
2512} 2907}
2513 2908
2514sub reflow { 2909sub reflow {
2515 my ($self) = @_; 2910 my ($self) = @_;
2516 2911
… …
2523 2918
2524 # todo: base offset on lines or so, not on pixels 2919 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset); 2920 $self->{children}[1]->set_value ($offset);
2526} 2921}
2527 2922
2923sub current_paragraph {
2924 my ($self) = @_;
2925
2926 $self->{top_paragraph} - 1
2927}
2928
2929sub scroll_to {
2930 my ($self, $para) = @_;
2931
2932 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2933
2934 $self->{scroll_to} = $para;
2935 $self->update;
2936}
2937
2528sub clear { 2938sub clear {
2529 my ($self) = @_; 2939 my ($self) = @_;
2940
2941 my (undef, undef, @other) = @{ $self->{children} };
2942 $self->remove ($_) for @other;
2530 2943
2531 $self->{par} = []; 2944 $self->{par} = [];
2532 $self->{height} = 0; 2945 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2946 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2947}
2535 2948
2536sub add_paragraph { 2949sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2950 my $self = shift;
2538 2951
2539 for my $line (split /\n/, $text) { 2952 for my $para (@_) {
2540 my ($w, $h) = $self->text_size ($line); 2953 $para = {
2954 fg => [1, 1, 1, 1],
2955 indent => 0,
2956 markup => "",
2957 widget => [],
2958 ref $para ? %$para : (markup => $para),
2959 w => 1e10,
2960 wrapped => 1,
2961 };
2962
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para;
2965 }
2966
2967 $self->{need_reflow}++;
2968 $self->update;
2969}
2970
2971sub scroll_to_bottom {
2972 my ($self) = @_;
2973
2974 $self->{scroll_to} = $#{$self->{par}};
2975 $self->update;
2976}
2977
2978sub force_uptodate {
2979 my ($self) = @_;
2980
2981 if (delete $self->{need_reflow}) {
2982 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2983
2984 my $height = 0;
2985
2986 for my $para (@{$self->{par}}) {
2987 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2988 my $layout = $self->get_layout ($para);
2989 my ($w, $h) = $layout->size;
2990
2991 $para->{w} = $w + $para->{indent};
2992 $para->{h} = $h;
2993 $para->{wrapped} = $layout->has_wrapped;
2994 }
2995
2996 $para->{y} = $height;
2997 $height += $para->{h};
2998 }
2999
2541 $self->{height} += $h; 3000 $self->{height} = $height;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3001 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2543 }
2544 3002
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3003 delete $self->{texture};
3004 }
3005
3006 if (my $paridx = delete $self->{scroll_to}) {
3007 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3008 }
2546} 3009}
2547 3010
2548sub update { 3011sub update {
2549 my ($self) = @_; 3012 my ($self) = @_;
2550 3013
… …
2552 3015
2553 return unless $self->{h} > 0; 3016 return unless $self->{h} > 0;
2554 3017
2555 delete $self->{texture}; 3018 delete $self->{texture};
2556 3019
2557 $ROOT->on_post_alloc ($self, sub { 3020 $ROOT->on_post_alloc ($self => sub {
3021 $self->force_uptodate;
3022
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3023 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 3024
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 { 3025 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 3026 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 3027 glClear GL_COLOR_BUFFER_BIT;
2589 3028
3029 package CFPlus::UI::Base;
3030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3031 (0, 0, $self->{w}, $self->{h});
3032
3033 my $top = int $self->{children}[1]{range}[0];
3034
3035 my $paridx = 0;
3036 my $top_paragraph;
2590 my $top = int $self->{children}[1]{range}[0]; 3037 my $top = int $self->{children}[1]{range}[0];
2591 3038
2592 my $y0 = $top; 3039 my $y0 = $top;
2593 my $y1 = $top + $H; 3040 my $y1 = $top + $H;
2594 3041
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}}) { 3042 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 3043 my $h = $para->{h};
3044 my $y = $para->{y};
2607 3045
2608 if ($y0 < $y + $h && $y < $y1) { 3046 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 3047 my $layout = $self->get_layout ($para);
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 3048
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3049 $layout->render ($para->{indent}, $y - $y0);
2614 3050
2615 glRasterPos $par->[3], $y - $y0; 3051 if (my @w = @{ $para->{widget} }) {
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3052 my @s = $layout->get_shapes;
3053
3054 for (@w) {
3055 my ($dx, $dy) = splice @s, 0, 2, ();
3056
3057 $_->{x} = $dx + $para->{indent};
3058 $_->{y} = $dy + $y - $y0;
3059
3060 $_->draw;
3061 }
3062 }
2617 } 3063 }
2618 3064
2619 $y += $h; 3065 $paridx++;
3066 $top_paragraph ||= $paridx if $y >= $top;
2620 } 3067 }
2621 3068
2622 glDisable GL_BLEND; 3069 $self->{top_paragraph} = $top_paragraph;
2623 }; 3070 };
2624 }); 3071 });
3072}
3073
3074sub reconfigure {
3075 my ($self) = @_;
3076
3077 $self->SUPER::reconfigure;
3078
3079 $_->{w} = 1e10 for @{ $self->{par} };
3080 $self->reflow;
2625} 3081}
2626 3082
2627sub _draw { 3083sub _draw {
2628 my ($self) = @_; 3084 my ($self) = @_;
2629 3085
… …
2632 glColor 0, 0, 0, 1; 3088 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3089 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 3090 glDisable GL_TEXTURE_2D;
2635 3091
2636 $self->{children}[1]->draw; 3092 $self->{children}[1]->draw;
2637
2638} 3093}
2639 3094
2640############################################################################# 3095#############################################################################
2641 3096
2642package CFClient::UI::Animator; 3097package CFPlus::UI::Animator;
2643 3098
2644use CFClient::OpenGL; 3099use CFPlus::OpenGL;
2645 3100
2646our @ISA = CFClient::UI::Bin::; 3101our @ISA = CFPlus::UI::Bin::;
2647 3102
2648sub moveto { 3103sub moveto {
2649 my ($self, $x, $y) = @_; 3104 my ($self, $x, $y) = @_;
2650 3105
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3106 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 3134 glPopMatrix;
2680} 3135}
2681 3136
2682############################################################################# 3137#############################################################################
2683 3138
2684package CFClient::UI::Flopper; 3139package CFPlus::UI::Flopper;
2685 3140
2686our @ISA = CFClient::UI::Button::; 3141our @ISA = CFPlus::UI::Button::;
2687 3142
2688sub new { 3143sub new {
2689 my $class = shift; 3144 my $class = shift;
2690 3145
2691 my $self = $class->SUPER::new ( 3146 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 3158 $self->{other}->toggle_visibility;
2704} 3159}
2705 3160
2706############################################################################# 3161#############################################################################
2707 3162
2708package CFClient::UI::Tooltip; 3163package CFPlus::UI::Tooltip;
2709 3164
2710our @ISA = CFClient::UI::Bin::; 3165our @ISA = CFPlus::UI::Bin::;
2711 3166
2712use CFClient::OpenGL; 3167use CFPlus::OpenGL;
2713 3168
2714sub new { 3169sub new {
2715 my $class = shift; 3170 my $class = shift;
2716 3171
2717 $class->SUPER::new ( 3172 $class->SUPER::new (
… …
2720 ) 3175 )
2721} 3176}
2722 3177
2723sub set_tooltip_from { 3178sub set_tooltip_from {
2724 my ($self, $widget) = @_; 3179 my ($self, $widget) = @_;
3180
3181 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3182 if $widget->{tooltip} =~ /^#(.*)$/;
2725 3183
2726 my $tooltip = $widget->{tooltip}; 3184 my $tooltip = $widget->{tooltip};
2727 3185
2728 if ($ENV{CFPLUS_DEBUG} & 2) { 3186 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 3187 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3188 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 3189 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 3190 . "visible $widget->{visible}";
2733 } 3191 }
2734 3192
3193 $tooltip =~ s/^\n+//;
3194 $tooltip =~ s/\n+$//;
3195
2735 $self->add (new CFClient::UI::Label 3196 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 3197 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3198 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 3199 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 3200 style => 1, # FLAG_INVERSE
2740 ellipsise => 0, 3201 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP), 3202 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 ); 3203 );
2743} 3204}
2744 3205
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3209 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3210
2750 ($w + 4, $h + 4) 3211 ($w + 4, $h + 4)
2751} 3212}
2752 3213
2753sub size_allocate { 3214sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3215 my ($self, $w, $h) = @_;
2755 3216
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3217 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3218}
2758 3219
2759sub visibility_change { 3220sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3221 my ($self, $visible) = @_;
2761 3222
2762 return unless $visible; 3223 return unless $visible;
2763 3224
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3225 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3226 my $widget = $self->{owner}
2766 or return; 3227 or return;
2767 3228
3229 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3230 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3231
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3232 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3233 if $x + $self->{w} > $self->{root}{w};
2772 3234
2773 $self->move_abs ($x, $y); 3235 $self->move_abs ($x, $y);
3236 } else {
3237 $self->hide;
3238 }
2774 }); 3239 });
2775} 3240}
2776 3241
2777sub _draw { 3242sub _draw {
2778 my ($self) = @_; 3243 my ($self) = @_;
… …
2802 $self->SUPER::_draw; 3267 $self->SUPER::_draw;
2803} 3268}
2804 3269
2805############################################################################# 3270#############################################################################
2806 3271
2807package CFClient::UI::Face; 3272package CFPlus::UI::Face;
2808 3273
2809our @ISA = CFClient::UI::Base::; 3274our @ISA = CFPlus::UI::DrawBG::;
2810 3275
2811use CFClient::OpenGL; 3276use CFPlus::OpenGL;
2812 3277
2813sub new { 3278sub new {
2814 my $class = shift; 3279 my $class = shift;
2815 3280
2816 my $self = $class->SUPER::new ( 3281 my $self = $class->SUPER::new (
… …
2818 can_events => 0, 3283 can_events => 0,
2819 @_, 3284 @_,
2820 ); 3285 );
2821 3286
2822 if ($self->{anim} && $self->{animspeed}) { 3287 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self); 3288 CFPlus::weaken (my $widget = $self);
2824 3289
2825 $self->{timer} = Event->timer ( 3290 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1, 3292 hard => 1,
2828 interval => $self->{animspeed}, 3293 interval => $self->{animspeed},
… …
2851sub _draw { 3316sub _draw {
2852 my ($self) = @_; 3317 my ($self) = @_;
2853 3318
2854 return unless $::CONN; 3319 return unless $::CONN;
2855 3320
3321 $self->SUPER::_draw;
3322
2856 my $face; 3323 my $face;
2857 3324
2858 if ($self->{frame}) { 3325 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}]; 3326 my $anim = $::CONN->{anim}[$self->{anim}];
2860 3327
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3338 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3339 glDisable GL_TEXTURE_2D;
2873 } 3340 }
2874} 3341}
2875 3342
2876sub DESTROY { 3343sub destroy {
2877 my ($self) = @_; 3344 my ($self) = @_;
2878 3345
2879 $self->{timer}->cancel 3346 $self->{timer}->cancel
2880 if $self->{timer}; 3347 if $self->{timer};
2881 3348
2882 $self->SUPER::DESTROY; 3349 $self->SUPER::destroy;
2883} 3350}
2884 3351
2885############################################################################# 3352#############################################################################
2886 3353
2887package CFClient::UI::Buttonbar; 3354package CFPlus::UI::Buttonbar;
2888 3355
2889our @ISA = CFClient::UI::HBox::; 3356our @ISA = CFPlus::UI::HBox::;
2890 3357
2891# TODO: should actualyl wrap buttons and other goodies. 3358# TODO: should actually wrap buttons and other goodies.
2892 3359
2893############################################################################# 3360#############################################################################
2894 3361
2895package CFClient::UI::Menu; 3362package CFPlus::UI::Menu;
2896 3363
2897our @ISA = CFClient::UI::FancyFrame::; 3364our @ISA = CFPlus::UI::Toplevel::;
2898 3365
2899use CFClient::OpenGL; 3366use CFPlus::OpenGL;
2900 3367
2901sub new { 3368sub new {
2902 my $class = shift; 3369 my $class = shift;
2903 3370
2904 my $self = $class->SUPER::new ( 3371 my $self = $class->SUPER::new (
2905 items => [], 3372 items => [],
2906 z => 100, 3373 z => 100,
2907 @_, 3374 @_,
2908 ); 3375 );
2909 3376
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3377 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3378
2912 for my $item (@{ $self->{items} }) { 3379 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3380 my ($widget, $cb, $tooltip) = @$item;
2914 3381
2915 # handle various types of items, only text for now 3382 # handle various types of items, only text for now
2916 if (!ref $widget) { 3383 if (!ref $widget) {
3384 if ($widget =~ /\t/) {
3385 my ($left, $right) = split /\t/, $widget, 2;
3386
2917 $widget = new CFClient::UI::Label 3387 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3388 can_hover => 1,
2919 can_events => 1, 3389 can_events => 1,
3390 tooltip => $tooltip,
3391 children => [
3392 (new CFPlus::UI::Label markup => $left, expand => 1),
3393 (new CFPlus::UI::Label markup => $right, align => +1),
3394 ],
3395 ;
3396
3397 } else {
3398 $widget = new CFPlus::UI::Label
3399 can_hover => 1,
3400 can_events => 1,
2920 text => $widget; 3401 markup => $widget,
3402 tooltip => $tooltip;
3403 }
2921 } 3404 }
2922 3405
2923 $self->{item}{$widget} = $item; 3406 $self->{item}{$widget} = $item;
2924 3407
2925 $self->{vbox}->add ($widget); 3408 $self->{vbox}->add ($widget);
… …
2930 3413
2931# popup given the event (must be a mouse button down event currently) 3414# popup given the event (must be a mouse button down event currently)
2932sub popup { 3415sub popup {
2933 my ($self, $ev) = @_; 3416 my ($self, $ev) = @_;
2934 3417
2935 $self->_emit ("popdown"); 3418 $self->emit ("popdown");
2936 3419
2937 # maybe save $GRAB? must be careful about events... 3420 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3421 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3422 $self->{button} = $ev->{button};
2940 3423
2941 $self->show; 3424 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3425 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3426}
2944 3427
2945sub mouse_motion { 3428sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3429 my ($self, $ev, $x, $y) = @_;
2947 3430
2948 # TODO: should use vbox->find_widget or so 3431 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3432 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3433 $self->{hover} = $self->{item}{$HOVER};
2951 3434
2952 0 3435 0
2953} 3436}
2954 3437
2955sub button_up { 3438sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3439 my ($self, $ev, $x, $y) = @_;
2957 3440
2958 if ($ev->{button} == $self->{button}) { 3441 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3442 undef $GRAB;
2960 $self->hide; 3443 $self->hide;
2961 3444
2962 $self->_emit ("popdown"); 3445 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3446 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3447 } else {
2965 return 0 3448 return 0
2966 } 3449 }
2967 3450
2968 1 3451 1
2969} 3452}
2970 3453
2971############################################################################# 3454#############################################################################
2972 3455
2973package CFClient::UI::Multiplexer; 3456package CFPlus::UI::Multiplexer;
2974 3457
2975our @ISA = CFClient::UI::Container::; 3458our @ISA = CFPlus::UI::Container::;
2976 3459
2977sub new { 3460sub new {
2978 my $class = shift; 3461 my $class = shift;
2979 3462
2980 my $self = $class->SUPER::new ( 3463 my $self = $class->SUPER::new (
… …
2994 3477
2995 $self->{current} = $self->{children}[0] 3478 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3479 if @{ $self->{children} };
2997} 3480}
2998 3481
3482sub get_current_page {
3483 my ($self) = @_;
3484
3485 $self->{current}
3486}
3487
2999sub set_current_page { 3488sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3489 my ($self, $page_or_widget) = @_;
3001 3490
3002 my $widget = ref $page_or_widget 3491 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3492 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3493 : $self->{children}[$page_or_widget];
3005 3494
3006 $self->{current} = $widget; 3495 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3496 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3497
3009 $self->_emit (page_changed => $self->{current}); 3498 $self->emit (page_changed => $self->{current});
3010 3499
3011 $self->realloc; 3500 $self->realloc;
3012} 3501}
3013 3502
3014sub visible_children { 3503sub visible_children {
… …
3019 my ($self) = @_; 3508 my ($self) = @_;
3020 3509
3021 $self->{current}->size_request 3510 $self->{current}->size_request
3022} 3511}
3023 3512
3024sub size_allocate { 3513sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
3026 3515
3027 $self->{current}->configure (0, 0, $w, $h); 3516 $self->{current}->configure (0, 0, $w, $h);
3517
3518 1
3028} 3519}
3029 3520
3030sub _draw { 3521sub _draw {
3031 my ($self) = @_; 3522 my ($self) = @_;
3032 3523
3033 $self->{current}->draw; 3524 $self->{current}->draw;
3034} 3525}
3035 3526
3036############################################################################# 3527#############################################################################
3037 3528
3038package CFClient::UI::Notebook; 3529package CFPlus::UI::Notebook;
3039 3530
3040our @ISA = CFClient::UI::VBox::; 3531our @ISA = CFPlus::UI::VBox::;
3041 3532
3042sub new { 3533sub new {
3043 my $class = shift; 3534 my $class = shift;
3044 3535
3045 my $self = $class->SUPER::new ( 3536 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3537 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3538 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self 3539 # filter => # will be put between multiplexer and $self
3049 @_, 3540 @_,
3050 ); 3541 );
3051 3542
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3543 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3056} 3547}
3057 3548
3058sub add { 3549sub add {
3059 my ($self, $title, $widget, $tooltip) = @_; 3550 my ($self, $title, $widget, $tooltip) = @_;
3060 3551
3061 Scalar::Util::weaken $self; 3552 CFPlus::weaken $self;
3062 3553
3063 $self->{buttonbar}->add (new CFClient::UI::Button 3554 $self->{buttonbar}->add (new CFPlus::UI::Button
3064 markup => $title, 3555 markup => $title,
3065 tooltip => $tooltip, 3556 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) }, 3557 on_activate => sub { $self->set_current_page ($widget) },
3067 ); 3558 );
3068 3559
3069 $self->{multiplexer}->add ($widget); 3560 $self->{multiplexer}->add ($widget);
3070} 3561}
3071 3562
3563sub get_current_page {
3564 my ($self) = @_;
3565
3566 $self->{multiplexer}->get_current_page
3567}
3568
3072sub set_current_page { 3569sub set_current_page {
3073 my ($self, $page) = @_; 3570 my ($self, $page) = @_;
3074 3571
3075 $self->{multiplexer}->set_current_page ($page); 3572 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3573 $self->emit (page_changed => $self->{multiplexer}{current});
3077} 3574}
3078 3575
3079############################################################################# 3576#############################################################################
3080 3577
3578package CFPlus::UI::Selector;
3579
3580use utf8;
3581
3582our @ISA = CFPlus::UI::Button::;
3583
3584sub new {
3585 my $class = shift;
3586
3587 my $self = $class->SUPER::new (
3588 options => [], # [value, title, longdesc], ...
3589 value => undef,
3590 @_,
3591 );
3592
3593 $self->_set_value ($self->{value});
3594
3595 $self
3596}
3597
3598sub invoke_button_down {
3599 my ($self, $ev) = @_;
3600
3601 my @menu_items;
3602
3603 for (@{ $self->{options} }) {
3604 my ($value, $title, $tooltip) = @$_;
3605
3606 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3607 }
3608
3609 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3610}
3611
3612sub _set_value {
3613 my ($self, $value) = @_;
3614
3615 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3616 or return;
3617
3618 $self->{value} = $item->[0];
3619 $self->set_markup ("$item->[1] ⇓");
3620 $self->set_tooltip ($item->[2]);
3621}
3622
3623sub set_value {
3624 my ($self, $value) = @_;
3625
3626 return unless $self->{value} ne $value;
3627
3628 $self->_set_value ($value);
3629 $self->emit (changed => $value);
3630}
3631
3632#############################################################################
3633
3081package CFClient::UI::Statusbox; 3634package CFPlus::UI::Statusbox;
3082 3635
3083our @ISA = CFClient::UI::VBox::; 3636our @ISA = CFPlus::UI::VBox::;
3084 3637
3085sub new { 3638sub new {
3086 my $class = shift; 3639 my $class = shift;
3087 3640
3088 my $self = $class->SUPER::new ( 3641 my $self = $class->SUPER::new (
3089 fontsize => 0.8, 3642 fontsize => 0.8,
3090 @_, 3643 @_,
3091 ); 3644 );
3092 3645
3093 Scalar::Util::weaken (my $this = $self); 3646 CFPlus::weaken (my $this = $self);
3094 3647
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3648 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096 3649
3097 $self 3650 $self
3098} 3651}
… …
3100sub reorder { 3653sub reorder {
3101 my ($self) = @_; 3654 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 3655 my $NOW = Time::HiRes::time;
3103 3656
3104 # freeze display when hovering over any label 3657 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 3658 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3659 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 3660 values %{ $self->{item} };
3108 3661
3109 while (my ($k, $v) = each %{ $self->{item} }) { 3662 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3663 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 3664 }
… …
3132 for ($short) { 3685 for ($short) {
3133 s/^\s+//; 3686 s/^\s+//;
3134 s/\s+/ /g; 3687 s/\s+/ /g;
3135 } 3688 }
3136 3689
3137 new CFClient::UI::Label 3690 new CFPlus::UI::Label
3138 markup => $short, 3691 markup => $short,
3139 tooltip => $item->{tooltip}, 3692 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 3693 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 3694 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 3695 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3180 $item->{count}++; 3733 $item->{count}++;
3181 } else { 3734 } else {
3182 $item->{count} = 1; 3735 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3736 $item->{text} = $item->{tooltip} = $text;
3184 } 3737 }
3185 $item->{id} = ++$self->{id}; 3738 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3739 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3740 delete $item->{label};
3188 } else { 3741 } else {
3189 $self->{item}{$group} = { 3742 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3743 id => ++$self->{id},
… …
3196 count => 1, 3749 count => 1,
3197 %arg, 3750 %arg,
3198 }; 3751 };
3199 } 3752 }
3200 3753
3754 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3755 $self->reorder;
3756 });
3202} 3757}
3203 3758
3204sub reconfigure { 3759sub reconfigure {
3205 my ($self) = @_; 3760 my ($self) = @_;
3206 3761
… …
3209 3764
3210 $self->reorder; 3765 $self->reorder;
3211 $self->SUPER::reconfigure; 3766 $self->SUPER::reconfigure;
3212} 3767}
3213 3768
3214sub DESTROY { 3769sub destroy {
3215 my ($self) = @_; 3770 my ($self) = @_;
3216 3771
3217 $self->{timer}->cancel; 3772 $self->{timer}->cancel;
3218 3773
3219 $self->SUPER::DESTROY; 3774 $self->SUPER::destroy;
3220} 3775}
3221 3776
3222############################################################################# 3777#############################################################################
3223 3778
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
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;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
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}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root; 3779package CFPlus::UI::Root;
3520 3780
3521our @ISA = CFClient::UI::Container::; 3781our @ISA = CFPlus::UI::Container::;
3522 3782
3523use List::Util qw(min max); 3783use List::Util qw(min max);
3524 3784
3525use CFClient::OpenGL; 3785use CFPlus::OpenGL;
3526 3786
3527sub new { 3787sub new {
3528 my $class = shift; 3788 my $class = shift;
3529 3789
3530 my $self = $class->SUPER::new ( 3790 my $self = $class->SUPER::new (
3531 visible => 1, 3791 visible => 1,
3532 @_, 3792 @_,
3533 ); 3793 );
3534 3794
3535 Scalar::Util::weaken ($self->{root} = $self); 3795 CFPlus::weaken ($self->{root} = $self);
3536 3796
3537 $self 3797 $self
3538} 3798}
3539 3799
3540sub size_request { 3800sub size_request {
… …
3555 $coord = $max - $size if $coord > $max - $size; 3815 $coord = $max - $size if $coord > $max - $size;
3556 3816
3557 int $coord + 0.5 3817 int $coord + 0.5
3558} 3818}
3559 3819
3560sub size_allocate { 3820sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3821 my ($self, $w, $h) = @_;
3562 3822
3563 for my $child ($self->children) { 3823 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3824 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3825
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3829 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3830 $Y = _to_pixel $Y, $H, $self->{h};
3571 3831
3572 $child->configure ($X, $Y, $W, $H); 3832 $child->configure ($X, $Y, $W, $H);
3573 } 3833 }
3834
3835 1
3574} 3836}
3575 3837
3576sub coord2local { 3838sub coord2local {
3577 my ($self, $x, $y) = @_; 3839 my ($self, $x, $y) = @_;
3578 3840
… …
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3966 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 3967
3706 $w = 0 if $w < 0; 3968 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0; 3969 $h = 0 if $h < 0;
3708 3970
3971 $w = max $widget->{min_w}, $w;
3972 $h = max $widget->{min_h}, $h;
3973
3974# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3975# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3976
3977 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3979
3709 $w = int $w + 0.5; 3980 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 3981 $h = int $h + 0.5;
3711 3982
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3983 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w}; 3984 $widget->{old_w} = $widget->{w};
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4007 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 4008 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 4009 glLoadIdentity;
3739 4010
3740 { 4011 {
3741 package CFClient::UI::Base; 4012 package CFPlus::UI::Base;
3742 4013
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 4014 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 4015 (0, 0, $self->{w}, $self->{h});
3745 }
3746 4016
3747 $self->_draw; 4017 $self->_draw;
4018 }
3748} 4019}
3749 4020
3750############################################################################# 4021#############################################################################
3751 4022
3752package CFClient::UI; 4023package CFPlus::UI;
3753 4024
3754$ROOT = new CFClient::UI::Root; 4025$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4026$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4027
37571 40281
3758 4029

Diff Legend

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