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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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