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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

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

Diff Legend

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