ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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