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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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