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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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