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

Diff Legend

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