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

Diff Legend

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