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

Diff Legend

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