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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.364 by root, Sat Dec 23 10:18:27 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;
… …
1542 1766
1543sub realloc { 1767sub realloc {
1544 my ($self) = @_; 1768 my ($self) = @_;
1545 1769
1546 delete $self->{ox}; 1770 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1771 $self->SUPER::realloc;
1549} 1772}
1550 1773
1551sub set_text { 1774sub set_text {
1552 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1553 1776
1554 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1556 1779
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1559 1781
1782 delete $self->{size_req};
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);
1574 1796
1797 delete $self->{size_req};
1575 $self->realloc; 1798 $self->realloc;
1576 $self->update; 1799 $self->update;
1577} 1800}
1578 1801
1579sub size_request { 1802sub size_request {
1580 my ($self) = @_; 1803 my ($self) = @_;
1581 1804
1582 if (exists $self->{req_h}) { 1805 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1806 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1807 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1808 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 1811
1591 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1592 1813
1593 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1594 $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);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1818
1597 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1598 1820
1599 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1822 $h = List::Util::max $h, $h2;
1601 } 1823 }
1602 1824
1603 ($w, $h) 1825 [$w, $h]
1604 } 1826 };
1605}
1606 1827
1828 @{ $self->{size_req} }
1829}
1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1607sub size_allocate { 1835sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1609 1837
1610 delete $self->{ox}; 1838 delete $self->{ox};
1611 1839
1612 delete $self->{texture} 1840 delete $self->{texture}
1613 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
1614} 1844}
1615 1845
1616sub set_fontsize { 1846sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1618 1848
1619 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1620 delete $self->{texture}; 1851 delete $self->{texture};
1621 1852
1622 $self->realloc; 1853 $self->realloc;
1623} 1854}
1624 1855
1856sub reconfigure {
1857 my ($self) = @_;
1858
1859 delete $self->{size_req};
1860 delete $self->{texture};
1861
1862 $self->SUPER::reconfigure;
1863}
1864
1625sub _draw { 1865sub _draw {
1626 my ($self) = @_; 1866 my ($self) = @_;
1627 1867
1628 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1629 1869
1630 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 1877
1638 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1639 }; 1879 };
1640 1880
1641 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1645 1885
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 1889 };
1650 1890
1651 glEnable GL_TEXTURE_2D; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 1893
1654 glColor_premultiply @{$self->{fg}} 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 1895}
1661 1896
1662############################################################################# 1897#############################################################################
1663 1898
1664package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1665 1900
1666our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1667 1902
1668use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1669 1904
1670sub new { 1905sub new {
1671 my $class = shift; 1906 my $class = shift;
1672 1907
1673 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1677 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1678 can_hover => 1, 1913 can_hover => 1,
1679 can_focus => 1, 1914 can_focus => 1,
1680 valign => 0, 1915 valign => 0,
1681 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1682 #text => ... 1918 #text => ...
1919 #hidden => "*",
1683 @_ 1920 @_
1684 ) 1921 )
1685} 1922}
1686 1923
1687sub _set_text { 1924sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1932 $self->{text} = $text;
1696 1933
1697 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1699 1937
1700 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1701 $self->update; 1941 $self->update;
1702} 1942}
1703 1943
1704sub set_text { 1944sub set_text {
1705 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1706 1946
1707 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1948 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1949}
1712 1950
1713sub get_text { 1951sub get_text {
1714 $_[0]{text} 1952 $_[0]{text}
1715} 1953}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1721 1959
1722 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1723} 1961}
1724 1962
1725sub key_down { 1963sub invoke_key_down {
1726 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1727 1965
1728 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1733 1971
1734 if ($uni == 8) { 1972 if ($uni == 8) {
1735 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1737 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1738 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1739 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1740 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1741 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1742 } 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 = "";
1743 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1996 $self->emit ('escape');
1748 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 2001 } else {
1751 return 0; 2002 return 0;
1752 } 2003 }
1753 2004
1754 $self->_set_text ($text); 2005 $self->_set_text ($text);
1755 2006
1756 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1757 2009
1758 1 2010 1
1759} 2011}
1760 2012
1761sub focus_in { 2013sub invoke_focus_in {
1762 my ($self) = @_; 2014 my ($self) = @_;
1763 2015
1764 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1765 2017
1766 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1767} 2019}
1768 2020
1769sub button_down { 2021sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1771 2023
1772 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 2025
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 2027
1776 # byte-index to char-index 2028 # byte-index to char-index
1777 my $text = $self->{text}; 2029 my $text = $self->{text};
1778 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1780 2032
1781 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1782 $self->update; 2034 $self->update;
1783 2035
1784 1 2036 1
1785} 2037}
1786 2038
1787sub mouse_motion { 2039sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1789# 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#
1790 2042
1791 0 2043 1
1792} 2044}
1793 2045
1794sub _draw { 2046sub _draw {
1795 my ($self) = @_; 2047 my ($self) = @_;
1796 2048
… …
1823 utf8::encode $text; 2075 utf8::encode $text;
1824 2076
1825 @$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)
1826 } 2078 }
1827 2079
1828 glColor @{$self->{fg}};
1829 glBegin GL_LINES; 2080 glBegin GL_LINES;
1830 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};
1831 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};
1832 glEnd; 2083 glEnd;
1833 } 2084 }
1834} 2085}
1835 2086
2087#############################################################################
2088
1836package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1837 2090
1838our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1839 2092
1840use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1841 2094
1842sub key_down { 2095sub invoke_key_down {
1843 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1844 2097
1845 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1846 2099
1847 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1848 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
2103
1850 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 2106 $self->emit (activate => $txt);
1853 $self->update; 2107 $self->update;
1854 2108
1855 } elsif ($sym == CFClient::SDLK_UP) { 2109 } elsif ($sym == CFPlus::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 2110 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 2111 $self->{history_saveback} = $self->get_text;
1858 } 2112 }
1859 if (@{$self->{history} || []} > 0) { 2113 if (@{$self->{history} || []} > 0) {
1860 $self->{history_pointer}++; 2114 $self->{history_pointer}++;
… …
1862 $self->{history_pointer} = @{$self->{history} || []} - 1; 2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
1863 } 2117 }
1864 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1865 } 2119 }
1866 2120
1867 } elsif ($sym == CFClient::SDLK_DOWN) { 2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
1868 $self->{history_pointer}--; 2122 $self->{history_pointer}--;
1869 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870 2124
1871 if ($self->{history_pointer} >= 0) { 2125 if ($self->{history_pointer} >= 0) {
1872 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1873 } else { 2127 } else {
1874 $self->set_text ($self->{history_saveback}); 2128 $self->set_text ($self->{history_saveback});
1875 } 2129 }
1876 2130
1877 } else { 2131 } else {
1878 return $self->SUPER::key_down ($ev) 2132 return $self->SUPER::invoke_key_down ($ev)
1879 } 2133 }
1880 2134
1881 1 2135 1
1882} 2136}
1883 2137
1884############################################################################# 2138#############################################################################
1885 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
1886package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1887 2180
1888our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1889 2182
1890use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1891 2184
1892my @tex = 2185my @tex =
1893 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1895 2188
1896sub new { 2189sub new {
1897 my $class = shift; 2190 my $class = shift;
1898 2191
… …
1907 can_events => 1, 2200 can_events => 1,
1908 @_ 2201 @_
1909 ) 2202 )
1910} 2203}
1911 2204
1912sub activate { }
1913
1914sub button_up { 2205sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1916 2207
1917 $self->emit ("activate") 2208 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 2210 && $y >= 0 && $y < $self->{h};
… …
1937 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1938} 2229}
1939 2230
1940############################################################################# 2231#############################################################################
1941 2232
1942package CFClient::UI::CheckBox; 2233package CFPlus::UI::CheckBox;
1943 2234
1944our @ISA = CFClient::UI::DrawBG::; 2235our @ISA = CFPlus::UI::DrawBG::;
1945 2236
1946my @tex = 2237my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949 2240
1950use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1951 2242
1952sub new { 2243sub new {
1953 my $class = shift; 2244 my $class = shift;
1954 2245
1955 $class->SUPER::new ( 2246 $class->SUPER::new (
… …
1969 my ($self) = @_; 2260 my ($self) = @_;
1970 2261
1971 (6) x 2 2262 (6) x 2
1972} 2263}
1973 2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
1974sub button_down { 2273sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2274 my ($self, $ev, $x, $y) = @_;
1976 2275
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2278 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2279 } else {
1982 return 0 2280 return 0
1983 } 2281 }
1984 2282
1985 1 2283 1
… …
2005 glDisable GL_TEXTURE_2D; 2303 glDisable GL_TEXTURE_2D;
2006} 2304}
2007 2305
2008############################################################################# 2306#############################################################################
2009 2307
2010package CFClient::UI::Image; 2308package CFPlus::UI::Image;
2011 2309
2012our @ISA = CFClient::UI::Base::; 2310our @ISA = CFPlus::UI::Base::;
2013 2311
2014use CFClient::OpenGL; 2312use CFPlus::OpenGL;
2015use Carp qw/confess/;
2016 2313
2017our %loaded_images; 2314our %texture_cache;
2018 2315
2019sub new { 2316sub new {
2020 my $class = shift; 2317 my $class = shift;
2021 2318
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
2023 2323
2024 $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";
2025 2326
2026 $loaded_images{$self->{image}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2027 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;
2028 2329
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2030 2331
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2333
2035 $self 2334 $self
2036} 2335}
2037 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
2038sub size_request { 2352sub size_request {
2039 my ($self) = @_; 2353 my ($self) = @_;
2040 2354
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2355 ($self->{tex}{w}, $self->{tex}{h})
2042} 2356}
2043 2357
2044sub _draw { 2358sub _draw {
2045 my ($self) = @_; 2359 my ($self) = @_;
2046 2360
… …
2056 } 2370 }
2057 2371
2058 glEnable GL_TEXTURE_2D; 2372 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2374
2061 $tex->draw_quad_alpha (0, 0, $w, $h); 2375 $tex->draw_quad (0, 0, $w, $h);
2062 2376
2063 glDisable GL_TEXTURE_2D; 2377 glDisable GL_TEXTURE_2D;
2064} 2378}
2065 2379
2066############################################################################# 2380#############################################################################
2067 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
2068package CFClient::UI::VGauge; 2418package CFPlus::UI::VGauge;
2069 2419
2070our @ISA = CFClient::UI::Base::; 2420our @ISA = CFPlus::UI::Base::;
2071 2421
2072use List::Util qw(min max); 2422use List::Util qw(min max);
2073 2423
2074use CFClient::OpenGL; 2424use CFPlus::OpenGL;
2075 2425
2076my %tex = ( 2426my %tex = (
2077 food => [ 2427 food => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080 ], 2430 ],
2081 grace => [ 2431 grace => [
2082 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083 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/
2084 ], 2434 ],
2085 hp => [ 2435 hp => [
2086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088 ], 2438 ],
2089 mana => [ 2439 mana => [
2090 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091 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/
2092 ], 2442 ],
2093); 2443);
2094 2444
2095# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2505 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2507
2158 my $h1 = $self->{h} * (1 - $ycut1); 2508 my $h1 = $self->{h} * (1 - $ycut1);
2159 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);
2160 2513
2161 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2515 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2516 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
… …
2183 2536
2184 if ($t3) { 2537 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2539 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2544 glEnd;
2192 } 2545 }
2193 2546
2194 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
2195 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2196} 2549}
2197 2550
2198############################################################################# 2551#############################################################################
2199 2552
2200package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
2201 2554
2202our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
2203 2556
2204sub new { 2557sub new {
2205 my ($class, %arg) = @_; 2558 my ($class, %arg) = @_;
2206 2559
2207 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
… …
2209 can_hover => 1, 2562 can_hover => 1,
2210 can_events => 1, 2563 can_events => 1,
2211 %arg, 2564 %arg,
2212 ); 2565 );
2213 2566
2214 $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");
2215 $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);
2216 $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");
2217 2570
2218 $self 2571 $self
2219} 2572}
2220 2573
2221sub set_fontsize { 2574sub set_fontsize {
… …
2242 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
2243} 2596}
2244 2597
2245############################################################################# 2598#############################################################################
2246 2599
2247package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
2248 2601
2249use strict; 2602use strict;
2250 2603
2251use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2252 2605
2253our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
2254 2607
2255my @tex = 2608my @tex =
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
2258 2611
2259sub new { 2612sub new {
2260 my $class = shift; 2613 my $class = shift;
2261 2614
… …
2282 $self->update; 2635 $self->update;
2283 2636
2284 $self 2637 $self
2285} 2638}
2286 2639
2287sub changed { }
2288
2289sub set_range { 2640sub set_range {
2290 my ($self, $range) = @_; 2641 my ($self, $range) = @_;
2291 2642
2292 ($range, $self->{range}) = ($self->{range}, $range); 2643 ($range, $self->{range}) = ($self->{range}, $range);
2293 2644
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2645 if ("@$range" ne "@{$self->{range}}") {
2646 $self->update;
2647 $self->set_value ($self->{range}[0]);
2648 }
2296} 2649}
2297 2650
2298sub set_value { 2651sub set_value {
2299 my ($self, $value) = @_; 2652 my ($self, $value) = @_;
2300 2653
… …
2311 if $unit; 2664 if $unit;
2312 2665
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2667
2315 if ($value != $old_value) { 2668 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2669 $self->emit (changed => $value);
2317 $self->update; 2670 $self->update;
2318 } 2671 }
2319} 2672}
2320 2673
2321sub size_request { 2674sub size_request {
2322 my ($self) = @_; 2675 my ($self) = @_;
2323 2676
2324 ($self->{req_w}, $self->{req_h}) 2677 ($self->{req_w}, $self->{req_h})
2325} 2678}
2326 2679
2327sub button_down { 2680sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2329 2682
2330 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2684
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2686
2334 $self->mouse_motion ($ev, $x, $y) 2687 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2688}
2336 2689
2337sub mouse_motion { 2690sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2339 2692
2340 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2695
… …
2348 } else { 2701 } else {
2349 return 0; 2702 return 0;
2350 } 2703 }
2351 2704
2352 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 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2714
2715 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2716
2717 ! ! $delta
2353} 2718}
2354 2719
2355sub update { 2720sub update {
2356 my ($self) = @_; 2721 my ($self) = @_;
2357 2722
… …
2406 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2407} 2772}
2408 2773
2409############################################################################# 2774#############################################################################
2410 2775
2411package CFClient::UI::ValSlider; 2776package CFPlus::UI::ValSlider;
2412 2777
2413our @ISA = CFClient::UI::HBox::; 2778our @ISA = CFPlus::UI::HBox::;
2414 2779
2415sub new { 2780sub new {
2416 my ($class, %arg) = @_; 2781 my ($class, %arg) = @_;
2417 2782
2418 my $range = delete $arg{range}; 2783 my $range = delete $arg{range};
2419 2784
2420 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2421 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2786 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2787 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423 to_value => sub { shift }, 2788 to_value => sub { shift },
2424 from_value => sub { shift }, 2789 from_value => sub { shift },
2425 %arg, 2790 %arg,
2426 ); 2791 );
2427 2792
… …
2447sub set_range { shift->{slider}->set_range (@_) } 2812sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2813sub set_value { shift->{slider}->set_value (@_) }
2449 2814
2450############################################################################# 2815#############################################################################
2451 2816
2452package CFClient::UI::TextView; 2817package CFPlus::UI::TextScroller;
2453 2818
2454our @ISA = CFClient::UI::HBox::; 2819our @ISA = CFPlus::UI::HBox::;
2455 2820
2456use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2457 2822
2458sub new { 2823sub new {
2459 my $class = shift; 2824 my $class = shift;
2460 2825
2461 my $self = $class->SUPER::new ( 2826 my $self = $class->SUPER::new (
2462 fontsize => 1, 2827 fontsize => 1,
2463 can_events => 0, 2828 can_events => 1,
2829 indent => 0,
2464 #font => default_font 2830 #font => default_font
2465 @_, 2831 @_,
2466 2832
2467 layout => (new CFClient::Layout 1), 2833 layout => (new CFPlus::Layout),
2468 par => [], 2834 par => [],
2469 height => 0, 2835 height => 0,
2470 children => [ 2836 children => [
2471 (new CFClient::UI::Empty expand => 1), 2837 (new CFPlus::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 2838 (new CFPlus::UI::Slider vertical => 1),
2473 ], 2839 ],
2474 ); 2840 );
2475 2841
2476 $self->{children}[1]->connect (changed => sub { $self->update }); 2842 $self->{children}[1]->connect (changed => sub { $self->update });
2477 2843
… …
2483 2849
2484 $self->{fontsize} = $fontsize; 2850 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2851 $self->reflow;
2486} 2852}
2487 2853
2854sub size_request {
2855 my ($self) = @_;
2856
2857 my ($empty, $slider) = @{ $self->{children} };
2858
2859 local $self->{children} = [$empty, $slider];
2860 $self->SUPER::size_request
2861}
2862
2488sub size_allocate { 2863sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2864 my ($self, $w, $h) = @_;
2490 2865
2491 $self->SUPER::size_allocate ($w, $h); 2866 my ($empty, $slider, @other) = @{ $self->{children} };
2867 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2868
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2869 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2870 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 2871 $self->{layout}->set_width ($empty->{w});
2872 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 2873
2497 $self->reflow; 2874 $self->reflow;
2498}
2499 2875
2500sub text_size { 2876 local $self->{children} = [$empty, $slider];
2877 $self->SUPER::invoke_size_allocate ($w, $h)
2878}
2879
2880sub invoke_mouse_wheel {
2501 my ($self, $text, $indent) = @_; 2881 my ($self, $ev) = @_;
2882
2883 return 0 unless $ev->{dy}; # only vertical movements
2884
2885 $self->{children}[1]->emit (mouse_wheel => $ev);
2886
2887 1
2888}
2889
2890sub get_layout {
2891 my ($self, $para) = @_;
2502 2892
2503 my $layout = $self->{layout}; 2893 my $layout = $self->{layout};
2504 2894
2895 $layout->set_font ($self->{font}) if $self->{font};
2896 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2897 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 2898 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2899 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 2900 $layout->set_markup ($para->{markup});
2901
2902 $layout->set_shapes (
2903 map
2904 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2905 @{$para->{widget}}
2508 2906 );
2907
2509 $layout->size 2908 $layout
2510} 2909}
2511 2910
2512sub reflow { 2911sub reflow {
2513 my ($self) = @_; 2912 my ($self) = @_;
2514 2913
… …
2521 2920
2522 # todo: base offset on lines or so, not on pixels 2921 # todo: base offset on lines or so, not on pixels
2523 $self->{children}[1]->set_value ($offset); 2922 $self->{children}[1]->set_value ($offset);
2524} 2923}
2525 2924
2925sub current_paragraph {
2926 my ($self) = @_;
2927
2928 $self->{top_paragraph} - 1
2929}
2930
2931sub scroll_to {
2932 my ($self, $para) = @_;
2933
2934 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2935
2936 $self->{scroll_to} = $para;
2937 $self->update;
2938}
2939
2526sub clear { 2940sub clear {
2527 my ($self) = @_; 2941 my ($self) = @_;
2942
2943 my (undef, undef, @other) = @{ $self->{children} };
2944 $self->remove ($_) for @other;
2528 2945
2529 $self->{par} = []; 2946 $self->{par} = [];
2530 $self->{height} = 0; 2947 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2948 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2949}
2533 2950
2534sub add_paragraph { 2951sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2952 my $self = shift;
2536 2953
2537 for my $line (split /\n/, $text) { 2954 for my $para (@_) {
2538 my ($w, $h) = $self->text_size ($line); 2955 $para = {
2956 fg => [1, 1, 1, 1],
2957 indent => 0,
2958 markup => "",
2959 widget => [],
2960 ref $para ? %$para : (markup => $para),
2961 w => 1e10,
2962 wrapped => 1,
2963 };
2964
2965 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2966 push @{$self->{par}}, $para;
2967 }
2968
2969 $self->{need_reflow}++;
2970 $self->update;
2971}
2972
2973sub scroll_to_bottom {
2974 my ($self) = @_;
2975
2976 $self->{scroll_to} = $#{$self->{par}};
2977 $self->update;
2978}
2979
2980sub force_uptodate {
2981 my ($self) = @_;
2982
2983 if (delete $self->{need_reflow}) {
2984 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2985
2986 my $height = 0;
2987
2988 for my $para (@{$self->{par}}) {
2989 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2990 my $layout = $self->get_layout ($para);
2991 my ($w, $h) = $layout->size;
2992
2993 $para->{w} = $w + $para->{indent};
2994 $para->{h} = $h;
2995 $para->{wrapped} = $layout->has_wrapped;
2996 }
2997
2998 $para->{y} = $height;
2999 $height += $para->{h};
3000 }
3001
2539 $self->{height} += $h; 3002 $self->{height} = $height;
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3003 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2541 }
2542 3004
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3005 delete $self->{texture};
3006 }
3007
3008 if (my $paridx = delete $self->{scroll_to}) {
3009 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3010 }
2544} 3011}
2545 3012
2546sub update { 3013sub update {
2547 my ($self) = @_; 3014 my ($self) = @_;
2548 3015
… …
2550 3017
2551 return unless $self->{h} > 0; 3018 return unless $self->{h} > 0;
2552 3019
2553 delete $self->{texture}; 3020 delete $self->{texture};
2554 3021
2555 $ROOT->on_post_alloc ($self, sub { 3022 $ROOT->on_post_alloc ($self => sub {
3023 $self->force_uptodate;
3024
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3025 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 3026
2558 if (delete $self->{need_reflow}) {
2559 my $height = 0;
2560
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567 $layout->set_width ($W - $_->[3]);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3];
2571 $_->[1] = $h;
2572 }
2573
2574 $height += $_->[1];
2575 }
2576
2577 $self->{height} = $height;
2578
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2580
2581 delete $self->{texture};
2582 }
2583
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3027 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 3028 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 3029 glClear GL_COLOR_BUFFER_BIT;
2587 3030
3031 package CFPlus::UI::Base;
3032 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3033 (0, 0, $self->{w}, $self->{h});
3034
3035 my $top = int $self->{children}[1]{range}[0];
3036
3037 my $paridx = 0;
3038 my $top_paragraph;
2588 my $top = int $self->{children}[1]{range}[0]; 3039 my $top = int $self->{children}[1]{range}[0];
2589 3040
2590 my $y0 = $top; 3041 my $y0 = $top;
2591 my $y1 = $top + $H; 3042 my $y1 = $top + $H;
2592 3043
2593 my $y = 0;
2594
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 3044 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 3045 my $h = $para->{h};
3046 my $y = $para->{y};
2605 3047
2606 if ($y0 < $y + $h && $y < $y1) { 3048 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] }); 3049 my $layout = $self->get_layout ($para);
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 3050
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3051 $layout->render ($para->{indent}, $y - $y0);
2612 3052
2613 glRasterPos $par->[3], $y - $y0; 3053 if (my @w = @{ $para->{widget} }) {
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3054 my @s = $layout->get_shapes;
3055
3056 for (@w) {
3057 my ($dx, $dy) = splice @s, 0, 2, ();
3058
3059 $_->{x} = $dx + $para->{indent};
3060 $_->{y} = $dy + $y - $y0;
3061
3062 $_->draw;
3063 }
3064 }
2615 } 3065 }
2616 3066
2617 $y += $h; 3067 $paridx++;
3068 $top_paragraph ||= $paridx if $y >= $top;
2618 } 3069 }
2619 3070
2620 glDisable GL_BLEND; 3071 $self->{top_paragraph} = $top_paragraph;
2621 }; 3072 };
2622 }); 3073 });
3074}
3075
3076sub reconfigure {
3077 my ($self) = @_;
3078
3079 $self->SUPER::reconfigure;
3080
3081 $_->{w} = 1e10 for @{ $self->{par} };
3082 $self->reflow;
2623} 3083}
2624 3084
2625sub _draw { 3085sub _draw {
2626 my ($self) = @_; 3086 my ($self) = @_;
2627 3087
… …
2630 glColor 0, 0, 0, 1; 3090 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3091 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 3092 glDisable GL_TEXTURE_2D;
2633 3093
2634 $self->{children}[1]->draw; 3094 $self->{children}[1]->draw;
2635
2636} 3095}
2637 3096
2638############################################################################# 3097#############################################################################
2639 3098
2640package CFClient::UI::Animator; 3099package CFPlus::UI::Animator;
2641 3100
2642use CFClient::OpenGL; 3101use CFPlus::OpenGL;
2643 3102
2644our @ISA = CFClient::UI::Bin::; 3103our @ISA = CFPlus::UI::Bin::;
2645 3104
2646sub moveto { 3105sub moveto {
2647 my ($self, $x, $y) = @_; 3106 my ($self, $x, $y) = @_;
2648 3107
2649 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3108 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2677 glPopMatrix; 3136 glPopMatrix;
2678} 3137}
2679 3138
2680############################################################################# 3139#############################################################################
2681 3140
2682package CFClient::UI::Flopper; 3141package CFPlus::UI::Flopper;
2683 3142
2684our @ISA = CFClient::UI::Button::; 3143our @ISA = CFPlus::UI::Button::;
2685 3144
2686sub new { 3145sub new {
2687 my $class = shift; 3146 my $class = shift;
2688 3147
2689 my $self = $class->SUPER::new ( 3148 my $self = $class->SUPER::new (
… …
2701 $self->{other}->toggle_visibility; 3160 $self->{other}->toggle_visibility;
2702} 3161}
2703 3162
2704############################################################################# 3163#############################################################################
2705 3164
2706package CFClient::UI::Tooltip; 3165package CFPlus::UI::Tooltip;
2707 3166
2708our @ISA = CFClient::UI::Bin::; 3167our @ISA = CFPlus::UI::Bin::;
2709 3168
2710use CFClient::OpenGL; 3169use CFPlus::OpenGL;
2711 3170
2712sub new { 3171sub new {
2713 my $class = shift; 3172 my $class = shift;
2714 3173
2715 $class->SUPER::new ( 3174 $class->SUPER::new (
… …
2718 ) 3177 )
2719} 3178}
2720 3179
2721sub set_tooltip_from { 3180sub set_tooltip_from {
2722 my ($self, $widget) = @_; 3181 my ($self, $widget) = @_;
3182
3183 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3184 if $widget->{tooltip} =~ /^#(.*)$/;
2723 3185
2724 my $tooltip = $widget->{tooltip}; 3186 my $tooltip = $widget->{tooltip};
2725 3187
2726 if ($ENV{CFPLUS_DEBUG} & 2) { 3188 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 3189 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3190 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 3191 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 3192 . "visible $widget->{visible}";
2731 } 3193 }
2732 3194
3195 $tooltip =~ s/^\n+//;
3196 $tooltip =~ s/\n+$//;
3197
2733 $self->add (new CFClient::UI::Label 3198 $self->add (new CFPlus::UI::Label
2734 markup => $tooltip, 3199 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3200 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 3201 fontsize => 0.8,
2737 fg => [0, 0, 0, 1], 3202 style => 1, # FLAG_INVERSE
2738 ellipsise => 0, 3203 ellipsise => 0,
2739 font => ($widget->{tooltip_font} || $::FONT_PROP), 3204 font => ($widget->{tooltip_font} || $::FONT_PROP),
2740 ); 3205 );
2741} 3206}
2742 3207
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3211 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 3212
2748 ($w + 4, $h + 4) 3213 ($w + 4, $h + 4)
2749} 3214}
2750 3215
2751sub size_allocate { 3216sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 3217 my ($self, $w, $h) = @_;
2753 3218
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 3219 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 3220}
2756 3221
2757sub visibility_change { 3222sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 3223 my ($self, $visible) = @_;
2759 3224
2760 return unless $visible; 3225 return unless $visible;
2761 3226
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 3227 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner} 3228 my $widget = $self->{owner}
2764 or return; 3229 or return;
2765 3230
3231 if ($widget->{visible}) {
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3232 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 3233
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3234 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 3235 if $x + $self->{w} > $self->{root}{w};
2770 3236
2771 $self->move_abs ($x, $y); 3237 $self->move_abs ($x, $y);
3238 } else {
3239 $self->hide;
3240 }
2772 }); 3241 });
2773} 3242}
2774 3243
2775sub _draw { 3244sub _draw {
2776 my ($self) = @_; 3245 my ($self) = @_;
… …
2800 $self->SUPER::_draw; 3269 $self->SUPER::_draw;
2801} 3270}
2802 3271
2803############################################################################# 3272#############################################################################
2804 3273
2805package CFClient::UI::Face; 3274package CFPlus::UI::Face;
2806 3275
2807our @ISA = CFClient::UI::Base::; 3276our @ISA = CFPlus::UI::DrawBG::;
2808 3277
2809use CFClient::OpenGL; 3278use CFPlus::OpenGL;
2810 3279
2811sub new { 3280sub new {
2812 my $class = shift; 3281 my $class = shift;
2813 3282
2814 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
2816 can_events => 0, 3285 can_events => 0,
2817 @_, 3286 @_,
2818 ); 3287 );
2819 3288
2820 if ($self->{anim} && $self->{animspeed}) { 3289 if ($self->{anim} && $self->{animspeed}) {
2821 Scalar::Util::weaken (my $widget = $self); 3290 CFPlus::weaken (my $widget = $self);
2822 3291
2823 $self->{timer} = Event->timer ( 3292 $self->{timer} = Event->timer (
2824 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3293 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2825 hard => 1, 3294 hard => 1,
2826 interval => $self->{animspeed}, 3295 interval => $self->{animspeed},
… …
2849sub _draw { 3318sub _draw {
2850 my ($self) = @_; 3319 my ($self) = @_;
2851 3320
2852 return unless $::CONN; 3321 return unless $::CONN;
2853 3322
3323 $self->SUPER::_draw;
3324
2854 my $face; 3325 my $face;
2855 3326
2856 if ($self->{frame}) { 3327 if ($self->{frame}) {
2857 my $anim = $::CONN->{anim}[$self->{anim}]; 3328 my $anim = $::CONN->{anim}[$self->{anim}];
2858 3329
… …
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3340 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3341 glDisable GL_TEXTURE_2D;
2871 } 3342 }
2872} 3343}
2873 3344
2874sub DESTROY { 3345sub destroy {
2875 my ($self) = @_; 3346 my ($self) = @_;
2876 3347
2877 $self->{timer}->cancel 3348 $self->{timer}->cancel
2878 if $self->{timer}; 3349 if $self->{timer};
2879 3350
2880 $self->SUPER::DESTROY; 3351 $self->SUPER::destroy;
2881} 3352}
2882 3353
2883############################################################################# 3354#############################################################################
2884 3355
2885package CFClient::UI::Buttonbar; 3356package CFPlus::UI::Buttonbar;
2886 3357
2887our @ISA = CFClient::UI::HBox::; 3358our @ISA = CFPlus::UI::HBox::;
2888 3359
2889# TODO: should actualyl wrap buttons and other goodies. 3360# TODO: should actually wrap buttons and other goodies.
2890 3361
2891############################################################################# 3362#############################################################################
2892 3363
2893package CFClient::UI::Menu; 3364package CFPlus::UI::Menu;
2894 3365
2895our @ISA = CFClient::UI::FancyFrame::; 3366our @ISA = CFPlus::UI::Toplevel::;
2896 3367
2897use CFClient::OpenGL; 3368use CFPlus::OpenGL;
2898 3369
2899sub new { 3370sub new {
2900 my $class = shift; 3371 my $class = shift;
2901 3372
2902 my $self = $class->SUPER::new ( 3373 my $self = $class->SUPER::new (
2903 items => [], 3374 items => [],
2904 z => 100, 3375 z => 100,
2905 @_, 3376 @_,
2906 ); 3377 );
2907 3378
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3379 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909 3380
2910 for my $item (@{ $self->{items} }) { 3381 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3382 my ($widget, $cb, $tooltip) = @$item;
2912 3383
2913 # handle various types of items, only text for now 3384 # handle various types of items, only text for now
2914 if (!ref $widget) { 3385 if (!ref $widget) {
3386 if ($widget =~ /\t/) {
3387 my ($left, $right) = split /\t/, $widget, 2;
3388
2915 $widget = new CFClient::UI::Label 3389 $widget = new CFPlus::UI::HBox
2916 can_hover => 1, 3390 can_hover => 1,
2917 can_events => 1, 3391 can_events => 1,
3392 tooltip => $tooltip,
3393 children => [
3394 (new CFPlus::UI::Label markup => $left, expand => 1),
3395 (new CFPlus::UI::Label markup => $right, align => +1),
3396 ],
3397 ;
3398
3399 } else {
3400 $widget = new CFPlus::UI::Label
3401 can_hover => 1,
3402 can_events => 1,
2918 text => $widget; 3403 markup => $widget,
3404 tooltip => $tooltip;
3405 }
2919 } 3406 }
2920 3407
2921 $self->{item}{$widget} = $item; 3408 $self->{item}{$widget} = $item;
2922 3409
2923 $self->{vbox}->add ($widget); 3410 $self->{vbox}->add ($widget);
… …
2928 3415
2929# popup given the event (must be a mouse button down event currently) 3416# popup given the event (must be a mouse button down event currently)
2930sub popup { 3417sub popup {
2931 my ($self, $ev) = @_; 3418 my ($self, $ev) = @_;
2932 3419
2933 $self->_emit ("popdown"); 3420 $self->emit ("popdown");
2934 3421
2935 # maybe save $GRAB? must be careful about events... 3422 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3423 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3424 $self->{button} = $ev->{button};
2938 3425
2939 $self->show; 3426 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3427 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3428}
2942 3429
2943sub mouse_motion { 3430sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3431 my ($self, $ev, $x, $y) = @_;
2945 3432
2946 # TODO: should use vbox->find_widget or so 3433 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3434 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3435 $self->{hover} = $self->{item}{$HOVER};
2949 3436
2950 0 3437 0
2951} 3438}
2952 3439
2953sub button_up { 3440sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3441 my ($self, $ev, $x, $y) = @_;
2955 3442
2956 if ($ev->{button} == $self->{button}) { 3443 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3444 undef $GRAB;
2958 $self->hide; 3445 $self->hide;
2959 3446
2960 $self->_emit ("popdown"); 3447 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3448 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3449 } else {
2963 return 0 3450 return 0
2964 } 3451 }
2965 3452
2966 1 3453 1
2967} 3454}
2968 3455
2969############################################################################# 3456#############################################################################
2970 3457
2971package CFClient::UI::Multiplexer; 3458package CFPlus::UI::Multiplexer;
2972 3459
2973our @ISA = CFClient::UI::Container::; 3460our @ISA = CFPlus::UI::Container::;
2974 3461
2975sub new { 3462sub new {
2976 my $class = shift; 3463 my $class = shift;
2977 3464
2978 my $self = $class->SUPER::new ( 3465 my $self = $class->SUPER::new (
… …
2992 3479
2993 $self->{current} = $self->{children}[0] 3480 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3481 if @{ $self->{children} };
2995} 3482}
2996 3483
3484sub get_current_page {
3485 my ($self) = @_;
3486
3487 $self->{current}
3488}
3489
2997sub set_current_page { 3490sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3491 my ($self, $page_or_widget) = @_;
2999 3492
3000 my $widget = ref $page_or_widget 3493 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3494 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3495 : $self->{children}[$page_or_widget];
3003 3496
3004 $self->{current} = $widget; 3497 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3498 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3499
3007 $self->_emit (page_changed => $self->{current}); 3500 $self->emit (page_changed => $self->{current});
3008 3501
3009 $self->realloc; 3502 $self->realloc;
3010} 3503}
3011 3504
3012sub visible_children { 3505sub visible_children {
… …
3017 my ($self) = @_; 3510 my ($self) = @_;
3018 3511
3019 $self->{current}->size_request 3512 $self->{current}->size_request
3020} 3513}
3021 3514
3022sub size_allocate { 3515sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
3024 3517
3025 $self->{current}->configure (0, 0, $w, $h); 3518 $self->{current}->configure (0, 0, $w, $h);
3519
3520 1
3026} 3521}
3027 3522
3028sub _draw { 3523sub _draw {
3029 my ($self) = @_; 3524 my ($self) = @_;
3030 3525
3031 $self->{current}->draw; 3526 $self->{current}->draw;
3032} 3527}
3033 3528
3034############################################################################# 3529#############################################################################
3035 3530
3036package CFClient::UI::Notebook; 3531package CFPlus::UI::Notebook;
3037 3532
3038our @ISA = CFClient::UI::VBox::; 3533our @ISA = CFPlus::UI::VBox::;
3039 3534
3040sub new { 3535sub new {
3041 my $class = shift; 3536 my $class = shift;
3042 3537
3043 my $self = $class->SUPER::new ( 3538 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar), 3539 buttonbar => (new CFPlus::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3540 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self 3541 # filter => # will be put between multiplexer and $self
3047 @_, 3542 @_,
3048 ); 3543 );
3049 3544
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3545 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3054} 3549}
3055 3550
3056sub add { 3551sub add {
3057 my ($self, $title, $widget, $tooltip) = @_; 3552 my ($self, $title, $widget, $tooltip) = @_;
3058 3553
3059 Scalar::Util::weaken $self; 3554 CFPlus::weaken $self;
3060 3555
3061 $self->{buttonbar}->add (new CFClient::UI::Button 3556 $self->{buttonbar}->add (new CFPlus::UI::Button
3062 markup => $title, 3557 markup => $title,
3063 tooltip => $tooltip, 3558 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) }, 3559 on_activate => sub { $self->set_current_page ($widget) },
3065 ); 3560 );
3066 3561
3067 $self->{multiplexer}->add ($widget); 3562 $self->{multiplexer}->add ($widget);
3068} 3563}
3069 3564
3565sub get_current_page {
3566 my ($self) = @_;
3567
3568 $self->{multiplexer}->get_current_page
3569}
3570
3070sub set_current_page { 3571sub set_current_page {
3071 my ($self, $page) = @_; 3572 my ($self, $page) = @_;
3072 3573
3073 $self->{multiplexer}->set_current_page ($page); 3574 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3575 $self->emit (page_changed => $self->{multiplexer}{current});
3075} 3576}
3076 3577
3077############################################################################# 3578#############################################################################
3078 3579
3580package CFPlus::UI::Selector;
3581
3582use utf8;
3583
3584our @ISA = CFPlus::UI::Button::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3590 options => [], # [value, title, longdesc], ...
3591 value => undef,
3592 @_,
3593 );
3594
3595 $self->_set_value ($self->{value});
3596
3597 $self
3598}
3599
3600sub invoke_button_down {
3601 my ($self, $ev) = @_;
3602
3603 my @menu_items;
3604
3605 for (@{ $self->{options} }) {
3606 my ($value, $title, $tooltip) = @$_;
3607
3608 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3609 }
3610
3611 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3612}
3613
3614sub _set_value {
3615 my ($self, $value) = @_;
3616
3617 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3618 or return;
3619
3620 $self->{value} = $item->[0];
3621 $self->set_markup ("$item->[1] ⇓");
3622 $self->set_tooltip ($item->[2]);
3623}
3624
3625sub set_value {
3626 my ($self, $value) = @_;
3627
3628 return unless $self->{value} ne $value;
3629
3630 $self->_set_value ($value);
3631 $self->emit (changed => $value);
3632}
3633
3634#############################################################################
3635
3079package CFClient::UI::Statusbox; 3636package CFPlus::UI::Statusbox;
3080 3637
3081our @ISA = CFClient::UI::VBox::; 3638our @ISA = CFPlus::UI::VBox::;
3082 3639
3083sub new { 3640sub new {
3084 my $class = shift; 3641 my $class = shift;
3085 3642
3086 my $self = $class->SUPER::new ( 3643 my $self = $class->SUPER::new (
3087 fontsize => 0.8, 3644 fontsize => 0.8,
3088 @_, 3645 @_,
3089 ); 3646 );
3090 3647
3091 Scalar::Util::weaken (my $this = $self); 3648 CFPlus::weaken (my $this = $self);
3092 3649
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3650 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094 3651
3095 $self 3652 $self
3096} 3653}
… …
3098sub reorder { 3655sub reorder {
3099 my ($self) = @_; 3656 my ($self) = @_;
3100 my $NOW = Time::HiRes::time; 3657 my $NOW = Time::HiRes::time;
3101 3658
3102 # freeze display when hovering over any label 3659 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner} 3660 return if $CFPlus::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3661 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} }; 3662 values %{ $self->{item} };
3106 3663
3107 while (my ($k, $v) = each %{ $self->{item} }) { 3664 while (my ($k, $v) = each %{ $self->{item} }) {
3108 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3665 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109 } 3666 }
… …
3130 for ($short) { 3687 for ($short) {
3131 s/^\s+//; 3688 s/^\s+//;
3132 s/\s+/ /g; 3689 s/\s+/ /g;
3133 } 3690 }
3134 3691
3135 new CFClient::UI::Label 3692 new CFPlus::UI::Label
3136 markup => $short, 3693 markup => $short,
3137 tooltip => $item->{tooltip}, 3694 tooltip => $item->{tooltip},
3138 tooltip_font => $::FONT_PROP, 3695 tooltip_font => $::FONT_PROP,
3139 tooltip_width => 0.67, 3696 tooltip_width => 0.67,
3140 fontsize => $item->{fontsize} || $self->{fontsize}, 3697 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3178 $item->{count}++; 3735 $item->{count}++;
3179 } else { 3736 } else {
3180 $item->{count} = 1; 3737 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3738 $item->{text} = $item->{tooltip} = $text;
3182 } 3739 }
3183 $item->{id} = ++$self->{id}; 3740 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3741 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3742 delete $item->{label};
3186 } else { 3743 } else {
3187 $self->{item}{$group} = { 3744 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3745 id => ++$self->{id},
… …
3194 count => 1, 3751 count => 1,
3195 %arg, 3752 %arg,
3196 }; 3753 };
3197 } 3754 }
3198 3755
3756 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3757 $self->reorder;
3758 });
3200} 3759}
3201 3760
3202sub reconfigure { 3761sub reconfigure {
3203 my ($self) = @_; 3762 my ($self) = @_;
3204 3763
… …
3207 3766
3208 $self->reorder; 3767 $self->reorder;
3209 $self->SUPER::reconfigure; 3768 $self->SUPER::reconfigure;
3210} 3769}
3211 3770
3212sub DESTROY { 3771sub destroy {
3213 my ($self) = @_; 3772 my ($self) = @_;
3214 3773
3215 $self->{timer}->cancel; 3774 $self->{timer}->cancel;
3216 3775
3217 $self->SUPER::DESTROY; 3776 $self->SUPER::destroy;
3218} 3777}
3219 3778
3220############################################################################# 3779#############################################################################
3221 3780
3222package CFClient::UI::Inventory;
3223
3224our @ISA = CFClient::UI::ScrolledWindow::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
3471 @_,
3472 )
3473}
3474
3475# XXX: Do sorting? Argl...
3476sub add_spell {
3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
3479
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root; 3781package CFPlus::UI::Root;
3518 3782
3519our @ISA = CFClient::UI::Container::; 3783our @ISA = CFPlus::UI::Container::;
3520 3784
3521use List::Util qw(min max); 3785use List::Util qw(min max);
3522 3786
3523use CFClient::OpenGL; 3787use CFPlus::OpenGL;
3524 3788
3525sub new { 3789sub new {
3526 my $class = shift; 3790 my $class = shift;
3527 3791
3528 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
3529 visible => 1, 3793 visible => 1,
3530 @_, 3794 @_,
3531 ); 3795 );
3532 3796
3533 Scalar::Util::weaken ($self->{root} = $self); 3797 CFPlus::weaken ($self->{root} = $self);
3534 3798
3535 $self 3799 $self
3536} 3800}
3537 3801
3538sub size_request { 3802sub size_request {
… …
3553 $coord = $max - $size if $coord > $max - $size; 3817 $coord = $max - $size if $coord > $max - $size;
3554 3818
3555 int $coord + 0.5 3819 int $coord + 0.5
3556} 3820}
3557 3821
3558sub size_allocate { 3822sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3823 my ($self, $w, $h) = @_;
3560 3824
3561 for my $child ($self->children) { 3825 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3826 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 3827
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 3831 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3832 $Y = _to_pixel $Y, $H, $self->{h};
3569 3833
3570 $child->configure ($X, $Y, $W, $H); 3834 $child->configure ($X, $Y, $W, $H);
3571 } 3835 }
3836
3837 1
3572} 3838}
3573 3839
3574sub coord2local { 3840sub coord2local {
3575 my ($self, $x, $y) = @_; 3841 my ($self, $x, $y) = @_;
3576 3842
… …
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3968 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703 3969
3704 $w = 0 if $w < 0; 3970 $w = 0 if $w < 0;
3705 $h = 0 if $h < 0; 3971 $h = 0 if $h < 0;
3706 3972
3973 $w = max $widget->{min_w}, $w;
3974 $h = max $widget->{min_h}, $h;
3975
3976# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3977# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3978
3979 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3980 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3981
3707 $w = int $w + 0.5; 3982 $w = int $w + 0.5;
3708 $h = int $h + 0.5; 3983 $h = int $h + 0.5;
3709 3984
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3985 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w}; 3986 $widget->{old_w} = $widget->{w};
… …
3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4009 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735 glMatrixMode GL_MODELVIEW; 4010 glMatrixMode GL_MODELVIEW;
3736 glLoadIdentity; 4011 glLoadIdentity;
3737 4012
3738 { 4013 {
3739 package CFClient::UI::Base; 4014 package CFPlus::UI::Base;
3740 4015
3741 ($draw_x, $draw_y, $draw_w, $draw_h) = 4016 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h}); 4017 (0, 0, $self->{w}, $self->{h});
3743 }
3744 4018
3745 $self->_draw; 4019 $self->_draw;
4020 }
3746} 4021}
3747 4022
3748############################################################################# 4023#############################################################################
3749 4024
3750package CFClient::UI; 4025package CFPlus::UI;
3751 4026
3752$ROOT = new CFClient::UI::Root; 4027$ROOT = new CFPlus::UI::Root;
3753$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4028$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754 4029
37551 40301
3756 4031

Diff Legend

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