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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 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
858# back-buffered drawing area
859
799package CFClient::UI::Window; 860package CFPlus::UI::Window;
800 861
801our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
802 863
803use CFClient::OpenGL; 864use CFPlus::OpenGL;
804 865
805sub new { 866sub new {
806 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
807 868
808 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
813 874
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 876 $self->SUPER::update;
816} 877}
817 878
818sub size_allocate { 879sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
820 881
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
823} 885}
824 886
825sub _render { 887sub _render {
826 my ($self) = @_; 888 my ($self) = @_;
827 889
… …
829} 891}
830 892
831sub render_child { 893sub render_child {
832 my ($self) = @_; 894 my ($self) = @_;
833 895
834 $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 {
835 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
837 899
838 { 900 {
839 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
840 902
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
843 } 905 }
844 906
… …
854 my $tex = $self->{texture} 916 my $tex = $self->{texture}
855 or return; 917 or return;
856 918
857 glEnable GL_TEXTURE_2D; 919 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 921 glColor 0, 0, 0, 1;
860 922
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 924
863 glDisable GL_TEXTURE_2D; 925 glDisable GL_TEXTURE_2D;
864} 926}
865 927
866############################################################################# 928#############################################################################
867 929
868package CFClient::UI::ViewPort; 930package CFPlus::UI::ViewPort;
869 931
870our @ISA = CFClient::UI::Window::; 932our @ISA = CFPlus::UI::Window::;
871 933
872sub new { 934sub new {
873 my $class = shift; 935 my $class = shift;
874 936
875 $class->SUPER::new ( 937 $class->SUPER::new (
… …
888 $h = 10 if $self->{scroll_y}; 950 $h = 10 if $self->{scroll_y};
889 951
890 ($w, $h) 952 ($w, $h)
891} 953}
892 954
893sub size_allocate { 955sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 956 my ($self, $w, $h) = @_;
895 957
896 my $child = $self->child; 958 my $child = $self->child;
897 959
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 960 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 961 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 962
901 $self->child->configure (0, 0, $w, $h); 963 $self->child->configure (0, 0, $w, $h);
902 $self->update; 964 $self->update;
965
966 1
903} 967}
904 968
905sub set_offset { 969sub set_offset {
906 my ($self, $x, $y) = @_; 970 my ($self, $x, $y) = @_;
907 971
… …
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 998 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 999 ) {
936 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
937 } else { 1001 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1002 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 1003 }
940} 1004}
941 1005
942sub _render { 1006sub _render {
943 my ($self) = @_; 1007 my ($self) = @_;
944 1008
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1009 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1010 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
947 1011
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1012 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1013
950 $self->SUPER::_render; 1014 $self->SUPER::_render;
951} 1015}
952 1016
953############################################################################# 1017#############################################################################
954 1018
955package CFClient::UI::ScrolledWindow; 1019package CFPlus::UI::ScrolledWindow;
956 1020
957our @ISA = CFClient::UI::HBox::; 1021our @ISA = CFPlus::UI::HBox::;
958 1022
959sub new { 1023sub new {
960 my ($class, %arg) = @_; 1024 my ($class, %arg) = @_;
961 1025
962 my $child = delete $arg{child}; 1026 my $child = delete $arg{child};
963 1027
964 my $self; 1028 my $self;
965 1029
966 my $slider = new CFClient::UI::Slider 1030 my $slider = new CFPlus::UI::Slider
967 vertical => 1, 1031 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub { 1033 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]); 1034 $self->{vp}->set_offset (0, $_[1]);
971 }, 1035 },
972 ; 1036 ;
973 1037
974 $self = $class->SUPER::new ( 1038 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1039 vp => (new CFPlus::UI::ViewPort expand => 1),
1040 can_events => 1,
976 slider => $slider, 1041 slider => $slider,
977 %arg, 1042 %arg,
978 ); 1043 );
979 1044
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1045 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child; 1046 $self->add ($child) if $child;
982 1047
983 $self 1048 $self
984} 1049}
985 1050
1051#TODO# update range on size_allocate depending on child
1052
986sub add { 1053sub add {
987 my ($self, $widget) = @_; 1054 my ($self, $widget) = @_;
988 1055
989 $self->{vp}->add ($self->{child} = $widget); 1056 $self->{vp}->add ($self->{child} = $widget);
990} 1057}
991 1058
1059sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_;
1061
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev);
1065
1066 1
1067}
1068
1069sub update_slider {
1070 my ($self) = @_;
1071
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1073}
1074
992sub update { 1075sub update {
993 my ($self) = @_; 1076 my ($self) = @_;
994 1077
995 $self->SUPER::update; 1078 $self->SUPER::update;
996 1079
997 # todo: overwrite size_allocate of child 1080 $self->update_slider;
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1081}
1001 1082
1002sub size_allocate { 1083sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1084 my ($self, $w, $h) = @_;
1004 1085
1086 $self->update_slider;
1087
1005 $self->SUPER::size_allocate ($w, $h); 1088 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1089}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1090
1014############################################################################# 1091#############################################################################
1015 1092
1016package CFClient::UI::Frame; 1093package CFPlus::UI::Frame;
1017 1094
1018our @ISA = CFClient::UI::Bin::; 1095our @ISA = CFPlus::UI::Bin::;
1019 1096
1020use CFClient::OpenGL; 1097use CFPlus::OpenGL;
1021 1098
1022sub new { 1099sub new {
1023 my $class = shift; 1100 my $class = shift;
1024 1101
1025 $class->SUPER::new ( 1102 $class->SUPER::new (
… …
1033 1110
1034 if ($self->{bg}) { 1111 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1112 my ($w, $h) = @$self{qw(w h)};
1036 1113
1037 glEnable GL_BLEND; 1114 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1115 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1116 glColor_premultiply @{ $self->{bg} };
1040 1117
1041 glBegin GL_QUADS; 1118 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1119 glVertex 0 , 0;
1043 glVertex 0 , $h; 1120 glVertex 0 , $h;
1044 glVertex $w, $h; 1121 glVertex $w, $h;
… …
1051 $self->SUPER::_draw; 1128 $self->SUPER::_draw;
1052} 1129}
1053 1130
1054############################################################################# 1131#############################################################################
1055 1132
1056package CFClient::UI::FancyFrame; 1133package CFPlus::UI::FancyFrame;
1057 1134
1058our @ISA = CFClient::UI::Bin::; 1135our @ISA = CFPlus::UI::Bin::;
1059 1136
1060use CFClient::OpenGL; 1137use CFPlus::OpenGL;
1061 1138
1062my $bg = 1139my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1; 1141 mipmap => 1, wrap => 1;
1065 1142
1066my @border = 1143my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1146
1070sub new { 1147sub new {
1071 my ($class, %arg) = @_; 1148 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
1074 1149
1075 my $self = $class->SUPER::new ( 1150 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1151 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1152 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1153 border => 0.6,
1079 can_events => 1, 1154 can_events => 1,
1080 min_w => 16, 1155 min_w => 64,
1081 min_h => 16, 1156 min_h => 32,
1082 %arg, 1157 %arg,
1083 ); 1158 );
1084 1159
1085 $self->{title} = new CFClient::UI::Label 1160 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1161 align => 0,
1087 valign => 1, 1162 valign => 1,
1088 text => $title, 1163 text => $self->{title},
1089 fontsize => $self->{border} 1164 fontsize => $self->{border},
1090 if defined $title; 1165 if exists $self->{title};
1166
1167 if ($self->{has_close_button}) {
1168 $self->{close_button} =
1169 new CFPlus::UI::ImageButton
1170 path => 'x1_close.png',
1171 on_activate => sub { $self->emit ("delete") };
1172
1173 $self->CFPlus::UI::Container::add ($self->{close_button});
1174 }
1091 1175
1092 $self 1176 $self
1093} 1177}
1094 1178
1095sub add { 1179sub add {
1096 my ($self, @widgets) = @_; 1180 my ($self, @widgets) = @_;
1097 1181
1098 $self->SUPER::add (@widgets); 1182 $self->SUPER::add (@widgets);
1183 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1184 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1185}
1101 1186
1102sub border { 1187sub border {
1103 int $_[0]{border} * $::FONTSIZE 1188 int $_[0]{border} * $::FONTSIZE
1104} 1189}
1105 1190
1106sub size_request { 1191sub size_request {
1107 my ($self) = @_; 1192 my ($self) = @_;
1108 1193
1109 $self->{title}->size_request 1194 $self->{title_widget}->size_request
1110 if $self->{title}; 1195 if $self->{title_widget};
1196
1197 $self->{close_button}->size_request
1198 if $self->{close_button};
1111 1199
1112 my ($w, $h) = $self->SUPER::size_request; 1200 my ($w, $h) = $self->SUPER::size_request;
1113 1201
1114 ( 1202 (
1115 $w + $self->border * 2, 1203 $w + $self->border * 2,
1116 $h + $self->border * 2, 1204 $h + $self->border * 2,
1117 ) 1205 )
1118} 1206}
1119 1207
1120sub size_allocate { 1208sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1122 1210
1123 if ($self->{title}) { 1211 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1212 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1213 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1214 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1215 }
1128 1216
1129 my $border = $self->border; 1217 my $border = $self->border;
1130 1218
1131 $h -= List::Util::max 0, $border * 2; 1219 $h -= List::Util::max 0, $border * 2;
1132 $w -= List::Util::max 0, $border * 2; 1220 $w -= List::Util::max 0, $border * 2;
1221
1222 $self->child->configure ($border, $border, $w, $h);
1223
1224 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1225 if $self->{close_button};
1226
1227 1
1228}
1229
1230sub invoke_delete {
1231 my ($self) = @_;
1232
1233 $self->hide;
1133 1234
1134 $self->child->configure ($border, $border, $w, $h); 1235 1
1135} 1236}
1136 1237
1137sub button_down { 1238sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1139 1240
1140 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1242 my $border = $self->border;
1142 1243
… …
1158 my $dy = $ev->{y} - $oy; 1259 my $dy = $ev->{y} - $oy;
1159 1260
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1261 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1262 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1263
1264 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1265 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1266 };
1166 1267
1167 } elsif ($lr ^ $td) { 1268 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1269 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1270 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1273 my ($ev, $x, $y) = @_;
1173 1274
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1275 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1276
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1277 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1278 # HACK: the next line is required to enforce placement
1279 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1280 };
1178 } else { 1281 } else {
1179 return 0; 1282 return 0;
1180 } 1283 }
1181 1284
1182 1 1285 1
1183} 1286}
1184 1287
1185sub button_up { 1288sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1289 my ($self, $ev, $x, $y) = @_;
1187 1290
1188 !!delete $self->{motion} 1291 ! ! delete $self->{motion}
1189} 1292}
1190 1293
1191sub mouse_motion { 1294sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1295 my ($self, $ev, $x, $y) = @_;
1193 1296
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1297 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1298
1196 !!$self->{motion} 1299 ! ! $self->{motion}
1300}
1301
1302sub invoke_visibility_change {
1303 my ($self, $visible) = @_;
1304
1305 delete $self->{motion} unless $visible;
1306
1307 0
1197} 1308}
1198 1309
1199sub _draw { 1310sub _draw {
1200 my ($self) = @_; 1311 my ($self) = @_;
1201 1312
… …
1227 1338
1228 glDisable GL_TEXTURE_2D; 1339 glDisable GL_TEXTURE_2D;
1229 1340
1230 $child->draw; 1341 $child->draw;
1231 1342
1232 if ($self->{title}) { 1343 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1344 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1345 $self->{title_widget}->_draw;
1346
1347 glTranslate 0, - ($border - $self->{h});
1235 } 1348 }
1349
1350 $self->{close_button}->draw
1351 if $self->{close_button};
1236} 1352}
1237 1353
1238############################################################################# 1354#############################################################################
1239 1355
1240package CFClient::UI::Table; 1356package CFPlus::UI::Table;
1241 1357
1242our @ISA = CFClient::UI::Base::; 1358our @ISA = CFPlus::UI::Base::;
1243 1359
1244use List::Util qw(max sum); 1360use List::Util qw(max sum);
1245 1361
1246use CFClient::OpenGL; 1362use CFPlus::OpenGL;
1247 1363
1248sub new { 1364sub new {
1249 my $class = shift; 1365 my $class = shift;
1250 1366
1251 $class->SUPER::new ( 1367 $class->SUPER::new (
… …
1257sub children { 1373sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1259} 1375}
1260 1376
1261sub add { 1377sub add {
1262 my ($self, $x, $y, $child) = @_; 1378 my ($self) = shift;
1263 1379
1380 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, ();
1264 $child->set_parent ($self); 1382 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1383 $self->{children}[$y][$x] = $child;
1384 }
1266 1385
1386 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1;
1267 $self->realloc; 1388 $self->realloc;
1389}
1390
1391sub remove {
1392 my ($self, $child) = @_;
1393
1394 # TODO: not yet implemented
1268} 1395}
1269 1396
1270# TODO: move to container class maybe? send children a signal on removal? 1397# TODO: move to container class maybe? send children a signal on removal?
1271sub clear { 1398sub clear {
1272 my ($self) = @_; 1399 my ($self) = @_;
… …
1313 (sum @$ws), 1440 (sum @$ws),
1314 (sum @$hs), 1441 (sum @$hs),
1315 ) 1442 )
1316} 1443}
1317 1444
1318sub size_allocate { 1445sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1446 my ($self, $w, $h) = @_;
1320 1447
1321 my ($ws, $hs) = $self->get_wh; 1448 my ($ws, $hs) = $self->get_wh;
1322 1449
1323 my $req_w = (sum @$ws) || 1; 1450 my $req_w = (sum @$ws) || 1;
… …
1330 1457
1331 # linearly scale sizes 1458 # linearly scale sizes
1332 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1333 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1334 1461
1335 CFClient::UI::harmonize $ws; 1462 CFPlus::UI::harmonize $ws;
1336 CFClient::UI::harmonize $hs; 1463 CFPlus::UI::harmonize $hs;
1337 1464
1338 my $y; 1465 my $y;
1339 1466
1340 for my $r (0 .. $#{$self->{children}}) { 1467 for my $r (0 .. $#{$self->{children}}) {
1341 my $row = $self->{children}[$r] 1468 my $row = $self->{children}[$r]
… …
1355 } 1482 }
1356 1483
1357 $y += $row_h; 1484 $y += $row_h;
1358 } 1485 }
1359 1486
1487 1
1360} 1488}
1361 1489
1362sub find_widget { 1490sub find_widget {
1363 my ($self, $x, $y) = @_; 1491 my ($self, $x, $y) = @_;
1364 1492
… …
1383 } 1511 }
1384} 1512}
1385 1513
1386############################################################################# 1514#############################################################################
1387 1515
1388package CFClient::UI::Box; 1516package CFPlus::UI::Box;
1389 1517
1390our @ISA = CFClient::UI::Container::; 1518our @ISA = CFPlus::UI::Container::;
1391 1519
1392sub size_request { 1520sub size_request {
1393 my ($self) = @_; 1521 my ($self) = @_;
1394 1522
1395 $self->{vertical} 1523 $self->{vertical}
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1529 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1530 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1531 )
1404} 1532}
1405 1533
1406sub size_allocate { 1534sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1535 my ($self, $w, $h) = @_;
1408 1536
1409 my $space = $self->{vertical} ? $h : $w; 1537 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1538 my @children = $self->visible_children;
1411 1539
1412 my @req; 1540 my @req;
1413 1541
1414 if ($self->{homogeneous}) { 1542 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1543 @req = ($space / (@children || 1)) x @children;
1416 } else { 1544 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1545 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1546 my $req = List::Util::sum @req;
1419 1547
1420 if ($req > $space) { 1548 if ($req > $space) {
1421 # ah well, not enough space 1549 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1550 $_ *= $space / $req for @req;
1423 } else { 1551 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1552 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1553
1426 $space = ($space - $req) / $expand; # remaining space to give away 1554 $space = ($space - $req) / $expand; # remaining space to give away
1427 1555
1428 $req[$_] += $space * $children->[$_]{expand} 1556 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1557 for 0 .. $#children;
1430 } 1558 }
1431 } 1559 }
1432 1560
1433 CFClient::UI::harmonize \@req; 1561 CFPlus::UI::harmonize \@req;
1434 1562
1435 my $pos = 0; 1563 my $pos = 0;
1436 for (0 .. $#$children) { 1564 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1565 my $alloc = $req[$_];
1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1566 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1439 1567
1440 $pos += $alloc; 1568 $pos += $alloc;
1441 } 1569 }
1442 1570
1443 1 1571 1
1444} 1572}
1445 1573
1446############################################################################# 1574#############################################################################
1447 1575
1448package CFClient::UI::HBox; 1576package CFPlus::UI::HBox;
1449 1577
1450our @ISA = CFClient::UI::Box::; 1578our @ISA = CFPlus::UI::Box::;
1451 1579
1452sub new { 1580sub new {
1453 my $class = shift; 1581 my $class = shift;
1454 1582
1455 $class->SUPER::new ( 1583 $class->SUPER::new (
… …
1458 ) 1586 )
1459} 1587}
1460 1588
1461############################################################################# 1589#############################################################################
1462 1590
1463package CFClient::UI::VBox; 1591package CFPlus::UI::VBox;
1464 1592
1465our @ISA = CFClient::UI::Box::; 1593our @ISA = CFPlus::UI::Box::;
1466 1594
1467sub new { 1595sub new {
1468 my $class = shift; 1596 my $class = shift;
1469 1597
1470 $class->SUPER::new ( 1598 $class->SUPER::new (
… …
1473 ) 1601 )
1474} 1602}
1475 1603
1476############################################################################# 1604#############################################################################
1477 1605
1478package CFClient::UI::Label; 1606package CFPlus::UI::Label;
1479 1607
1480our @ISA = CFClient::UI::DrawBG::; 1608our @ISA = CFPlus::UI::DrawBG::;
1481 1609
1482use CFClient::OpenGL; 1610use CFPlus::OpenGL;
1483 1611
1484sub new { 1612sub new {
1485 my ($class, %arg) = @_; 1613 my ($class, %arg) = @_;
1486 1614
1487 my $self = $class->SUPER::new ( 1615 my $self = $class->SUPER::new (
… …
1490 #active_bg => none 1618 #active_bg => none
1491 #font => default_font 1619 #font => default_font
1492 #text => initial text 1620 #text => initial text
1493 #markup => initial narkup 1621 #markup => initial narkup
1494 #max_w => maximum pixel width 1622 #max_w => maximum pixel width
1623 #style => 0, # render flags
1495 ellipsise => 3, # end 1624 ellipsise => 3, # end
1496 layout => (new CFClient::Layout), 1625 layout => (new CFPlus::Layout),
1497 fontsize => 1, 1626 fontsize => 1,
1498 align => -1, 1627 align => -1,
1499 valign => -1, 1628 valign => -1,
1500 padding_x => 2, 1629 padding_x => 2,
1501 padding_y => 2, 1630 padding_y => 2,
1502 can_events => 0, 1631 can_events => 0,
1503 %arg 1632 %arg
1504 ); 1633 );
1505 1634
1506 if (exists $self->{template}) { 1635 if (exists $self->{template}) {
1507 my $layout = new CFClient::Layout; 1636 my $layout = new CFPlus::Layout;
1508 $layout->set_text (delete $self->{template}); 1637 $layout->set_text (delete $self->{template});
1509 $self->{template} = $layout; 1638 $self->{template} = $layout;
1510 } 1639 }
1511 1640
1512 if (exists $self->{markup}) { 1641 if (exists $self->{markup}) {
… …
1516 } 1645 }
1517 1646
1518 $self 1647 $self
1519} 1648}
1520 1649
1521sub escape($) {
1522 local $_ = $_[0];
1523
1524 s/&/&amp;/g;
1525 s/>/&gt;/g;
1526 s/</&lt;/g;
1527
1528 $_
1529}
1530
1531sub update { 1650sub update {
1532 my ($self) = @_; 1651 my ($self) = @_;
1533 1652
1534 delete $self->{texture}; 1653 delete $self->{texture};
1535 $self->SUPER::update; 1654 $self->SUPER::update;
1536} 1655}
1537 1656
1657sub realloc {
1658 my ($self) = @_;
1659
1660 delete $self->{ox};
1661 $self->SUPER::realloc;
1662}
1663
1538sub set_text { 1664sub set_text {
1539 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1540 1666
1541 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1543 1669
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1546 1671
1672 delete $self->{size_req};
1547 $self->realloc; 1673 $self->realloc;
1548 $self->update; 1674 $self->update;
1549} 1675}
1550 1676
1551sub set_markup { 1677sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1556 1682
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1684
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1561 1686
1687 delete $self->{size_req};
1562 $self->realloc; 1688 $self->realloc;
1563 $self->update; 1689 $self->update;
1564} 1690}
1565 1691
1566sub size_request { 1692sub size_request {
1567 my ($self) = @_; 1693 my ($self) = @_;
1568 1694
1695 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1696 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1697 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1698 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1701
1575 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1576 1703
1577 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1705 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1708
1581 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1582 1710
1583 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1712 $h = List::Util::max $h, $h2;
1713 }
1714
1715 [$w, $h]
1585 } 1716 };
1586 1717
1587 ($w, $h) 1718 @{ $self->{size_req} }
1588} 1719}
1589 1720
1721sub baseline_shift {
1722 $_[0]{layout}->descent
1723}
1724
1590sub size_allocate { 1725sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1726 my ($self, $w, $h) = @_;
1592 1727
1593 delete $self->{ox}; 1728 delete $self->{ox};
1594 1729
1595 delete $self->{texture} 1730 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1731 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1732
1733 1
1597} 1734}
1598 1735
1599sub set_fontsize { 1736sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1737 my ($self, $fontsize) = @_;
1601 1738
1602 $self->{fontsize} = $fontsize; 1739 $self->{fontsize} = $fontsize;
1740 delete $self->{size_req};
1603 delete $self->{texture}; 1741 delete $self->{texture};
1604 1742
1605 $self->realloc; 1743 $self->realloc;
1606} 1744}
1607 1745
1746sub reconfigure {
1747 my ($self) = @_;
1748
1749 delete $self->{size_req};
1750 delete $self->{texture};
1751
1752 $self->SUPER::reconfigure;
1753}
1754
1608sub _draw { 1755sub _draw {
1609 my ($self) = @_; 1756 my ($self) = @_;
1610 1757
1611 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1612 1759
1613 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 1767
1621 new_from_layout CFClient::Texture $self->{layout} 1768 [$self->{layout}->size]
1622 }; 1769 };
1623 1770
1624 unless (exists $self->{ox}) { 1771 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 1774 : ($self->{w} - $size->[0]) * 0.5);
1628 1775
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1778 : ($self->{h} - $size->[1]) * 0.5);
1632 }; 1779 };
1633 1780
1634 glEnable GL_TEXTURE_2D; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1636 1783
1637 if ($tex->{format} == GL_ALPHA) { 1784 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1638 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643
1644 glDisable GL_TEXTURE_2D;
1645} 1785}
1646 1786
1647############################################################################# 1787#############################################################################
1648 1788
1649package CFClient::UI::EntryBase; 1789package CFPlus::UI::EntryBase;
1650 1790
1651our @ISA = CFClient::UI::Label::; 1791our @ISA = CFPlus::UI::Label::;
1652 1792
1653use CFClient::OpenGL; 1793use CFPlus::OpenGL;
1654 1794
1655sub new { 1795sub new {
1656 my $class = shift; 1796 my $class = shift;
1657 1797
1658 $class->SUPER::new ( 1798 $class->SUPER::new (
… …
1663 can_hover => 1, 1803 can_hover => 1,
1664 can_focus => 1, 1804 can_focus => 1,
1665 valign => 0, 1805 valign => 0,
1666 can_events => 1, 1806 can_events => 1,
1667 #text => ... 1807 #text => ...
1808 #hidden => "*",
1668 @_ 1809 @_
1669 ) 1810 )
1670} 1811}
1671 1812
1672sub _set_text { 1813sub _set_text {
… …
1674 1815
1675 delete $self->{cur_h}; 1816 delete $self->{cur_h};
1676 1817
1677 return if $self->{text} eq $text; 1818 return if $self->{text} eq $text;
1678 1819
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1821 $self->{text} = $text;
1683 1822
1684 $text =~ s/./*/g if $self->{hidden}; 1823 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1824 $self->{layout}->set_text ("$text ");
1825 delete $self->{size_req};
1686 1826
1687 $self->_emit (changed => $self->{text}); 1827 $self->emit (changed => $self->{text});
1828
1829 $self->realloc;
1830 $self->update;
1688} 1831}
1689 1832
1690sub set_text { 1833sub set_text {
1691 my ($self, $text) = @_; 1834 my ($self, $text) = @_;
1692 1835
1693 $self->{cursor} = length $text; 1836 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1837 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1838}
1698 1839
1699sub get_text { 1840sub get_text {
1700 $_[0]{text} 1841 $_[0]{text}
1701} 1842}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1847 my ($w, $h) = $self->SUPER::size_request;
1707 1848
1708 ($w + 1, $h) # add 1 for cursor 1849 ($w + 1, $h) # add 1 for cursor
1709} 1850}
1710 1851
1711sub key_down { 1852sub invoke_key_down {
1712 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1713 1854
1714 my $mod = $ev->{mod}; 1855 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1856 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1857 my $uni = $ev->{unicode};
… …
1719 1860
1720 if ($uni == 8) { 1861 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 1863 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 1864 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 1865 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 1866 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 1867 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1868 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1869 } elsif ($sym == CFPlus::SDLK_HOME) {
1729 $self->{cursor} = 0; 1870 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1871 } elsif ($sym == CFPlus::SDLK_END) {
1731 $self->{cursor} = length $text; 1872 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1873 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1874 $self->emit ('escape');
1734 } elsif ($uni) { 1875 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1876 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1877 } else {
1737 return 0; 1878 return 0;
1738 } 1879 }
… …
1742 $self->realloc; 1883 $self->realloc;
1743 1884
1744 1 1885 1
1745} 1886}
1746 1887
1747sub focus_in { 1888sub invoke_focus_in {
1748 my ($self) = @_; 1889 my ($self) = @_;
1749 1890
1750 $self->{last_activity} = $::NOW; 1891 $self->{last_activity} = $::NOW;
1751 1892
1752 $self->SUPER::focus_in; 1893 $self->SUPER::invoke_focus_in
1753} 1894}
1754 1895
1755sub button_down { 1896sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1897 my ($self, $ev, $x, $y) = @_;
1757 1898
1758 $self->SUPER::button_down ($ev, $x, $y); 1899 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1900
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1902
1762 # byte-index to char-index 1903 # byte-index to char-index
1763 my $text = $self->{text}; 1904 my $text = $self->{text};
1764 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1766 1907
1767 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1768 $self->update; 1909 $self->update;
1769 1910
1770 1 1911 1
1771} 1912}
1772 1913
1773sub mouse_motion { 1914sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1916# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1917
1777 0 1918 1
1778} 1919}
1779 1920
1780sub _draw { 1921sub _draw {
1781 my ($self) = @_; 1922 my ($self) = @_;
1782 1923
1783 local $self->{fg} = $self->{fg}; 1924 local $self->{fg} = $self->{fg};
1784 1925
1785 if ($FOCUS == $self) { 1926 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1927 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1928 $self->{fg} = $self->{active_fg};
1788 } else { 1929 } else {
1789 glColor @{$self->{bg}}; 1930 glColor_premultiply @{$self->{bg}};
1790 } 1931 }
1791 1932
1792 glEnable GL_BLEND; 1933 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1935 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1936 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1937 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1938 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1939 glVertex $self->{w}, 0;
… …
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1818 glEnd; 1959 glEnd;
1819 } 1960 }
1820} 1961}
1821 1962
1822package CFClient::UI::Entry; 1963package CFPlus::UI::Entry;
1823 1964
1824our @ISA = CFClient::UI::EntryBase::; 1965our @ISA = CFPlus::UI::EntryBase::;
1825 1966
1826use CFClient::OpenGL; 1967use CFPlus::OpenGL;
1827 1968
1828sub key_down { 1969sub invoke_key_down {
1829 my ($self, $ev) = @_; 1970 my ($self, $ev) = @_;
1830 1971
1831 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
1832 1973
1833 if ($sym == 13) { 1974 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1975 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1976 my $txt = $self->get_text;
1977
1836 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1980 $self->emit (activate => $txt);
1839 $self->update; 1981 $self->update;
1840 1982
1841 } elsif ($sym == CFClient::SDLK_UP) { 1983 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1984 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1985 $self->{history_saveback} = $self->get_text;
1844 } 1986 }
1845 if (@{$self->{history} || []} > 0) { 1987 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 1988 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 1990 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 1991 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1992 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 1993 }
1852 1994
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 1995 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 1996 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1997 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 1998
1857 if ($self->{history_pointer} >= 0) { 1999 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2000 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2001 } else {
1860 $self->set_text ($self->{history_saveback}); 2002 $self->set_text ($self->{history_saveback});
1861 } 2003 }
1862 2004
1863 } else { 2005 } else {
1864 return $self->SUPER::key_down ($ev) 2006 return $self->SUPER::invoke_key_down ($ev)
1865 } 2007 }
1866 2008
1867 1 2009 1
1868} 2010}
1869 2011
1870############################################################################# 2012#############################################################################
1871 2013
1872package CFClient::UI::Button; 2014package CFPlus::UI::Button;
1873 2015
1874our @ISA = CFClient::UI::Label::; 2016our @ISA = CFPlus::UI::Label::;
1875 2017
1876use CFClient::OpenGL; 2018use CFPlus::OpenGL;
1877 2019
1878my @tex = 2020my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2021 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2022 qw(b1_button_active.png);
1881 2023
1882sub new { 2024sub new {
1883 my $class = shift; 2025 my $class = shift;
1884 2026
… …
1893 can_events => 1, 2035 can_events => 1,
1894 @_ 2036 @_
1895 ) 2037 )
1896} 2038}
1897 2039
1898sub activate { }
1899
1900sub button_up { 2040sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2041 my ($self, $ev, $x, $y) = @_;
1902 2042
1903 $self->emit ("activate") 2043 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2044 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2045 && $y >= 0 && $y < $self->{h};
… …
1908} 2048}
1909 2049
1910sub _draw { 2050sub _draw {
1911 my ($self) = @_; 2051 my ($self) = @_;
1912 2052
1913 local $self->{fg} = $self->{fg}; 2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 2054
1919 glEnable GL_TEXTURE_2D; 2055 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2057 glColor 0, 0, 0, 1;
1922 2058
… …
1927 $self->SUPER::_draw; 2063 $self->SUPER::_draw;
1928} 2064}
1929 2065
1930############################################################################# 2066#############################################################################
1931 2067
1932package CFClient::UI::CheckBox; 2068package CFPlus::UI::CheckBox;
1933 2069
1934our @ISA = CFClient::UI::DrawBG::; 2070our @ISA = CFPlus::UI::DrawBG::;
1935 2071
1936my @tex = 2072my @tex =
1937 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2073 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1938 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2074 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1939 2075
1940use CFClient::OpenGL; 2076use CFPlus::OpenGL;
1941 2077
1942sub new { 2078sub new {
1943 my $class = shift; 2079 my $class = shift;
1944 2080
1945 $class->SUPER::new ( 2081 $class->SUPER::new (
… …
1959 my ($self) = @_; 2095 my ($self) = @_;
1960 2096
1961 (6) x 2 2097 (6) x 2
1962} 2098}
1963 2099
2100sub toggle {
2101 my ($self) = @_;
2102
2103 $self->{state} = !$self->{state};
2104 $self->emit (changed => $self->{state});
2105 $self->update;
2106}
2107
1964sub button_down { 2108sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2109 my ($self, $ev, $x, $y) = @_;
1966 2110
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2111 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2112 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2113 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2114 } else {
1972 return 0 2115 return 0
1973 } 2116 }
1974 2117
1975 1 2118 1
… …
1995 glDisable GL_TEXTURE_2D; 2138 glDisable GL_TEXTURE_2D;
1996} 2139}
1997 2140
1998############################################################################# 2141#############################################################################
1999 2142
2000package CFClient::UI::Image; 2143package CFPlus::UI::Image;
2001 2144
2002our @ISA = CFClient::UI::Base::; 2145our @ISA = CFPlus::UI::Base::;
2003 2146
2004use CFClient::OpenGL; 2147use CFPlus::OpenGL;
2005use Carp qw/confess/;
2006 2148
2007our %loaded_images; 2149our %texture_cache;
2008 2150
2009sub new { 2151sub new {
2010 my $class = shift; 2152 my $class = shift;
2011 2153
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2154 my $self = $class->SUPER::new (
2155 can_events => 0,
2156 @_,
2157 );
2013 2158
2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2159 $self->{path} || $self->{tex}
2160 or Carp::croak "'path' or 'tex' attributes required";
2015 2161
2016 $loaded_images{$self->{image}} ||= 2162 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2018 2164
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2165 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2166
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2168
2025 $self 2169 $self
2026} 2170}
2027 2171
2172sub STORABLE_freeze {
2173 my ($self, $cloning) = @_;
2174
2175 $self->{path}
2176 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2177
2178 $self->{path}
2179}
2180
2181sub STORABLE_attach {
2182 my ($self, $cloning, $path) = @_;
2183
2184 $self->new (path => $path)
2185}
2186
2028sub size_request { 2187sub size_request {
2029 my ($self) = @_; 2188 my ($self) = @_;
2030 2189
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2190 ($self->{tex}{w}, $self->{tex}{h})
2032} 2191}
2033 2192
2034sub _draw { 2193sub _draw {
2035 my ($self) = @_; 2194 my ($self) = @_;
2036 2195
… …
2046 } 2205 }
2047 2206
2048 glEnable GL_TEXTURE_2D; 2207 glEnable GL_TEXTURE_2D;
2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2050 2209
2051 $tex->draw_quad_alpha (0, 0, $w, $h); 2210 $tex->draw_quad (0, 0, $w, $h);
2052 2211
2053 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
2054} 2213}
2055 2214
2056############################################################################# 2215#############################################################################
2057 2216
2217package CFPlus::UI::ImageButton;
2218
2219our @ISA = CFPlus::UI::Image::;
2220
2221use CFPlus::OpenGL;
2222
2223my %textures;
2224
2225sub new {
2226 my $class = shift;
2227
2228 my $self = $class->SUPER::new (
2229 padding_x => 4,
2230 padding_y => 4,
2231 fg => [1, 1, 1],
2232 active_fg => [0, 0, 1],
2233 can_hover => 1,
2234 align => 0,
2235 valign => 0,
2236 can_events => 1,
2237 @_
2238 );
2239}
2240
2241sub invoke_button_up {
2242 my ($self, $ev, $x, $y) = @_;
2243
2244 $self->emit ("activate")
2245 if $x >= 0 && $x < $self->{w}
2246 && $y >= 0 && $y < $self->{h};
2247
2248 1
2249}
2250
2251#############################################################################
2252
2058package CFClient::UI::VGauge; 2253package CFPlus::UI::VGauge;
2059 2254
2060our @ISA = CFClient::UI::Base::; 2255our @ISA = CFPlus::UI::Base::;
2061 2256
2062use List::Util qw(min max); 2257use List::Util qw(min max);
2063 2258
2064use CFClient::OpenGL; 2259use CFPlus::OpenGL;
2065 2260
2066my %tex = ( 2261my %tex = (
2067 food => [ 2262 food => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2263 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2264 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2070 ], 2265 ],
2071 grace => [ 2266 grace => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2267 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2268 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2074 ], 2269 ],
2075 hp => [ 2270 hp => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2271 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2272 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2078 ], 2273 ],
2079 mana => [ 2274 mana => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2276 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2082 ], 2277 ],
2083); 2278);
2084 2279
2085# eg. VGauge->new (gauge => 'food'), default gauge: food 2280# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2340 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2341 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2342
2148 my $h1 = $self->{h} * (1 - $ycut1); 2343 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2344 my $h2 = $self->{h} * (1 - $ycut2);
2345 my $h3 = $self->{h};
2346
2347 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2150 2348
2151 glEnable GL_BLEND; 2349 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2350 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2351 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2352 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2353 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2354
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2355 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2356 glBegin GL_QUADS;
… …
2172 2371
2173 if ($t3) { 2372 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2373 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2374 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2375 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2376 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2377 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2378 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2379 glEnd;
2181 } 2380 }
2182 2381
2183 glDisable GL_BLEND; 2382 glDisable GL_BLEND;
2184 glDisable GL_TEXTURE_2D; 2383 glDisable GL_TEXTURE_2D;
2185} 2384}
2186 2385
2187############################################################################# 2386#############################################################################
2188 2387
2189package CFClient::UI::Gauge; 2388package CFPlus::UI::Gauge;
2190 2389
2191our @ISA = CFClient::UI::VBox::; 2390our @ISA = CFPlus::UI::VBox::;
2192 2391
2193sub new { 2392sub new {
2194 my ($class, %arg) = @_; 2393 my ($class, %arg) = @_;
2195 2394
2196 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
… …
2198 can_hover => 1, 2397 can_hover => 1,
2199 can_events => 1, 2398 can_events => 1,
2200 %arg, 2399 %arg,
2201 ); 2400 );
2202 2401
2203 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2402 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2204 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2403 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2205 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2404 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2206 2405
2207 $self 2406 $self
2208} 2407}
2209 2408
2210sub set_fontsize { 2409sub set_fontsize {
… …
2231 $self->{value}->set_text ($val); 2430 $self->{value}->set_text ($val);
2232} 2431}
2233 2432
2234############################################################################# 2433#############################################################################
2235 2434
2236package CFClient::UI::Slider; 2435package CFPlus::UI::Slider;
2237 2436
2238use strict; 2437use strict;
2239 2438
2240use CFClient::OpenGL; 2439use CFPlus::OpenGL;
2241 2440
2242our @ISA = CFClient::UI::DrawBG::; 2441our @ISA = CFPlus::UI::DrawBG::;
2243 2442
2244my @tex = 2443my @tex =
2245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2444 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2246 qw(s1_slider.png s1_slider_bg.png); 2445 qw(s1_slider.png s1_slider_bg.png);
2247 2446
2248sub new { 2447sub new {
2249 my $class = shift; 2448 my $class = shift;
2250 2449
… …
2271 $self->update; 2470 $self->update;
2272 2471
2273 $self 2472 $self
2274} 2473}
2275 2474
2276sub changed { }
2277
2278sub set_range { 2475sub set_range {
2279 my ($self, $range) = @_; 2476 my ($self, $range) = @_;
2280 2477
2281 ($range, $self->{range}) = ($self->{range}, $range); 2478 ($range, $self->{range}) = ($self->{range}, $range);
2282 2479
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2480 if ("@$range" ne "@{$self->{range}}") {
2481 $self->update;
2482 $self->set_value ($self->{range}[0]);
2483 }
2285} 2484}
2286 2485
2287sub set_value { 2486sub set_value {
2288 my ($self, $value) = @_; 2487 my ($self, $value) = @_;
2289 2488
… …
2300 if $unit; 2499 if $unit;
2301 2500
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2501 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2502
2304 if ($value != $old_value) { 2503 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2504 $self->emit (changed => $value);
2306 $self->update; 2505 $self->update;
2307 } 2506 }
2308} 2507}
2309 2508
2310sub size_request { 2509sub size_request {
2311 my ($self) = @_; 2510 my ($self) = @_;
2312 2511
2313 ($self->{req_w}, $self->{req_h}) 2512 ($self->{req_w}, $self->{req_h})
2314} 2513}
2315 2514
2316sub button_down { 2515sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2318 2517
2319 $self->SUPER::button_down ($ev, $x, $y); 2518 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2519
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2520 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2521
2323 $self->mouse_motion ($ev, $x, $y) 2522 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2523}
2325 2524
2326sub mouse_motion { 2525sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2526 my ($self, $ev, $x, $y) = @_;
2328 2527
2329 if ($GRAB == $self) { 2528 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2529 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2530
… …
2339 } 2538 }
2340 2539
2341 1 2540 1
2342} 2541}
2343 2542
2543sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_;
2545
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2549
2550 ! ! $delta
2551}
2552
2344sub update { 2553sub update {
2345 my ($self) = @_; 2554 my ($self) = @_;
2346 2555
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2556 delete $self->{knob_w};
2557 $self->SUPER::update;
2558}
2559
2560sub _draw {
2561 my ($self) = @_;
2562
2563 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2564 $self->set_value ($self->{range}[0]);
2349 2565
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2566 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2567 my $range = ($hi - $page - $lo) || 1e-100;
2352 2568
… …
2358 $value = ($value - $lo) / $range; 2574 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2575 $value = $value * $self->{scale} + $self->{offset};
2360 2576
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2577 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2578 $self->{knob_w} = $knob_w;
2363 }); 2579 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2580
2371 $self->SUPER::_draw (); 2581 $self->SUPER::_draw ();
2372 2582
2373 glScale $self->{w}, $self->{h}; 2583 glScale $self->{w}, $self->{h};
2374 2584
… …
2394 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2395} 2605}
2396 2606
2397############################################################################# 2607#############################################################################
2398 2608
2399package CFClient::UI::ValSlider; 2609package CFPlus::UI::ValSlider;
2400 2610
2401our @ISA = CFClient::UI::HBox::; 2611our @ISA = CFPlus::UI::HBox::;
2402 2612
2403sub new { 2613sub new {
2404 my ($class, %arg) = @_; 2614 my ($class, %arg) = @_;
2405 2615
2406 my $range = delete $arg{range}; 2616 my $range = delete $arg{range};
2407 2617
2408 my $self = $class->SUPER::new ( 2618 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2619 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2620 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 2621 to_value => sub { shift },
2412 from_value => sub { shift }, 2622 from_value => sub { shift },
2413 %arg, 2623 %arg,
2414 ); 2624 );
2415 2625
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2645sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2646sub set_value { shift->{slider}->set_value (@_) }
2437 2647
2438############################################################################# 2648#############################################################################
2439 2649
2440package CFClient::UI::TextView; 2650package CFPlus::UI::TextScroller;
2441 2651
2442our @ISA = CFClient::UI::HBox::; 2652our @ISA = CFPlus::UI::HBox::;
2443 2653
2444use CFClient::OpenGL; 2654use CFPlus::OpenGL;
2445 2655
2446sub new { 2656sub new {
2447 my $class = shift; 2657 my $class = shift;
2448 2658
2449 my $self = $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2450 fontsize => 1, 2660 fontsize => 1,
2451 can_events => 0, 2661 can_events => 1,
2662 indent => 0,
2452 #font => default_font 2663 #font => default_font
2453 @_, 2664 @_,
2454 2665
2455 layout => (new CFClient::Layout 1), 2666 layout => (new CFPlus::Layout),
2456 par => [], 2667 par => [],
2457 height => 0, 2668 height => 0,
2458 children => [ 2669 children => [
2459 (new CFClient::UI::Empty expand => 1), 2670 (new CFPlus::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2671 (new CFPlus::UI::Slider vertical => 1),
2461 ], 2672 ],
2462 ); 2673 );
2463 2674
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 2675 $self->{children}[1]->connect (changed => sub { $self->update });
2465 2676
… …
2471 2682
2472 $self->{fontsize} = $fontsize; 2683 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2684 $self->reflow;
2474} 2685}
2475 2686
2687sub size_request {
2688 my ($self) = @_;
2689
2690 my ($empty, $slider) = @{ $self->{children} };
2691
2692 local $self->{children} = [$empty, $slider];
2693 $self->SUPER::size_request
2694}
2695
2476sub size_allocate { 2696sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2697 my ($self, $w, $h) = @_;
2478 2698
2479 $self->SUPER::size_allocate ($w, $h); 2699 my ($empty, $slider, @other) = @{ $self->{children} };
2700 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2701
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2702 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2703 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2704 $self->{layout}->set_width ($empty->{w});
2705 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2706
2485 $self->reflow; 2707 $self->reflow;
2486}
2487 2708
2488sub text_size { 2709 local $self->{children} = [$empty, $slider];
2710 $self->SUPER::invoke_size_allocate ($w, $h)
2711}
2712
2713sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 2714 my ($self, $ev) = @_;
2715
2716 return 0 unless $ev->{dy}; # only vertical movements
2717
2718 $self->{children}[1]->emit (mouse_wheel => $ev);
2719
2720 1
2721}
2722
2723sub get_layout {
2724 my ($self, $para) = @_;
2490 2725
2491 my $layout = $self->{layout}; 2726 my $layout = $self->{layout};
2492 2727
2728 $layout->set_font ($self->{font}) if $self->{font};
2729 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2730 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2731 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2732 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2733 $layout->set_markup ($para->{markup});
2734
2735 $layout->set_shapes (
2736 map
2737 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2738 @{$para->{widget}}
2496 2739 );
2740
2497 $layout->size 2741 $layout
2498} 2742}
2499 2743
2500sub reflow { 2744sub reflow {
2501 my ($self) = @_; 2745 my ($self) = @_;
2502 2746
… …
2511 $self->{children}[1]->set_value ($offset); 2755 $self->{children}[1]->set_value ($offset);
2512} 2756}
2513 2757
2514sub clear { 2758sub clear {
2515 my ($self) = @_; 2759 my ($self) = @_;
2760
2761 my (undef, undef, @other) = @{ $self->{children} };
2762 $self->remove ($_) for @other;
2516 2763
2517 $self->{par} = []; 2764 $self->{par} = [];
2518 $self->{height} = 0; 2765 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2766 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2767}
2521 2768
2522sub add_paragraph { 2769sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2770 my $self = shift;
2524 2771
2525 for my $line (split /\n/, $text) { 2772 for my $para (@_) {
2526 my ($w, $h) = $self->text_size ($line); 2773 $para = {
2527 $self->{height} += $h; 2774 fg => [1, 1, 1, 1],
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2775 indent => 0,
2529 } 2776 markup => "",
2777 widget => [],
2778 ref $para ? %$para : (markup => $para),
2779 w => 1e10,
2780 wrapped => 1,
2781 };
2530 2782
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para;
2785 }
2786
2787 $self->{need_reflow}++;
2788 $self->update;
2789}
2790
2791sub scroll_to_bottom {
2792 my ($self) = @_;
2793
2794 $self->{scroll_to_bottom} = 1;
2795 $self->update;
2532} 2796}
2533 2797
2534sub update { 2798sub update {
2535 my ($self) = @_; 2799 my ($self) = @_;
2536 2800
… …
2538 2802
2539 return unless $self->{h} > 0; 2803 return unless $self->{h} > 0;
2540 2804
2541 delete $self->{texture}; 2805 delete $self->{texture};
2542 2806
2543 $ROOT->on_post_alloc ($self, sub { 2807 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2809
2546 if (delete $self->{need_reflow}) { 2810 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2811 my $height = 0;
2548 2812
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2813 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2814 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2815 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2816 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2817
2559 $_->[1] = $h; 2818 $para->{w} = $w + $para->{indent};
2819 $para->{h} = $h;
2820 $para->{wrapped} = $layout->has_wrapped;
2560 } 2821 }
2561 2822
2562 $height += $_->[1]; 2823 $height += $para->{h};
2563 } 2824 }
2564 2825
2565 $self->{height} = $height; 2826 $self->{height} = $height;
2566 2827
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2828 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2829
2569 delete $self->{texture}; 2830 delete $self->{texture};
2570 } 2831 }
2571 2832
2833 if (delete $self->{scroll_to_bottom}) {
2834 $self->{children}[1]->set_value (1e10);
2835 }
2836
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2838 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2839 glClear GL_COLOR_BUFFER_BIT;
2575 2840
2576 my $top = int $self->{children}[1]{range}[0]; 2841 my $top = int $self->{children}[1]{range}[0];
2577 2842
2578 my $y0 = $top; 2843 my $y0 = $top;
2579 my $y1 = $top + $H; 2844 my $y1 = $top + $H;
2580 2845
2581 my $y = 0; 2846 my $y = 0;
2582 2847
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2848 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2849 my $h = $para->{h};
2593 2850
2594 if ($y0 < $y + $h && $y < $y1) { 2851 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2852
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2853 my $layout = $self->get_layout ($para);
2600 2854
2601 glRasterPos $par->[3], $y - $y0; 2855 $layout->render ($para->{indent}, $y - $y0);
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2856
2857 if (my @w = @{ $para->{widget} }) {
2858 my @s = $layout->get_shapes;
2859
2860 for (@w) {
2861 my ($dx, $dy) = splice @s, 0, 2, ();
2862
2863 $_->{x} = $dx + $para->{indent};
2864 $_->{y} = $dy + $y - $y0;
2865
2866 $_->draw;
2867 }
2868 }
2603 } 2869 }
2604 2870
2605 $y += $h; 2871 $y += $h;
2606 } 2872 }
2607
2608 glDisable GL_BLEND;
2609 }; 2873 };
2610 }); 2874 });
2611} 2875}
2612 2876
2877sub reconfigure {
2878 my ($self) = @_;
2879
2880 $self->SUPER::reconfigure;
2881
2882 $_->{w} = 1e10 for @{ $self->{par} };
2883 $self->reflow;
2884}
2885
2613sub _draw { 2886sub _draw {
2614 my ($self) = @_; 2887 my ($self) = @_;
2615 2888
2616 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2892 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2621 2894
2622 $self->{children}[1]->draw; 2895 $self->{children}[1]->draw;
2623
2624} 2896}
2625 2897
2626############################################################################# 2898#############################################################################
2627 2899
2628package CFClient::UI::Animator; 2900package CFPlus::UI::Animator;
2629 2901
2630use CFClient::OpenGL; 2902use CFPlus::OpenGL;
2631 2903
2632our @ISA = CFClient::UI::Bin::; 2904our @ISA = CFPlus::UI::Bin::;
2633 2905
2634sub moveto { 2906sub moveto {
2635 my ($self, $x, $y) = @_; 2907 my ($self, $x, $y) = @_;
2636 2908
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 2937 glPopMatrix;
2666} 2938}
2667 2939
2668############################################################################# 2940#############################################################################
2669 2941
2670package CFClient::UI::Flopper; 2942package CFPlus::UI::Flopper;
2671 2943
2672our @ISA = CFClient::UI::Button::; 2944our @ISA = CFPlus::UI::Button::;
2673 2945
2674sub new { 2946sub new {
2675 my $class = shift; 2947 my $class = shift;
2676 2948
2677 my $self = $class->SUPER::new ( 2949 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 2961 $self->{other}->toggle_visibility;
2690} 2962}
2691 2963
2692############################################################################# 2964#############################################################################
2693 2965
2694package CFClient::UI::Tooltip; 2966package CFPlus::UI::Tooltip;
2695 2967
2696our @ISA = CFClient::UI::Bin::; 2968our @ISA = CFPlus::UI::Bin::;
2697 2969
2698use CFClient::OpenGL; 2970use CFPlus::OpenGL;
2699 2971
2700sub new { 2972sub new {
2701 my $class = shift; 2973 my $class = shift;
2702 2974
2703 $class->SUPER::new ( 2975 $class->SUPER::new (
… …
2706 ) 2978 )
2707} 2979}
2708 2980
2709sub set_tooltip_from { 2981sub set_tooltip_from {
2710 my ($self, $widget) = @_; 2982 my ($self, $widget) = @_;
2983
2984 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2985 if $widget->{tooltip} =~ /^#(.*)$/;
2711 2986
2712 my $tooltip = $widget->{tooltip}; 2987 my $tooltip = $widget->{tooltip};
2713 2988
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 2989 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2990 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2991 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2992 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2993 . "visible $widget->{visible}";
2719 } 2994 }
2720 2995
2996 $tooltip =~ s/^\n+//;
2997 $tooltip =~ s/\n+$//;
2998
2721 $self->add (new CFClient::UI::Label 2999 $self->add (new CFPlus::UI::Label
2722 markup => $tooltip, 3000 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3001 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 3002 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3003 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3004 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3005 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3006 );
2729} 3007}
2730 3008
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3012 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3013
2736 ($w + 4, $h + 4) 3014 ($w + 4, $h + 4)
2737} 3015}
2738 3016
2739sub size_allocate { 3017sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3018 my ($self, $w, $h) = @_;
2741 3019
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3020 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3021}
2744 3022
2745sub visibility_change { 3023sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3024 my ($self, $visible) = @_;
2747 3025
2748 return unless $visible; 3026 return unless $visible;
2749 3027
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3028 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3029 my $widget = $self->{owner}
2752 or return; 3030 or return;
2753 3031
3032 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3033 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3034
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3035 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3036 if $x + $self->{w} > $self->{root}{w};
2758 3037
2759 $self->move_abs ($x, $y); 3038 $self->move_abs ($x, $y);
3039 } else {
3040 $self->hide;
3041 }
2760 }); 3042 });
2761} 3043}
2762 3044
2763sub _draw { 3045sub _draw {
2764 my ($self) = @_; 3046 my ($self) = @_;
… …
2788 $self->SUPER::_draw; 3070 $self->SUPER::_draw;
2789} 3071}
2790 3072
2791############################################################################# 3073#############################################################################
2792 3074
2793package CFClient::UI::Face; 3075package CFPlus::UI::Face;
2794 3076
2795our @ISA = CFClient::UI::Base::; 3077our @ISA = CFPlus::UI::DrawBG::;
2796 3078
2797use CFClient::OpenGL; 3079use CFPlus::OpenGL;
2798 3080
2799sub new { 3081sub new {
2800 my $class = shift; 3082 my $class = shift;
2801 3083
2802 my $self = $class->SUPER::new ( 3084 my $self = $class->SUPER::new (
… …
2837sub _draw { 3119sub _draw {
2838 my ($self) = @_; 3120 my ($self) = @_;
2839 3121
2840 return unless $::CONN; 3122 return unless $::CONN;
2841 3123
3124 $self->SUPER::_draw;
3125
2842 my $face; 3126 my $face;
2843 3127
2844 if ($self->{frame}) { 3128 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}]; 3129 my $anim = $::CONN->{anim}[$self->{anim}];
2846 3130
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3135 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3136
2853 if ($tex) { 3137 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3138 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3140 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3141 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3142 glDisable GL_TEXTURE_2D;
2859 } 3143 }
2860} 3144}
2861 3145
2862sub DESTROY { 3146sub destroy {
2863 my ($self) = @_; 3147 my ($self) = @_;
2864 3148
2865 $self->{timer}->cancel 3149 $self->{timer}->cancel
2866 if $self->{timer}; 3150 if $self->{timer};
2867 3151
2868 $self->SUPER::DESTROY; 3152 $self->SUPER::destroy;
2869} 3153}
2870 3154
2871############################################################################# 3155#############################################################################
2872 3156
2873package CFClient::UI::Buttonbar; 3157package CFPlus::UI::Buttonbar;
2874 3158
2875our @ISA = CFClient::UI::HBox::; 3159our @ISA = CFPlus::UI::HBox::;
2876 3160
2877# TODO: should actualyl wrap buttons and other goodies. 3161# TODO: should actualyl wrap buttons and other goodies.
2878 3162
2879############################################################################# 3163#############################################################################
2880 3164
2881package CFClient::UI::Menu; 3165package CFPlus::UI::Menu;
2882 3166
2883our @ISA = CFClient::UI::FancyFrame::; 3167our @ISA = CFPlus::UI::FancyFrame::;
2884 3168
2885use CFClient::OpenGL; 3169use CFPlus::OpenGL;
2886 3170
2887sub new { 3171sub new {
2888 my $class = shift; 3172 my $class = shift;
2889 3173
2890 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2891 items => [], 3175 items => [],
2892 z => 100, 3176 z => 100,
2893 @_, 3177 @_,
2894 ); 3178 );
2895 3179
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3180 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897 3181
2898 for my $item (@{ $self->{items} }) { 3182 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3183 my ($widget, $cb, $tooltip) = @$item;
2900 3184
2901 # handle various types of items, only text for now 3185 # handle various types of items, only text for now
2902 if (!ref $widget) { 3186 if (!ref $widget) {
3187 if ($widget =~ /\t/) {
3188 my ($left, $right) = split /\t/, $widget, 2;
3189
2903 $widget = new CFClient::UI::Label 3190 $widget = new CFPlus::UI::HBox
2904 can_hover => 1, 3191 can_hover => 1,
2905 can_events => 1, 3192 can_events => 1,
3193 tooltip => $tooltip,
3194 children => [
3195 (new CFPlus::UI::Label markup => $left, expand => 1),
3196 (new CFPlus::UI::Label markup => $right, align => +1),
3197 ],
3198 ;
3199
3200 } else {
3201 $widget = new CFPlus::UI::Label
3202 can_hover => 1,
3203 can_events => 1,
2906 text => $widget; 3204 markup => $widget,
3205 tooltip => $tooltip;
3206 }
2907 } 3207 }
2908 3208
2909 $self->{item}{$widget} = $item; 3209 $self->{item}{$widget} = $item;
2910 3210
2911 $self->{vbox}->add ($widget); 3211 $self->{vbox}->add ($widget);
… …
2916 3216
2917# popup given the event (must be a mouse button down event currently) 3217# popup given the event (must be a mouse button down event currently)
2918sub popup { 3218sub popup {
2919 my ($self, $ev) = @_; 3219 my ($self, $ev) = @_;
2920 3220
2921 $self->_emit ("popdown"); 3221 $self->emit ("popdown");
2922 3222
2923 # maybe save $GRAB? must be careful about events... 3223 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3224 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3225 $self->{button} = $ev->{button};
2926 3226
2927 $self->show; 3227 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3228 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3229}
2930 3230
2931sub mouse_motion { 3231sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3232 my ($self, $ev, $x, $y) = @_;
2933 3233
2934 # TODO: should use vbox->find_widget or so 3234 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3235 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3236 $self->{hover} = $self->{item}{$HOVER};
2937 3237
2938 0 3238 0
2939} 3239}
2940 3240
2941sub button_up { 3241sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3242 my ($self, $ev, $x, $y) = @_;
2943 3243
2944 if ($ev->{button} == $self->{button}) { 3244 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3245 undef $GRAB;
2946 $self->hide; 3246 $self->hide;
2947 3247
2948 $self->_emit ("popdown"); 3248 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3249 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3250 } else {
2951 return 0 3251 return 0
2952 } 3252 }
2953 3253
2954 1 3254 1
2955} 3255}
2956 3256
2957############################################################################# 3257#############################################################################
2958 3258
2959package CFClient::UI::Multiplexer; 3259package CFPlus::UI::Multiplexer;
2960 3260
2961our @ISA = CFClient::UI::Container::; 3261our @ISA = CFPlus::UI::Container::;
2962 3262
2963sub new { 3263sub new {
2964 my $class = shift; 3264 my $class = shift;
2965 3265
2966 my $self = $class->SUPER::new ( 3266 my $self = $class->SUPER::new (
… …
2980 3280
2981 $self->{current} = $self->{children}[0] 3281 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3282 if @{ $self->{children} };
2983} 3283}
2984 3284
3285sub get_current_page {
3286 my ($self) = @_;
3287
3288 $self->{current}
3289}
3290
2985sub set_current_page { 3291sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3292 my ($self, $page_or_widget) = @_;
2987 3293
2988 my $widget = ref $page_or_widget 3294 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3295 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3296 : $self->{children}[$page_or_widget];
2991 3297
2992 $self->{current} = $widget; 3298 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3299 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3300
2995 $self->_emit (page_changed => $self->{current}); 3301 $self->emit (page_changed => $self->{current});
2996 3302
2997 $self->realloc; 3303 $self->realloc;
2998} 3304}
2999 3305
3000sub visible_children { 3306sub visible_children {
… …
3005 my ($self) = @_; 3311 my ($self) = @_;
3006 3312
3007 $self->{current}->size_request 3313 $self->{current}->size_request
3008} 3314}
3009 3315
3010sub size_allocate { 3316sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3317 my ($self, $w, $h) = @_;
3012 3318
3013 $self->{current}->configure (0, 0, $w, $h); 3319 $self->{current}->configure (0, 0, $w, $h);
3320
3321 1
3014} 3322}
3015 3323
3016sub _draw { 3324sub _draw {
3017 my ($self) = @_; 3325 my ($self) = @_;
3018 3326
3019 $self->{current}->draw; 3327 $self->{current}->draw;
3020} 3328}
3021 3329
3022############################################################################# 3330#############################################################################
3023 3331
3024package CFClient::UI::Notebook; 3332package CFPlus::UI::Notebook;
3025 3333
3026our @ISA = CFClient::UI::VBox::; 3334our @ISA = CFPlus::UI::VBox::;
3027 3335
3028sub new { 3336sub new {
3029 my $class = shift; 3337 my $class = shift;
3030 3338
3031 my $self = $class->SUPER::new ( 3339 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 3340 buttonbar => (new CFPlus::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3341 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self 3342 # filter => # will be put between multiplexer and $self
3035 @_, 3343 @_,
3036 ); 3344 );
3037 3345
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3346 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3044sub add { 3352sub add {
3045 my ($self, $title, $widget, $tooltip) = @_; 3353 my ($self, $title, $widget, $tooltip) = @_;
3046 3354
3047 Scalar::Util::weaken $self; 3355 Scalar::Util::weaken $self;
3048 3356
3049 $self->{buttonbar}->add (new CFClient::UI::Button 3357 $self->{buttonbar}->add (new CFPlus::UI::Button
3050 markup => $title, 3358 markup => $title,
3051 tooltip => $tooltip, 3359 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) }, 3360 on_activate => sub { $self->set_current_page ($widget) },
3053 ); 3361 );
3054 3362
3055 $self->{multiplexer}->add ($widget); 3363 $self->{multiplexer}->add ($widget);
3056} 3364}
3057 3365
3366sub get_current_page {
3367 my ($self) = @_;
3368
3369 $self->{multiplexer}->get_current_page
3370}
3371
3058sub set_current_page { 3372sub set_current_page {
3059 my ($self, $page) = @_; 3373 my ($self, $page) = @_;
3060 3374
3061 $self->{multiplexer}->set_current_page ($page); 3375 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3376 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3377}
3064 3378
3065############################################################################# 3379#############################################################################
3066 3380
3067package CFClient::UI::Statusbox; 3381package CFPlus::UI::Selector;
3068 3382
3383use utf8;
3384
3069our @ISA = CFClient::UI::VBox::; 3385our @ISA = CFPlus::UI::Button::;
3070 3386
3071sub new { 3387sub new {
3072 my $class = shift; 3388 my $class = shift;
3073 3389
3074 $class->SUPER::new ( 3390 my $self = $class->SUPER::new (
3391 options => [], # [value, title, longdesc], ...
3392 value => undef,
3393 @_,
3394 );
3395
3396 $self->_set_value ($self->{value});
3397
3398 $self
3399}
3400
3401sub invoke_button_down {
3402 my ($self, $ev) = @_;
3403
3404 my @menu_items;
3405
3406 for (@{ $self->{options} }) {
3407 my ($value, $title, $tooltip) = @$_;
3408
3409 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3410 }
3411
3412 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3413}
3414
3415sub _set_value {
3416 my ($self, $value) = @_;
3417
3418 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3419 or return;
3420
3421 $self->{value} = $item->[0];
3422 $self->set_markup ("$item->[1] ⇓");
3423 $self->set_tooltip ($item->[2]);
3424}
3425
3426sub set_value {
3427 my ($self, $value) = @_;
3428
3429 return unless $self->{value} ne $value;
3430
3431 $self->_set_value ($value);
3432 $self->emit (changed => $value);
3433}
3434
3435#############################################################################
3436
3437package CFPlus::UI::Statusbox;
3438
3439our @ISA = CFPlus::UI::VBox::;
3440
3441sub new {
3442 my $class = shift;
3443
3444 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3445 fontsize => 0.8,
3076 @_, 3446 @_,
3077 ) 3447 );
3448
3449 Scalar::Util::weaken (my $this = $self);
3450
3451 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3452
3453 $self
3078} 3454}
3079 3455
3080sub reorder { 3456sub reorder {
3081 my ($self) = @_; 3457 my ($self) = @_;
3082 my $NOW = time; 3458 my $NOW = Time::HiRes::time;
3459
3460 # freeze display when hovering over any label
3461 return if $CFPlus::UI::TOOLTIP->{owner}
3462 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3463 values %{ $self->{item} };
3083 3464
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3465 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3466 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3467 }
3087 3468
… …
3090 my @items = sort { 3471 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3472 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3473 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3474 } values %{ $self->{item} };
3094 3475
3476 $self->{timer}->interval (1);
3477
3095 my $count = 10 + 1; 3478 my $count = 10 + 1;
3096 for my $item (@items) { 3479 for my $item (@items) {
3097 last unless --$count; 3480 last unless --$count;
3098 3481
3099 push @widgets, $item->{label} ||= do { 3482 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3483 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3484 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3485 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3486 : $item->{text};
3104 3487
3105 for ($short) { 3488 for ($short) {
3106 s/^\s+//; 3489 s/^\s+//;
3107 s/\s+/ /g; 3490 s/\s+/ /g;
3108 } 3491 }
3109 3492
3110 new CFClient::UI::Label 3493 new CFPlus::UI::Label
3111 markup => $short, 3494 markup => $short,
3112 tooltip => $item->{tooltip}, 3495 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3496 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3497 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3498 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3499 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3500 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3501 can_events => 1,
3119 can_hover => 1 3502 can_hover => 1
3120 }; 3503 };
3504
3505 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3506 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3507 $label->update;
3508 $label->set_max_size (undef, $label->{req_h} * $diff)
3509 if $diff < 1;
3510 $self->{timer}->interval (1/30);
3511 } else {
3512 $label->{fg}[3] = $item->{fg}[3] || 1;
3513 }
3514
3515 push @widgets, $label;
3121 } 3516 }
3122 3517
3123 $self->clear; 3518 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3519 $self->SUPER::add (reverse @widgets);
3125} 3520}
… …
3130 $text =~ s/^\s+//; 3525 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3526 $text =~ s/\s+$//;
3132 3527
3133 return unless $text; 3528 return unless $text;
3134 3529
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3530 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3531
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3532 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3533
3139 if (my $item = $self->{item}{$group}) { 3534 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3535 if ($item->{text} eq $text) {
3141 $item->{count}++; 3536 $item->{count}++;
3142 } else { 3537 } else {
3143 $item->{count} = 1; 3538 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3539 $item->{text} = $item->{tooltip} = $text;
3145 } 3540 }
3146 $item->{id} = ++$self->{id}; 3541 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3542 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3543 delete $item->{label};
3149 } else { 3544 } else {
3150 $self->{item}{$group} = { 3545 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3546 id => ++$self->{id},
… …
3157 count => 1, 3552 count => 1,
3158 %arg, 3553 %arg,
3159 }; 3554 };
3160 } 3555 }
3161 3556
3557 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3558 $self->reorder;
3559 });
3163} 3560}
3164 3561
3165sub reconfigure { 3562sub reconfigure {
3166 my ($self) = @_; 3563 my ($self) = @_;
3167 3564
… …
3170 3567
3171 $self->reorder; 3568 $self->reorder;
3172 $self->SUPER::reconfigure; 3569 $self->SUPER::reconfigure;
3173} 3570}
3174 3571
3572sub destroy {
3573 my ($self) = @_;
3574
3575 $self->{timer}->cancel;
3576
3577 $self->SUPER::destroy;
3578}
3579
3175############################################################################# 3580#############################################################################
3176 3581
3177package CFClient::UI::Inventory; 3582package CFPlus::UI::Inventory;
3178 3583
3179our @ISA = CFClient::UI::ScrolledWindow::; 3584our @ISA = CFPlus::UI::Table::;
3180 3585
3181sub new { 3586sub new {
3182 my $class = shift; 3587 my $class = shift;
3183 3588
3184 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3590 col_expand => [0, 1, 0],
3591 items => [],
3186 @_, 3592 @_,
3187 ); 3593 );
3188 3594
3595 $self->set_sort_order (undef);
3596
3189 $self 3597 $self
3598}
3599
3600sub update_items {
3601 my ($self) = @_;
3602
3603 $self->clear;
3604
3605 my @item = $self->{sort}->(@{ $self->{items} });
3606
3607 my @adds;
3608 my $row = 0;
3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3610 CFPlus::Item::update_widgets $item;
3611
3612 push @adds, 0, $row, $item->{face_widget};
3613 push @adds, 1, $row, $item->{desc_widget};
3614 push @adds, 2, $row, $item->{weight_widget};
3615
3616 $row++;
3617 }
3618
3619 $self->add (@adds);
3620}
3621
3622sub set_sort_order {
3623 my ($self, $order) = @_;
3624
3625 $self->{sort} = $order ||= sub {
3626 sort {
3627 $a->{type} <=> $b->{type}
3628 or $a->{name} cmp $b->{name}
3629 } @_
3630 };
3631
3632 $self->update_items;
3190} 3633}
3191 3634
3192sub set_items { 3635sub set_items {
3193 my ($self, $items) = @_; 3636 my ($self, $items) = @_;
3194 3637
3195 $self->{child}->clear; 3638 $self->{items} = [$items ? values %$items : ()];
3196 return unless $items; 3639 $self->update_items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215} 3640}
3216 3641
3217############################################################################# 3642#############################################################################
3218 3643
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList; 3644package CFPlus::UI::SpellList;
3417 3645
3418our @ISA = CFClient::UI::Table::; 3646our @ISA = CFPlus::UI::Table::;
3419 3647
3420sub new { 3648sub new {
3421 my $class = shift; 3649 my $class = shift;
3422 3650
3423 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
… …
3425 commands => [], 3653 commands => [],
3426 @_, 3654 @_,
3427 ) 3655 )
3428} 3656}
3429 3657
3430# XXX: Do sorting? Argl... 3658my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3659
3660my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3661 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3662my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3663 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3664my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3665 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3666my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3667 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3668my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3670
3671sub rebuild_spell_list {
3672 my ($self) = @_;
3673
3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3675 $self->clear;
3676
3677 return unless $::CONN;
3678
3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3684
3685 my $row = 0;
3686
3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3688 my $spell = $self->{spell}{$_};
3689
3690 $row++;
3691
3692 my $spell_cb = sub {
3693 my ($widget, $ev) = @_;
3694
3695 if ($ev->{button} == 1) {
3696 $::CONN->user_send ("cast $spell->{name}");
3697 } elsif ($ev->{button} == 2) {
3698 $::CONN->user_send ("invoke $spell->{name}");
3699 } elsif ($ev->{button} == 3) {
3700 (new CFPlus::UI::Menu
3701 items => [
3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3704 ],
3705 )->popup ($ev);
3706 } else {
3707 return 0;
3708 }
3709
3710 1
3711 };
3712
3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3714
3715 #TODO: add path info to tooltip
3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3717
3718 $self->add (0, $row, new CFPlus::UI::Face
3719 face => $spell->{face},
3720 can_hover => 1,
3721 can_events => 1,
3722 tooltip => $tooltip,
3723 on_button_down => $spell_cb,
3724 );
3725
3726 $self->add (1, $row, new CFPlus::UI::Label
3727 expand => 1,
3728 text => $spell->{name},
3729 can_hover => 1,
3730 can_events => 1,
3731 tooltip => $tooltip,
3732 on_button_down => $spell_cb,
3733 );
3734
3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3739 }
3740 });
3741}
3742
3431sub add_spell { 3743sub add_spell {
3432 my ($self, $spell) = @_; 3744 my ($self, $spell) = @_;
3745
3433 $self->{spells}->{$spell->{name}} = $spell; 3746 $self->{spell}->{$spell->{name}} = $spell;
3434 3747 $self->rebuild_spell_list;
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462} 3748}
3463 3749
3464sub remove_spell { 3750sub remove_spell {
3465 my ($self, $spell) = @_; 3751 my ($self, $spell) = @_;
3752
3466 delete $self->{spells}->{$spell->{name}}; 3753 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3754 $self->rebuild_spell_list;
3468} 3755}
3469 3756
3757sub clear_spells {
3758 my ($self) = @_;
3759
3760 $self->{spell} = {};
3761 $self->rebuild_spell_list;
3762}
3763
3470############################################################################# 3764#############################################################################
3471 3765
3472package CFClient::UI::Root; 3766package CFPlus::UI::Root;
3473 3767
3474our @ISA = CFClient::UI::Container::; 3768our @ISA = CFPlus::UI::Container::;
3475 3769
3770use List::Util qw(min max);
3771
3476use CFClient::OpenGL; 3772use CFPlus::OpenGL;
3477 3773
3478sub new { 3774sub new {
3479 my $class = shift; 3775 my $class = shift;
3480 3776
3481 my $self = $class->SUPER::new ( 3777 my $self = $class->SUPER::new (
… …
3506 $coord = $max - $size if $coord > $max - $size; 3802 $coord = $max - $size if $coord > $max - $size;
3507 3803
3508 int $coord + 0.5 3804 int $coord + 0.5
3509} 3805}
3510 3806
3511sub size_allocate { 3807sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3808 my ($self, $w, $h) = @_;
3513 3809
3514 for my $child ($self->children) { 3810 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3811 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3812
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3816 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3817 $Y = _to_pixel $Y, $H, $self->{h};
3522 3818
3523 $child->configure ($X, $Y, $W, $H); 3819 $child->configure ($X, $Y, $W, $H);
3524 } 3820 }
3821
3822 1
3525} 3823}
3526 3824
3527sub coord2local { 3825sub coord2local {
3528 my ($self, $x, $y) = @_; 3826 my ($self, $x, $y) = @_;
3529 3827
… …
3614 3912
3615 delete $queue{$widget+0}; 3913 delete $queue{$widget+0};
3616 3914
3617 my ($w, $h) = $widget->size_request; 3915 my ($w, $h) = $widget->size_request;
3618 3916
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3917 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3918 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3919
3920 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3921 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3922
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3923 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3924 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3925
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3926 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3651 3952
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3953 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 3954
3654 $w = 0 if $w < 0; 3955 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0; 3956 $h = 0 if $h < 0;
3957
3958 $w = max $widget->{min_w}, $w;
3959 $h = max $widget->{min_h}, $h;
3960
3961# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3962# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3963
3964 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3965 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656 3966
3657 $w = int $w + 0.5; 3967 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 3968 $h = int $h + 0.5;
3659 3969
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3970 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3994 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3685 glMatrixMode GL_MODELVIEW; 3995 glMatrixMode GL_MODELVIEW;
3686 glLoadIdentity; 3996 glLoadIdentity;
3687 3997
3688 { 3998 {
3689 package CFClient::UI::Base; 3999 package CFPlus::UI::Base;
3690 4000
3691 ($draw_x, $draw_y, $draw_w, $draw_h) = 4001 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h}); 4002 (0, 0, $self->{w}, $self->{h});
3693 } 4003 }
3694 4004
3695 $self->_draw; 4005 $self->_draw;
3696} 4006}
3697 4007
3698############################################################################# 4008#############################################################################
3699 4009
3700package CFClient::UI; 4010package CFPlus::UI;
3701 4011
3702$ROOT = new CFClient::UI::Root; 4012$ROOT = new CFPlus::UI::Root;
3703$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4013$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3704 4014
37051 40151
3706 4016

Diff Legend

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