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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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