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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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