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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 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 ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
272 302
273 return unless $self->{visible}; 303 return unless $self->{visible};
274 304
275 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
276 306
307 delete $self->{visible};
277 delete $self->{root}; 308 delete $self->{root};
278 delete $self->{visible};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
315} 344}
316 345
317sub move_abs { 346sub move_abs {
318 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
319 348
320 $self->{x} = List::Util::max 0, int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
323 352
324 $self->update; 353 $self->update;
325} 354}
326 355
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
597 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 666}
600 667
601############################################################################# 668#############################################################################
602 669
603package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
604 671
605our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
606 673
607use strict; 674use strict;
608use CFClient::OpenGL; 675use CFPlus::OpenGL;
609 676
610sub new { 677sub new {
611 my $class = shift; 678 my $class = shift;
612 679
613 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
644 } 711 }
645} 712}
646 713
647############################################################################# 714#############################################################################
648 715
649package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
650 717
651our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
652 719
653sub new { 720sub new {
654 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
656} 723}
… …
663 730
664sub draw { } 731sub draw { }
665 732
666############################################################################# 733#############################################################################
667 734
668package CFClient::UI::Container; 735package CFPlus::UI::Container;
669 736
670our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
671 738
672sub new { 739sub new {
673 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
674 741
675 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
684 if $children; 751 if $children;
685 752
686 $self 753 $self
687} 754}
688 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
689sub add { 764sub add {
690 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
691 766
692 $_->set_parent ($self) 767 $_->set_parent ($self)
693 for @widgets; 768 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
754} 829}
755 830
756############################################################################# 831#############################################################################
757 832
758package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
759 834
760our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
761 836
762sub new { 837sub new {
763 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
764 839
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 841
767 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
768} 843}
769 844
770sub add { 845sub add {
771 my ($self, $child) = @_; 846 my ($self, $child) = @_;
772 847
773 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
776} 850}
777 851
778sub remove { 852sub remove {
779 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
780 854
781 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
782 856
783 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 858 unless @{$self->{children}};
785} 859}
786 860
787sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
788 862
789sub size_request { 863sub size_request {
790 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
791} 865}
792 866
793sub size_allocate { 867sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
795 869
796 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
797} 873}
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
817 893
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 895 $self->SUPER::update;
820} 896}
821 897
822sub size_allocate { 898sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
824 900
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
827} 904}
828 905
829sub _render { 906sub _render {
830 my ($self) = @_; 907 my ($self) = @_;
831 908
… …
833} 910}
834 911
835sub render_child { 912sub render_child {
836 my ($self) = @_; 913 my ($self) = @_;
837 914
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
841 918
842 { 919 {
843 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
844 921
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
847 } 926 }
848
849 $self->_render;
850 }; 927 };
851} 928}
852 929
853sub _draw { 930sub _draw {
854 my ($self) = @_; 931 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 932
858 my $tex = $self->{texture} 933 my $tex = $self->{texture}
859 or return; 934 or return;
860 935
861 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
864 939
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
866 941
867 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
868} 943}
869 944
870############################################################################# 945#############################################################################
871 946
872package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
873 948
874our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
875 950
876sub new { 951sub new {
877 my $class = shift; 952 my $class = shift;
878 953
879 $class->SUPER::new ( 954 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
893 968
894 ($w, $h) 969 ($w, $h)
895} 970}
896 971
897sub size_allocate { 972sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
899 974
900 my $child = $self->child; 975 my $child = $self->child;
901 976
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 979
905 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
906 $self->update; 981 $self->update;
982
983 1
907} 984}
908 985
909sub set_offset { 986sub set_offset {
910 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
911 988
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1016 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1018 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1020 }
944} 1021}
945 1022
946sub _render { 1023sub _render {
947 my ($self) = @_; 1024 my ($self) = @_;
948 1025
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1028
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1030
954 $self->SUPER::_render; 1031 $self->SUPER::_render;
955} 1032}
956 1033
957############################################################################# 1034#############################################################################
958 1035
959package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
960 1037
961our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
962 1039
963sub new { 1040sub new {
964 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
965 1042
966 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
967 1044
968 my $self; 1045 my $self;
969 1046
970 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1057 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1059 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1062 },
976 ; 1063 ;
977 1064
978 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
980 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
981 %arg, 1073 %arg,
982 ); 1074 );
983 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
985 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
986 1087
987 $self 1088 $self
988} 1089}
1090
1091#TODO# update range on size_allocate depending on child
989 1092
990sub add { 1093sub add {
991 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
992 1095
993 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
994} 1097}
995 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
996sub update { 1123sub update {
997 my ($self) = @_; 1124 my ($self) = @_;
998 1125
999 $self->SUPER::update; 1126 $self->SUPER::update;
1000 1127 $self->update_slider;
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1128}
1005 1129
1006sub size_allocate { 1130sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1008 1132
1133 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1135}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1136
1018############################################################################# 1137#############################################################################
1019 1138
1020package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1021 1140
1022our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1023 1142
1024use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1025 1144
1026sub new { 1145sub new {
1027 my $class = shift; 1146 my $class = shift;
1028 1147
1029 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1056} 1175}
1057 1176
1058############################################################################# 1177#############################################################################
1059 1178
1060package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1061 1180
1062our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1063 1182
1064use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1184
1074sub new { 1185sub new {
1075 my ($class, %arg) = @_; 1186 my ($class, %arg) = @_;
1076 1187
1077 my $title = delete $arg{title}; 1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1284
1285my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1287 mipmap => 1, wrap => 1;
1288
1289my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292
1293sub new {
1294 my ($class, %arg) = @_;
1078 1295
1079 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1299 border => 0.6,
1083 can_events => 1, 1300 can_events => 1,
1084 min_w => 16, 1301 min_w => 64,
1085 min_h => 16, 1302 min_h => 32,
1086 %arg, 1303 %arg,
1087 ); 1304 );
1088 1305
1089 $self->{title} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1307 align => 0,
1091 valign => 1, 1308 valign => 1,
1092 text => $title, 1309 text => $self->{title},
1093 fontsize => $self->{border} 1310 fontsize => $self->{border},
1094 if defined $title; 1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1095 1321
1096 $self 1322 $self
1097} 1323}
1098 1324
1099sub add { 1325sub add {
1100 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1101 1327
1102 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1331}
1105 1332
1106sub border { 1333sub border {
1107 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1108} 1335}
1109 1336
1110sub size_request { 1337sub size_request {
1111 my ($self) = @_; 1338 my ($self) = @_;
1112 1339
1113 $self->{title}->size_request 1340 $self->{title_widget}->size_request
1114 if $self->{title}; 1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1115 1345
1116 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1117 1347
1118 ( 1348 (
1119 $w + $self->border * 2, 1349 $w + $self->border * 2,
1120 $h + $self->border * 2, 1350 $h + $self->border * 2,
1121 ) 1351 )
1122} 1352}
1123 1353
1124sub size_allocate { 1354sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1126 1356
1127 if ($self->{title}) { 1357 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1358 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1359 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1361 }
1132 1362
1133 my $border = $self->border; 1363 my $border = $self->border;
1134 1364
1135 $h -= List::Util::max 0, $border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1367
1368 $self->child->configure ($border, $border, $w, $h);
1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1137 1380
1138 $self->child->configure ($border, $border, $w, $h); 1381 1
1139} 1382}
1140 1383
1141sub button_down { 1384sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1143 1386
1144 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1388 my $border = $self->border;
1146 1389
… …
1177 1420
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1422
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1424 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1426 };
1184 } else { 1427 } else {
1185 return 0; 1428 return 0;
1186 } 1429 }
1187 1430
1188 1 1431 1
1189} 1432}
1190 1433
1191sub button_up { 1434sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1193 1436
1194 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1195} 1438}
1196 1439
1197sub mouse_motion { 1440sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1199 1442
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1444
1202 !!$self->{motion} 1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1203} 1454}
1204 1455
1205sub _draw { 1456sub _draw {
1206 my ($self) = @_; 1457 my ($self) = @_;
1207 1458
… …
1233 1484
1234 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1235 1486
1236 $child->draw; 1487 $child->draw;
1237 1488
1238 if ($self->{title}) { 1489 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1490 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1241 } 1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1242} 1498}
1243 1499
1244############################################################################# 1500#############################################################################
1245 1501
1246package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1247 1503
1248our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1249 1505
1250use List::Util qw(max sum); 1506use List::Util qw(max sum);
1251 1507
1252use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1253 1509
1254sub new { 1510sub new {
1255 my $class = shift; 1511 my $class = shift;
1256 1512
1257 $class->SUPER::new ( 1513 $class->SUPER::new (
1258 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1259 @_, 1516 @_,
1260 ) 1517 )
1261} 1518}
1262 1519
1263sub children { 1520sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1522}
1266 1523
1267sub add { 1524sub add {
1268 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1269 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1529 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1272 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1274} 1542}
1275 1543
1276# TODO: move to container class maybe? send children a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1545sub clear {
1278 my ($self) = @_; 1546 my ($self) = @_;
… …
1319 (sum @$ws), 1587 (sum @$ws),
1320 (sum @$hs), 1588 (sum @$hs),
1321 ) 1589 )
1322} 1590}
1323 1591
1324sub size_allocate { 1592sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1326 1594
1327 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1328 1596
1329 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1331 1599
1332 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1336 1604
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1606
1341 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1342 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1343 1616
1344 my $y; 1617 my $y;
1345 1618
1346 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1361 } 1634 }
1362 1635
1363 $y += $row_h; 1636 $y += $row_h;
1364 } 1637 }
1365 1638
1639 1
1366} 1640}
1367 1641
1368sub find_widget { 1642sub find_widget {
1369 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1370 1644
… …
1389 } 1663 }
1390} 1664}
1391 1665
1392############################################################################# 1666#############################################################################
1393 1667
1394package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1395 1669
1396our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1397 1671
1398sub size_request { 1672sub size_request {
1399 my ($self) = @_; 1673 my ($self) = @_;
1400 1674
1401 $self->{vertical} 1675 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1683 )
1410} 1684}
1411 1685
1412sub size_allocate { 1686sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1414 1688
1415 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1417 1691
1418 my @req; 1692 my @req;
1419 1693
1420 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1422 } else { 1696 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1425 1699
1426 if ($req > $space) { 1700 if ($req > $space) {
1427 # ah well, not enough space 1701 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1429 } else { 1703 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1705
1432 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1433 1707
1434 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1709 for 0 .. $#children;
1436 } 1710 }
1437 } 1711 }
1438 1712
1439 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1440 1714
1441 my $pos = 0; 1715 my $pos = 0;
1442 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1719
1446 $pos += $alloc; 1720 $pos += $alloc;
1447 } 1721 }
1448 1722
1449 1 1723 1
1450} 1724}
1451 1725
1452############################################################################# 1726#############################################################################
1453 1727
1454package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1455 1729
1456our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1457 1731
1458sub new { 1732sub new {
1459 my $class = shift; 1733 my $class = shift;
1460 1734
1461 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1464 ) 1738 )
1465} 1739}
1466 1740
1467############################################################################# 1741#############################################################################
1468 1742
1469package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1470 1744
1471our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1472 1746
1473sub new { 1747sub new {
1474 my $class = shift; 1748 my $class = shift;
1475 1749
1476 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1479 ) 1753 )
1480} 1754}
1481 1755
1482############################################################################# 1756#############################################################################
1483 1757
1484package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1485 1759
1486our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1487 1761
1488use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1489 1763
1490sub new { 1764sub new {
1491 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1492 1766
1493 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1770 #active_bg => none
1497 #font => default_font 1771 #font => default_font
1498 #text => initial text 1772 #text => initial text
1499 #markup => initial narkup 1773 #markup => initial narkup
1500 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1501 ellipsise => 3, # end 1776 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1778 fontsize => 1,
1504 align => -1, 1779 align => -1,
1505 valign => -1, 1780 valign => -1,
1506 padding_x => 2, 1781 padding_x => 2,
1507 padding_y => 2, 1782 padding_y => 2,
1508 can_events => 0, 1783 can_events => 0,
1509 %arg 1784 %arg
1510 ); 1785 );
1511 1786
1512 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1790 $self->{template} = $layout;
1516 } 1791 }
1517 1792
1518 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1522 } 1797 }
1523 1798
1524 $self 1799 $self
1525} 1800}
1526 1801
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1802sub update {
1538 my ($self) = @_; 1803 my ($self) = @_;
1539 1804
1540 delete $self->{texture}; 1805 delete $self->{texture};
1541 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1553 1818
1554 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1556 1821
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1559 1823
1560 delete $self->{size_req}; 1824 delete $self->{size_req};
1561 $self->realloc; 1825 $self->realloc;
1562 $self->update; 1826 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1570 1834
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1836
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1575 1838
1576 delete $self->{size_req}; 1839 delete $self->{size_req};
1577 $self->realloc; 1840 $self->realloc;
1578 $self->update; 1841 $self->update;
… …
1590 1853
1591 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1592 1855
1593 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1860
1597 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1598 1862
1599 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
… …
1604 }; 1868 };
1605 1869
1606 @{ $self->{size_req} } 1870 @{ $self->{size_req} }
1607} 1871}
1608 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1609sub size_allocate { 1877sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1611 1879
1612 delete $self->{ox}; 1880 delete $self->{ox};
1613 1881
1614 delete $self->{texture} 1882 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1616} 1886}
1617 1887
1618sub set_fontsize { 1888sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1620 1890
1621 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1622 delete $self->{texture}; 1893 delete $self->{texture};
1623 1894
1624 $self->realloc; 1895 $self->realloc;
1625} 1896}
1626 1897
1627sub reconfigure { 1898sub reconfigure {
1628 my ($self) = @_; 1899 my ($self) = @_;
1629 1900
1630 delete $self->{size_req}; 1901 delete $self->{size_req};
1902 delete $self->{texture};
1631 1903
1632 $self->SUPER::reconfigure; 1904 $self->SUPER::reconfigure;
1633} 1905}
1634 1906
1635sub _draw { 1907sub _draw {
1636 my ($self) = @_; 1908 my ($self) = @_;
1637 1909
1638 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1639 1911
1640 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1919
1648 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1649 }; 1921 };
1650 1922
1651 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1655 1927
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1931 };
1660 1932
1661 glEnable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1662 1935
1663 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 1937}
1674 1938
1675############################################################################# 1939#############################################################################
1676 1940
1677package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1678 1942
1679our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1680 1944
1681use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1682 1946
1683sub new { 1947sub new {
1684 my $class = shift; 1948 my $class = shift;
1685 1949
1686 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1690 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1691 can_hover => 1, 1955 can_hover => 1,
1692 can_focus => 1, 1956 can_focus => 1,
1693 valign => 0, 1957 valign => 0,
1694 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1695 #text => ... 1960 #text => ...
1696 #hidden => "*", 1961 #hidden => "*",
1697 @_ 1962 @_
1698 ) 1963 )
1699} 1964}
… …
1710 1975
1711 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 1978 delete $self->{size_req};
1714 1979
1715 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1716 1981
1717 $self->realloc; 1982 $self->realloc;
1718 $self->update; 1983 $self->update;
1719} 1984}
1720 1985
… …
1735 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1736 2001
1737 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1738} 2003}
1739 2004
1740sub key_down { 2005sub invoke_key_down {
1741 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1742 2007
1743 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1746 2011
1747 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1748 2015
1749 if ($uni == 8) { 2016 if ($uni == 8) {
1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1752 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1753 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1754 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1755 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1756 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1757 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1758 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 2040 $self->emit ('escape');
1763 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 2045 } else {
1766 return 0; 2046 return 0;
1767 } 2047 }
1768 2048
1769 $self->_set_text ($text); 2049 $self->_set_text ($text);
1770 2050
1771 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1772 2053
1773 1 2054 1
1774} 2055}
1775 2056
1776sub focus_in { 2057sub invoke_focus_in {
1777 my ($self) = @_; 2058 my ($self) = @_;
1778 2059
1779 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1780 2061
1781 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1782} 2063}
1783 2064
1784sub button_down { 2065sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1786 2067
1787 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 2069
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 2071
1791 # byte-index to char-index 2072 # byte-index to char-index
1792 my $text = $self->{text}; 2073 my $text = $self->{text};
1793 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1795 2076
1796 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1797 $self->update; 2078 $self->update;
1798 2079
1799 1 2080 1
1800} 2081}
1801 2082
1802sub mouse_motion { 2083sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805 2086
1806 0 2087 1
1807} 2088}
1808 2089
1809sub _draw { 2090sub _draw {
1810 my ($self) = @_; 2091 my ($self) = @_;
1811 2092
… …
1838 utf8::encode $text; 2119 utf8::encode $text;
1839 2120
1840 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1841 } 2122 }
1842 2123
1843 glColor @{$self->{fg}};
1844 glBegin GL_LINES; 2124 glBegin GL_LINES;
1845 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1846 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1847 glEnd; 2127 glEnd;
1848 } 2128 }
1849} 2129}
1850 2130
2131#############################################################################
2132
1851package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1852 2134
1853our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1854 2136
1855use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1856 2138
1857sub key_down { 2139sub invoke_key_down {
1858 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1859 2141
1860 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1861 2143
1862 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1863 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1865 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1868 $self->update; 2151 $self->update;
1869 2152
1870 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1873 } 2156 }
1874 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1875 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1877 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 } 2161 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1880 } 2163 }
1881 2164
1882 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1883 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885 2168
1886 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } else { 2171 } else {
1889 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1890 } 2173 }
1891 2174
1892 } else { 2175 } else {
1893 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1894 } 2177 }
1895 2178
1896 1 2179 1
1897} 2180}
1898 2181
1899############################################################################# 2182#############################################################################
1900 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1901package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1902 2224
1903our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1904 2226
1905use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1906 2228
1907my @tex = 2229my @tex =
1908 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1909 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1910 2232
1911sub new { 2233sub new {
1912 my $class = shift; 2234 my $class = shift;
1913 2235
… …
1922 can_events => 1, 2244 can_events => 1,
1923 @_ 2245 @_
1924 ) 2246 )
1925} 2247}
1926 2248
1927sub activate { }
1928
1929sub button_up { 2249sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1931 2251
1932 $self->emit ("activate") 2252 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1952 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1953} 2273}
1954 2274
1955############################################################################# 2275#############################################################################
1956 2276
1957package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1958 2278
1959our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1960 2280
1961my @tex = 2281my @tex =
1962 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964 2284
1965use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1966 2286
1967sub new { 2287sub new {
1968 my $class = shift; 2288 my $class = shift;
1969 2289
1970 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1984 my ($self) = @_; 2304 my ($self) = @_;
1985 2305
1986 (6) x 2 2306 (6) x 2
1987} 2307}
1988 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1989sub button_down { 2317sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1991 2319
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2322 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2323 } else {
1997 return 0 2324 return 0
1998 } 2325 }
1999 2326
2000 1 2327 1
… …
2020 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
2021} 2348}
2022 2349
2023############################################################################# 2350#############################################################################
2024 2351
2025package CFClient::UI::Image; 2352package CFPlus::UI::Image;
2026 2353
2027our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
2028 2355
2029use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2030use Carp qw/confess/;
2031 2357
2032our %loaded_images; 2358our %texture_cache;
2033 2359
2034sub new { 2360sub new {
2035 my $class = shift; 2361 my $class = shift;
2036 2362
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2038 2367
2039 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2040 2370
2041 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2042 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2043 2373
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2045 2375
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2377
2050 $self 2378 $self
2051} 2379}
2052 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2053sub size_request { 2396sub size_request {
2054 my ($self) = @_; 2397 my ($self) = @_;
2055 2398
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
2057} 2400}
2058 2401
2059sub _draw { 2402sub _draw {
2060 my ($self) = @_; 2403 my ($self) = @_;
2061 2404
… …
2071 } 2414 }
2072 2415
2073 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2075 2418
2076 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
2077 2420
2078 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2079} 2422}
2080 2423
2081############################################################################# 2424#############################################################################
2082 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
2083package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
2084 2463
2085our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2086 2465
2087use List::Util qw(min max); 2466use List::Util qw(min max);
2088 2467
2089use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2090 2469
2091my %tex = ( 2470my %tex = (
2092 food => [ 2471 food => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095 ], 2474 ],
2096 grace => [ 2475 grace => [
2097 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2098 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2099 ], 2478 ],
2100 hp => [ 2479 hp => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103 ], 2482 ],
2104 mana => [ 2483 mana => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2107 ], 2486 ],
2108); 2487);
2109 2488
2110# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2170 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2551
2173 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2174 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175 2557
2176 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2198 2580
2199 if ($t3) { 2581 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2588 glEnd;
2207 } 2589 }
2208 2590
2209 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2210 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2211} 2593}
2212 2594
2213############################################################################# 2595#############################################################################
2214 2596
2215package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2216 2598
2217our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2218 2600
2219sub new { 2601sub new {
2220 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2221 2603
2222 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2224 can_hover => 1, 2606 can_hover => 1,
2225 can_events => 1, 2607 can_events => 1,
2226 %arg, 2608 %arg,
2227 ); 2609 );
2228 2610
2229 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2230 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2231 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2232 2614
2233 $self 2615 $self
2234} 2616}
2235 2617
2236sub set_fontsize { 2618sub set_fontsize {
… …
2257 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2258} 2640}
2259 2641
2260############################################################################# 2642#############################################################################
2261 2643
2262package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2263 2645
2264use strict; 2646use strict;
2265 2647
2266use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2267 2649
2268our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2269 2651
2270my @tex = 2652my @tex =
2271 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2272 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2273 2655
2274sub new { 2656sub new {
2275 my $class = shift; 2657 my $class = shift;
2276 2658
… …
2297 $self->update; 2679 $self->update;
2298 2680
2299 $self 2681 $self
2300} 2682}
2301 2683
2302sub changed { }
2303
2304sub set_range { 2684sub set_range {
2305 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2306 2686
2307 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2308 2688
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2311} 2693}
2312 2694
2313sub set_value { 2695sub set_value {
2314 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2315 2697
… …
2326 if $unit; 2708 if $unit;
2327 2709
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2711
2330 if ($value != $old_value) { 2712 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2332 $self->update; 2714 $self->update;
2333 } 2715 }
2334} 2716}
2335 2717
2336sub size_request { 2718sub size_request {
2337 my ($self) = @_; 2719 my ($self) = @_;
2338 2720
2339 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2340} 2722}
2341 2723
2342sub button_down { 2724sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2344 2726
2345 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2728
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2730
2349 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2732}
2351 2733
2352sub mouse_motion { 2734sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2354 2736
2355 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2739
… …
2363 } else { 2745 } else {
2364 return 0; 2746 return 0;
2365 } 2747 }
2366 2748
2367 1 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2368} 2762}
2369 2763
2370sub update { 2764sub update {
2371 my ($self) = @_; 2765 my ($self) = @_;
2372 2766
… …
2421 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2422} 2816}
2423 2817
2424############################################################################# 2818#############################################################################
2425 2819
2426package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2427 2821
2428our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2429 2823
2430sub new { 2824sub new {
2431 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2432 2826
2433 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2434 2828
2435 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift }, 2832 to_value => sub { shift },
2439 from_value => sub { shift }, 2833 from_value => sub { shift },
2440 %arg, 2834 %arg,
2441 ); 2835 );
2442 2836
… …
2462sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2464 2858
2465############################################################################# 2859#############################################################################
2466 2860
2467package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2468 2862
2469our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2470 2864
2471use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2472 2866
2473sub new { 2867sub new {
2474 my $class = shift; 2868 my $class = shift;
2475 2869
2476 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2477 fontsize => 1, 2871 fontsize => 1,
2478 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2479 #font => default_font 2874 #font => default_font
2480 @_, 2875 @_,
2481 2876
2482 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2483 par => [], 2878 par => [],
2879 max_par => 0,
2484 height => 0, 2880 height => 0,
2485 children => [ 2881 children => [
2486 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2487 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2488 ], 2884 ],
2489 ); 2885 );
2490 2886
2491 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2492 2888
… …
2498 2894
2499 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2500 $self->reflow; 2896 $self->reflow;
2501} 2897}
2502 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2503sub size_allocate { 2908sub invoke_size_allocate {
2504 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2505 2910
2506 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507 2913
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 2918
2512 $self->reflow; 2919 $self->reflow;
2513}
2514 2920
2515sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2516 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2517 2937
2518 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2519 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2520 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2522 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2523 2951 );
2952
2524 $layout->size 2953 $layout
2525} 2954}
2526 2955
2527sub reflow { 2956sub reflow {
2528 my ($self) = @_; 2957 my ($self) = @_;
2529 2958
… …
2536 2965
2537 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2538 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2539} 2968}
2540 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2541sub clear { 2985sub clear {
2542 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2543 2990
2544 $self->{par} = []; 2991 $self->{par} = [];
2545 $self->{height} = 0; 2992 $self->{height} = 0;
2546 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2547} 2994}
2548 2995
2549sub add_paragraph { 2996sub add_paragraph {
2550 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2551 2998
2552 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2553 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2554 $self->{height} += $h; 3051 $self->{height} = $height;
2555 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2556 }
2557 3053
2558 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2559} 3060}
2560 3061
2561sub update { 3062sub update {
2562 my ($self) = @_; 3063 my ($self) = @_;
2563 3064
… …
2565 3066
2566 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2567 3068
2568 delete $self->{texture}; 3069 delete $self->{texture};
2569 3070
2570 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572 3075
2573 if (delete $self->{need_reflow}) {
2574 my $height = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2580 for (@{$self->{par}}) {
2581 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2582 $layout->set_width ($W - $_->[3]);
2583 $layout->set_markup ($_->[4]);
2584 my ($w, $h) = $layout->size;
2585 $_->[0] = $w + $_->[3];
2586 $_->[1] = $h;
2587 }
2588
2589 $height += $_->[1];
2590 }
2591
2592 $self->{height} = $height;
2593
2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2595
2596 delete $self->{texture};
2597 }
2598
2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2600 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2601 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2602 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2603 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2604 3089
2605 my $y0 = $top; 3090 my $y0 = $top;
2606 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2607 3092
2608 my $y = 0;
2609
2610 my $layout = $self->{layout};
2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613
2614 glEnable GL_BLEND;
2615 #TODO# not correct in windows where rgba is forced off
2616 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2617
2618 for my $par (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2619 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2620 3096
2621 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2622 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2623 $layout->set_width ($W - $par->[3]);
2624 $layout->set_markup ($par->[4]);
2625 3099
2626 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2627 3101
2628 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2629 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2630 } 3114 }
2631 3115
2632 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2633 } 3118 }
2634 3119
2635 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2636 }; 3121 };
2637 }); 3122 });
3123}
3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
2638} 3132}
2639 3133
2640sub _draw { 3134sub _draw {
2641 my ($self) = @_; 3135 my ($self) = @_;
2642 3136
… …
2645 glColor 0, 0, 0, 1; 3139 glColor 0, 0, 0, 1;
2646 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2647 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2648 3142
2649 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2650
2651} 3144}
2652 3145
2653############################################################################# 3146#############################################################################
2654 3147
2655package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2656 3149
2657use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2658 3151
2659our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2660 3153
2661sub moveto { 3154sub moveto {
2662 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2663 3156
2664 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2692 glPopMatrix; 3185 glPopMatrix;
2693} 3186}
2694 3187
2695############################################################################# 3188#############################################################################
2696 3189
2697package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2698 3191
2699our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2700 3193
2701sub new { 3194sub new {
2702 my $class = shift; 3195 my $class = shift;
2703 3196
2704 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2716 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2717} 3210}
2718 3211
2719############################################################################# 3212#############################################################################
2720 3213
2721package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2722 3215
2723our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2724 3217
2725use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2726 3219
2727sub new { 3220sub new {
2728 my $class = shift; 3221 my $class = shift;
2729 3222
2730 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2733 ) 3226 )
2734} 3227}
2735 3228
2736sub set_tooltip_from { 3229sub set_tooltip_from {
2737 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2738 3234
2739 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2740 3236
2741 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2742 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n" 3240 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}"; 3241 . "visible $widget->{visible}";
2746 } 3242 }
2747 3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2748 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2749 markup => $tooltip, 3248 markup => $tooltip,
2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2751 fontsize => 0.8, 3250 fontsize => 0.8,
2752 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2753 ellipsise => 0, 3252 ellipsise => 0,
2754 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2755 ); 3254 );
2756} 3255}
2757 3256
… …
2761 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2762 3261
2763 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2764} 3263}
2765 3264
2766sub size_allocate { 3265sub invoke_size_allocate {
2767 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2768 3267
2769 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2770} 3269}
2771 3270
2772sub visibility_change { 3271sub invoke_visibility_change {
2773 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2774 3273
2775 return unless $visible; 3274 return unless $visible;
2776 3275
2777 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2778 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2779 or return; 3278 or return;
2780 3279
3280 if ($widget->{visible}) {
2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782 3282
2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784 if $x + $self->{w} > $::WIDTH; 3284 if $x + $self->{w} > $self->{root}{w};
2785 3285
2786 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2787 }); 3290 });
2788} 3291}
2789 3292
2790sub _draw { 3293sub _draw {
2791 my ($self) = @_; 3294 my ($self) = @_;
… …
2815 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2816} 3319}
2817 3320
2818############################################################################# 3321#############################################################################
2819 3322
2820package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2821 3324
2822our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2823 3326
2824use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2825 3328
2826sub new { 3329sub new {
2827 my $class = shift; 3330 my $class = shift;
2828 3331
2829 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2831 can_events => 0, 3334 can_events => 0,
2832 @_, 3335 @_,
2833 ); 3336 );
2834 3337
2835 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2836 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2837 3340
2838 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2839 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2840 hard => 1, 3343 hard => 1,
2841 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2842 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2843 ++$widget->{frame}; 3347 ++$widget->{frame};
2844 $widget->update; 3348 $widget->update;
2845 }, 3349 },
2846 ); 3350 );
2847 } 3351 }
… …
2864sub _draw { 3368sub _draw {
2865 my ($self) = @_; 3369 my ($self) = @_;
2866 3370
2867 return unless $::CONN; 3371 return unless $::CONN;
2868 3372
3373 $self->SUPER::_draw;
3374
2869 my $face; 3375 my $face;
2870 3376
2871 if ($self->{frame}) { 3377 if ($self->{frame}) {
2872 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
2873 3379
2874 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
2875 if $anim && @$anim; 3381 if $anim && @$anim;
2876 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
2877 3386
2878 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
2879 3388
2880 if ($tex) { 3389 if ($tex) {
2881 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2883 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2885 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
2886 } 3399 }
2887} 3400}
2888 3401
2889sub DESTROY { 3402sub destroy {
2890 my ($self) = @_; 3403 my ($self) = @_;
2891 3404
2892 $self->{timer}->cancel 3405 $self->{timer}->cancel
2893 if $self->{timer}; 3406 if $self->{timer};
2894 3407
2895 $self->SUPER::DESTROY; 3408 $self->SUPER::destroy;
2896} 3409}
2897 3410
2898############################################################################# 3411#############################################################################
2899 3412
2900package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
2901 3414
2902our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
2903 3416
2904# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
2905 3418
2906############################################################################# 3419#############################################################################
2907 3420
2908package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
2909 3422
2910our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
2911 3424
2912use CFClient::OpenGL; 3425use CFPlus::OpenGL;
2913 3426
2914sub new { 3427sub new {
2915 my $class = shift; 3428 my $class = shift;
2916 3429
2917 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
2918 items => [], 3431 items => [],
2919 z => 100, 3432 z => 100,
2920 @_, 3433 @_,
2921 ); 3434 );
2922 3435
2923 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2924 3437
2925 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
2926 my ($widget, $cb, $tooltip) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
2927 3440
2928 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
2929 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
2930 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
2931 can_hover => 1, 3447 can_hover => 1,
2932 can_events => 1, 3448 can_events => 1,
2933 text => $widget,
2934 tooltip => $tooltip 3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
3460 markup => $widget,
3461 tooltip => $tooltip;
3462 }
2935 } 3463 }
2936 3464
2937 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
2938 3466
2939 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
2944 3472
2945# popup given the event (must be a mouse button down event currently) 3473# popup given the event (must be a mouse button down event currently)
2946sub popup { 3474sub popup {
2947 my ($self, $ev) = @_; 3475 my ($self, $ev) = @_;
2948 3476
2949 $self->_emit ("popdown"); 3477 $self->emit ("popdown");
2950 3478
2951 # maybe save $GRAB? must be careful about events... 3479 # maybe save $GRAB? must be careful about events...
2952 $GRAB = $self; 3480 $GRAB = $self;
2953 $self->{button} = $ev->{button}; 3481 $self->{button} = $ev->{button};
2954 3482
2955 $self->show; 3483 $self->show;
2956 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3484 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2957} 3485}
2958 3486
2959sub mouse_motion { 3487sub invoke_mouse_motion {
2960 my ($self, $ev, $x, $y) = @_; 3488 my ($self, $ev, $x, $y) = @_;
2961 3489
2962 # TODO: should use vbox->find_widget or so 3490 # TODO: should use vbox->find_widget or so
2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3491 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2964 $self->{hover} = $self->{item}{$HOVER}; 3492 $self->{hover} = $self->{item}{$HOVER};
2965 3493
2966 0 3494 0
2967} 3495}
2968 3496
2969sub button_up { 3497sub invoke_button_up {
2970 my ($self, $ev, $x, $y) = @_; 3498 my ($self, $ev, $x, $y) = @_;
2971 3499
2972 if ($ev->{button} == $self->{button}) { 3500 if ($ev->{button} == $self->{button}) {
2973 undef $GRAB; 3501 undef $GRAB;
2974 $self->hide; 3502 $self->hide;
2975 3503
2976 $self->_emit ("popdown"); 3504 $self->emit ("popdown");
2977 $self->{hover}[1]->() if $self->{hover}; 3505 $self->{hover}[1]->() if $self->{hover};
2978 } else { 3506 } else {
2979 return 0 3507 return 0
2980 } 3508 }
2981 3509
2982 1 3510 1
2983} 3511}
2984 3512
2985############################################################################# 3513#############################################################################
2986 3514
2987package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
2988 3516
2989our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
2990 3518
2991sub new { 3519sub new {
2992 my $class = shift; 3520 my $class = shift;
2993 3521
2994 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3008 3536
3009 $self->{current} = $self->{children}[0] 3537 $self->{current} = $self->{children}[0]
3010 if @{ $self->{children} }; 3538 if @{ $self->{children} };
3011} 3539}
3012 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3013sub set_current_page { 3547sub set_current_page {
3014 my ($self, $page_or_widget) = @_; 3548 my ($self, $page_or_widget) = @_;
3015 3549
3016 my $widget = ref $page_or_widget 3550 my $widget = ref $page_or_widget
3017 ? $page_or_widget 3551 ? $page_or_widget
3018 : $self->{children}[$page_or_widget]; 3552 : $self->{children}[$page_or_widget];
3019 3553
3020 $self->{current} = $widget; 3554 $self->{current} = $widget;
3021 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3555 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022 3556
3023 $self->_emit (page_changed => $self->{current}); 3557 $self->emit (page_changed => $self->{current});
3024 3558
3025 $self->realloc; 3559 $self->realloc;
3026} 3560}
3027 3561
3028sub visible_children { 3562sub visible_children {
… …
3033 my ($self) = @_; 3567 my ($self) = @_;
3034 3568
3035 $self->{current}->size_request 3569 $self->{current}->size_request
3036} 3570}
3037 3571
3038sub size_allocate { 3572sub invoke_size_allocate {
3039 my ($self, $w, $h) = @_; 3573 my ($self, $w, $h) = @_;
3040 3574
3041 $self->{current}->configure (0, 0, $w, $h); 3575 $self->{current}->configure (0, 0, $w, $h);
3576
3577 1
3042} 3578}
3043 3579
3044sub _draw { 3580sub _draw {
3045 my ($self) = @_; 3581 my ($self) = @_;
3046 3582
3047 $self->{current}->draw; 3583 $self->{current}->draw;
3048} 3584}
3049 3585
3050############################################################################# 3586#############################################################################
3051 3587
3052package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3053 3589
3054our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3055 3591
3056sub new { 3592sub new {
3057 my $class = shift; 3593 my $class = shift;
3058 3594
3059 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3060 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3061 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3062 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3063 @_, 3599 @_,
3064 ); 3600 );
3065 3601
3066 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3070} 3606}
3071 3607
3072sub add { 3608sub add {
3073 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3074 3610
3075 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3076 3612
3077 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3078 markup => $title, 3614 markup => $title,
3079 tooltip => $tooltip, 3615 tooltip => $tooltip,
3080 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3081 ); 3617 );
3082 3618
3083 $self->{multiplexer}->add ($widget); 3619 $self->{multiplexer}->add ($widget);
3084} 3620}
3085 3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3086sub set_current_page { 3628sub set_current_page {
3087 my ($self, $page) = @_; 3629 my ($self, $page) = @_;
3088 3630
3089 $self->{multiplexer}->set_current_page ($page); 3631 $self->{multiplexer}->set_current_page ($page);
3090 $self->_emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3091} 3633}
3092 3634
3093############################################################################# 3635#############################################################################
3094 3636
3095package CFClient::UI::Combobox; 3637package CFPlus::UI::Selector;
3096 3638
3097use utf8; 3639use utf8;
3098 3640
3099our @ISA = CFClient::UI::Button::; 3641our @ISA = CFPlus::UI::Button::;
3100 3642
3101sub new { 3643sub new {
3102 my $class = shift; 3644 my $class = shift;
3103 3645
3104 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ... 3647 options => [], # [value, title, longdesc], ...
3106 value => undef, 3648 value => undef,
3107 @_, 3649 @_,
3108 ); 3650 );
3109 3651
3110 $self->_set_value ($self->{value}); 3652 $self->_set_value ($self->{value});
3111 3653
3112 $self 3654 $self
3113} 3655}
3114 3656
3115sub button_down { 3657sub invoke_button_down {
3116 my ($self, $ev) = @_; 3658 my ($self, $ev) = @_;
3117 3659
3118 my @menu_items; 3660 my @menu_items;
3119 3661
3120 for (@{ $self->{options} }) { 3662 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_; 3663 my ($value, $title, $tooltip) = @$_;
3122 3664
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3124 } 3666 }
3125 3667
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127} 3669}
3128 3670
3129sub _set_value { 3671sub _set_value {
3130 my ($self, $value) = @_; 3672 my ($self, $value) = @_;
3131 3673
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3674 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3133 or return; 3675 or return;
3134 3676
3135 $self->{value} = $item->[1]; 3677 $self->{value} = $item->[0];
3136 $self->set_markup ("$item->[0] ⇓"); 3678 $self->set_markup ("$item->[1] ⇓");
3137 $self->set_tooltip ($item->[2]); 3679 $self->set_tooltip ($item->[2]);
3138} 3680}
3139 3681
3140sub set_value { 3682sub set_value {
3141 my ($self, $value) = @_; 3683 my ($self, $value) = @_;
3142 3684
3143 return unless $self->{value} ne $value; 3685 return unless $self->{value} ne $value;
3144 3686
3145 $self->_set_value ($value); 3687 $self->_set_value ($value);
3146 $self->_emit (changed => $value); 3688 $self->emit (changed => $value);
3147} 3689}
3148 3690
3149############################################################################# 3691#############################################################################
3150 3692
3151package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3152 3694
3153our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3154 3696
3155sub new { 3697sub new {
3156 my $class = shift; 3698 my $class = shift;
3157 3699
3158 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3159 fontsize => 0.8, 3701 fontsize => 0.8,
3160 @_, 3702 @_,
3161 ); 3703 );
3162 3704
3163 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3164 3706
3165 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3166 3708
3167 $self 3709 $self
3168} 3710}
… …
3170sub reorder { 3712sub reorder {
3171 my ($self) = @_; 3713 my ($self) = @_;
3172 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3173 3715
3174 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3175 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3176 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3177 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3178 3720
3179 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3180 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3181 } 3723 }
… …
3202 for ($short) { 3744 for ($short) {
3203 s/^\s+//; 3745 s/^\s+//;
3204 s/\s+/ /g; 3746 s/\s+/ /g;
3205 } 3747 }
3206 3748
3207 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3208 markup => $short, 3750 markup => $short,
3209 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3210 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3211 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3212 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3250 $item->{count}++; 3792 $item->{count}++;
3251 } else { 3793 } else {
3252 $item->{count} = 1; 3794 $item->{count} = 1;
3253 $item->{text} = $item->{tooltip} = $text; 3795 $item->{text} = $item->{tooltip} = $text;
3254 } 3796 }
3255 $item->{id} = ++$self->{id}; 3797 $item->{id} += 0.2;#d#
3256 $item->{timeout} = $timeout; 3798 $item->{timeout} = $timeout;
3257 delete $item->{label}; 3799 delete $item->{label};
3258 } else { 3800 } else {
3259 $self->{item}{$group} = { 3801 $self->{item}{$group} = {
3260 id => ++$self->{id}, 3802 id => ++$self->{id},
… …
3266 count => 1, 3808 count => 1,
3267 %arg, 3809 %arg,
3268 }; 3810 };
3269 } 3811 }
3270 3812
3813 $ROOT->on_refresh (reorder => sub {
3271 $self->reorder; 3814 $self->reorder;
3815 });
3272} 3816}
3273 3817
3274sub reconfigure { 3818sub reconfigure {
3275 my ($self) = @_; 3819 my ($self) = @_;
3276 3820
… …
3279 3823
3280 $self->reorder; 3824 $self->reorder;
3281 $self->SUPER::reconfigure; 3825 $self->SUPER::reconfigure;
3282} 3826}
3283 3827
3284sub DESTROY { 3828sub destroy {
3285 my ($self) = @_; 3829 my ($self) = @_;
3286 3830
3287 $self->{timer}->cancel; 3831 $self->{timer}->cancel;
3288 3832
3289 $self->SUPER::DESTROY; 3833 $self->SUPER::destroy;
3290} 3834}
3291 3835
3292############################################################################# 3836#############################################################################
3293 3837
3294package CFClient::UI::Inventory;
3295
3296our @ISA = CFClient::UI::ScrolledWindow::;
3297
3298sub new {
3299 my $class = shift;
3300
3301 my $self = $class->SUPER::new (
3302 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3303 @_,
3304 );
3305
3306 $self
3307}
3308
3309sub set_items {
3310 my ($self, $items) = @_;
3311
3312 $self->{child}->clear;
3313 return unless $items;
3314
3315 my @items = sort {
3316 ($a->{type} <=> $b->{type})
3317 or ($a->{name} cmp $b->{name})
3318 } @$items;
3319
3320 $self->{real_items} = \@items;
3321
3322 my $row = 0;
3323 for my $item (@items) {
3324 CFClient::Item::update_widgets $item;
3325
3326 $self->{child}->add (0, $row, $item->{face_widget});
3327 $self->{child}->add (1, $row, $item->{desc_widget});
3328 $self->{child}->add (2, $row, $item->{weight_widget});
3329
3330 $row++;
3331 }
3332}
3333
3334#############################################################################
3335
3336package CFClient::UI::BindEditor;
3337
3338our @ISA = CFClient::UI::FancyFrame::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3344
3345 $self->add (my $vb = new CFClient::UI::VBox);
3346
3347
3348 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3349 text => "start recording",
3350 tooltip => "Start/Stops recording of actions."
3351 ."All subsequent actions after the recording started will be captured."
3352 ."The actions are displayed after the record was stopped."
3353 ."To bind the action you have to click on the 'Bind' button",
3354 on_activate => sub {
3355 unless ($self->{recording}) {
3356 $self->start;
3357 } else {
3358 $self->stop;
3359 }
3360 });
3361
3362 $vb->add (new CFClient::UI::Label text => "Actions:");
3363 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3364
3365 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3366 $vb->add (my $hb = new CFClient::UI::HBox);
3367 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3368 $hb->add (new CFClient::UI::Button
3369 text => "bind",
3370 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3371 on_activate => sub {
3372 $self->ask_for_bind;
3373 });
3374
3375 $vb->add (my $hb = new CFClient::UI::HBox);
3376 $hb->add (new CFClient::UI::Button
3377 text => "ok",
3378 expand => 1,
3379 tooltip => "This closes the binding editor and saves the binding",
3380 on_activate => sub {
3381 $self->hide;
3382 $self->commit;
3383 });
3384
3385 $hb->add (new CFClient::UI::Button
3386 text => "cancel",
3387 expand => 1,
3388 tooltip => "This closes the binding editor without saving",
3389 on_activate => sub {
3390 $self->hide;
3391 $self->{binding_cancel}->()
3392 if $self->{binding_cancel};
3393 });
3394
3395 $self->update_binding_widgets;
3396
3397 $self
3398}
3399
3400sub commit {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 if ($sym != 0 && @$cmds > 0) {
3404 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3405 ."'. Don't forget 'Save Config'!");
3406 $self->{binding_change}->($mod, $sym, $cmds)
3407 if $self->{binding_change};
3408 } else {
3409 $::STATUSBOX->add ("No action bound, no key or action specified!");
3410 $self->{binding_cancel}->()
3411 if $self->{binding_cancel};
3412 }
3413}
3414
3415sub start {
3416 my ($self) = @_;
3417
3418 $self->{rec_btn}->set_text ("stop recording");
3419 $self->{recording} = 1;
3420 $self->clear_command_list;
3421 $::CONN->start_record if $::CONN;
3422}
3423
3424sub stop {
3425 my ($self) = @_;
3426
3427 $self->{rec_btn}->set_text ("start recording");
3428 $self->{recording} = 0;
3429
3430 my $rec;
3431 $rec = $::CONN->stop_record if $::CONN;
3432 return unless ref $rec eq 'ARRAY';
3433 $self->set_command_list ($rec);
3434}
3435
3436
3437sub ask_for_bind_and_commit {
3438 my ($self) = @_;
3439 $self->ask_for_bind (1);
3440}
3441
3442sub ask_for_bind {
3443 my ($self, $commit) = @_;
3444
3445 CFClient::Binder::open_binding_dialog (sub {
3446 my ($mod, $sym) = @_;
3447 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3448 $self->update_binding_widgets;
3449 $self->commit if $commit;
3450 });
3451}
3452
3453# $mod and $sym are the modifiers and key symbol
3454# $cmds is a array ref of strings (the commands)
3455# $cb is the callback that is executed on OK
3456# $ccb is the callback that is executed on CANCEL and
3457# when the binding was unsuccessful on OK
3458sub set_binding {
3459 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3460
3461 $self->clear_command_list;
3462 $self->{recording} = 0;
3463 $self->{rec_btn}->set_text ("start recording");
3464
3465 $self->{binding} = [$mod, $sym];
3466 $self->{commands} = $cmds;
3467
3468 $self->{binding_change} = $cb;
3469 $self->{binding_cancel} = $ccb;
3470
3471 $self->update_binding_widgets;
3472}
3473
3474# this is a shortcut method that asks for a binding
3475# and then just binds it.
3476sub do_quick_binding {
3477 my ($self, $cmds) = @_;
3478 $self->set_binding (undef, undef, $cmds, sub {
3479 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3480 });
3481 $self->ask_for_bind (1);
3482}
3483
3484sub update_binding_widgets {
3485 my ($self) = @_;
3486 my ($mod, $sym, $cmds) = $self->get_binding;
3487 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3488 $self->set_command_list ($cmds);
3489}
3490
3491sub get_binding {
3492 my ($self) = @_;
3493 return (
3494 $self->{binding}->[0],
3495 $self->{binding}->[1],
3496 [ grep { defined $_ } @{$self->{commands}} ]
3497 );
3498}
3499
3500sub clear_command_list {
3501 my ($self) = @_;
3502 $self->{cmdbox}->clear ();
3503}
3504
3505sub set_command_list {
3506 my ($self, $cmds) = @_;
3507
3508 $self->{cmdbox}->clear ();
3509 $self->{commands} = $cmds;
3510
3511 my $idx = 0;
3512
3513 for (@$cmds) {
3514 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3515
3516 my $i = $idx;
3517 $hb->add (new CFClient::UI::Label text => $_);
3518 $hb->add (new CFClient::UI::Button
3519 text => "delete",
3520 tooltip => "Deletes the action from the record",
3521 on_activate => sub {
3522 $self->{cmdbox}->remove ($hb);
3523 $cmds->[$i] = undef;
3524 });
3525
3526
3527 $idx++
3528 }
3529}
3530
3531#############################################################################
3532
3533package CFClient::UI::SpellList;
3534
3535our @ISA = CFClient::UI::Table::;
3536
3537sub new {
3538 my $class = shift;
3539
3540 my $self = $class->SUPER::new (
3541 binding => [],
3542 commands => [],
3543 @_,
3544 )
3545}
3546
3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3549my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3551my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3553
3554sub rebuild_spell_list {
3555 my ($self) = @_;
3556
3557 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear;
3559
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3561 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564
3565 my $row = 0;
3566
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_};
3569
3570 $row++;
3571
3572 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face},
3574 can_hover => 1,
3575 can_events => 1,
3576 tooltip => $spell->{message},
3577 );
3578
3579 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1,
3581 text => $spell->{name},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591 # TODO: should be done via popup
3592 $self->add (5, $row, new CFClient::UI::Button
3593 text => "bind",
3594 tooltip => "bind spell readying (cast command) to key",
3595 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596 );
3597 }
3598 });
3599}
3600
3601sub add_spell {
3602 my ($self, $spell) = @_;
3603
3604 $self->{spell}->{$spell->{name}} = $spell;
3605 $self->rebuild_spell_list;
3606}
3607
3608sub remove_spell {
3609 my ($self, $spell) = @_;
3610
3611 delete $self->{spell}->{$spell->{name}};
3612 $self->rebuild_spell_list;
3613}
3614
3615#############################################################################
3616
3617package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3618 3839
3619our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3620 3841
3621use List::Util qw(min max); 3842use List::Util qw(min max);
3622 3843
3623use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3624 3845
3625sub new { 3846sub new {
3626 my $class = shift; 3847 my $class = shift;
3627 3848
3628 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3629 visible => 1, 3850 visible => 1,
3630 @_, 3851 @_,
3631 ); 3852 );
3632 3853
3633 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3634 3855
3635 $self 3856 $self
3636} 3857}
3637 3858
3638sub size_request { 3859sub size_request {
… …
3653 $coord = $max - $size if $coord > $max - $size; 3874 $coord = $max - $size if $coord > $max - $size;
3654 3875
3655 int $coord + 0.5 3876 int $coord + 0.5
3656} 3877}
3657 3878
3658sub size_allocate { 3879sub invoke_size_allocate {
3659 my ($self, $w, $h) = @_; 3880 my ($self, $w, $h) = @_;
3660 3881
3661 for my $child ($self->children) { 3882 for my $child ($self->children) {
3662 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3883 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3663 3884
… …
3667 $X = _to_pixel $X, $W, $self->{w}; 3888 $X = _to_pixel $X, $W, $self->{w};
3668 $Y = _to_pixel $Y, $H, $self->{h}; 3889 $Y = _to_pixel $Y, $H, $self->{h};
3669 3890
3670 $child->configure ($X, $Y, $W, $H); 3891 $child->configure ($X, $Y, $W, $H);
3671 } 3892 }
3893
3894 1
3672} 3895}
3673 3896
3674sub coord2local { 3897sub coord2local {
3675 my ($self, $x, $y) = @_; 3898 my ($self, $x, $y) = @_;
3676 3899
… …
3802 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3803 4026
3804 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3805 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3806 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3807 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3808 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3809 4041
3810 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3811 $widget->{old_w} = $widget->{w}; 4043 $widget->{old_w} = $widget->{w};
… …
3834 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3835 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3836 glLoadIdentity; 4068 glLoadIdentity;
3837 4069
3838 { 4070 {
3839 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
3840 4072
3841 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3842 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
3843 }
3844 4075
3845 $self->_draw; 4076 $self->_draw;
4077 }
3846} 4078}
3847 4079
3848############################################################################# 4080#############################################################################
3849 4081
3850package CFClient::UI; 4082package CFPlus::UI;
3851 4083
3852$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3853$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3854 4086
38551 40871
3856 4088

Diff Legend

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