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

Diff Legend

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