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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 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 {
376 # nop 406 # nop
377} 407}
378 408
379sub visible_children { 409sub visible_children {
… …
381} 411}
382 412
383sub set_max_size { 413sub set_max_size {
384 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
385 415
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
388} 420}
389 421
390sub set_tooltip { 422sub set_tooltip {
391 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
392 424
… …
395 427
396 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
397 429
398 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
399 431
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 435 }
404} 436}
405 437
406# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
407sub coord2local { 439sub coord2local {
408 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
409 441
442 Carp::confess unless $self->{parent};#d#
443
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 445}
412 446
413# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
414sub coord2global { 448sub coord2global {
415 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
416 450
451 Carp::confess unless $self->{parent};#d#
452
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 454}
419 455
420sub focus_in { 456sub invoke_focus_in {
421 my ($self) = @_; 457 my ($self) = @_;
422 458
423 return if $FOCUS == $self; 459 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
425 461
426 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
427 463
428 $self->_emit (focus_in => $focus); 464 $self->update;
429 465
430 $focus->update if $focus; 466 0
431 $FOCUS->update;
432} 467}
433 468
434sub focus_out { 469sub invoke_focus_out {
435 my ($self) = @_; 470 my ($self) = @_;
436 471
437 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
438 473
439 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
440 475
441 $self->_emit (focus_out => $focus); 476 $self->update;
442 477
443 $focus->update if $focus; #?
444
445 $::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
446 unless $FOCUS; 479 unless $FOCUS;
447}
448 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
449sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 492sub invoke_button_up { 0 }
451sub key_down { 0 } 493sub invoke_key_down { 0 }
452sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
453 496
454sub button_down { 497sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
456 499
457 $self->focus_in; 500 $self->grab_focus;
458 501
459 0 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)
460} 550}
461 551
462sub find_widget { 552sub find_widget {
463 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
464 554
… …
472} 562}
473 563
474sub set_parent { 564sub set_parent {
475 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
476 566
477 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
506 573
… …
539 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
540 607
541 # update screen rectangle 608 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 611
547 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 615
… …
573 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
576 glEnd; 641 glEnd;
577 glPopMatrix; 642 glPopMatrix;
578 #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;
579 } 644 }
580 645
581 $self->_draw; 646 $self->_draw;
582 glPopMatrix; 647 glPopMatrix;
583} 648}
… …
586 my ($self) = @_; 651 my ($self) = @_;
587 652
588 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
589} 654}
590 655
656my $cntx;#d#
591sub DESTROY { 657sub DESTROY {
592 my ($self) = @_; 658 my ($self) = @_;
593 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
594 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
595 #$self->deactivate;
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
768 my ($self, $child) = @_; 846 my ($self, $child) = @_;
769 847
770 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
773} 850}
774 851
775sub remove { 852sub remove {
776 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
777 854
778 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
779 856
780 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
781 unless @{$self->{children}}; 858 unless @{$self->{children}};
782} 859}
783 860
784sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
785 862
786sub size_request { 863sub size_request {
787 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
788} 865}
789 866
790sub size_allocate { 867sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
792 869
793 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
794} 873}
795 874
796############################################################################# 875#############################################################################
797 876
798# back-buffered drawing area 877# back-buffered drawing area
799 878
800package CFClient::UI::Window; 879package CFPlus::UI::Window;
801 880
802our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
803 882
804use CFClient::OpenGL; 883use CFPlus::OpenGL;
805 884
806sub new { 885sub new {
807 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
808 887
809 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
814 893
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 895 $self->SUPER::update;
817} 896}
818 897
819sub size_allocate { 898sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
821 900
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
824} 904}
825 905
826sub _render { 906sub _render {
827 my ($self) = @_; 907 my ($self) = @_;
828 908
… …
830} 910}
831 911
832sub render_child { 912sub render_child {
833 my ($self) = @_; 913 my ($self) = @_;
834 914
835 $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 {
836 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
838 918
839 { 919 {
840 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
841 921
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
844 } 926 }
845
846 $self->_render;
847 }; 927 };
848} 928}
849 929
850sub _draw { 930sub _draw {
851 my ($self) = @_; 931 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 932
855 my $tex = $self->{texture} 933 my $tex = $self->{texture}
856 or return; 934 or return;
857 935
858 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
861 939
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
863 941
864 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
865} 943}
866 944
867############################################################################# 945#############################################################################
868 946
869package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
870 948
949use List::Util qw(min max);
950
871our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
872 952
873sub new { 953sub new {
874 my $class = shift; 954 my $class = shift;
875 955
876 $class->SUPER::new ( 956 $class->SUPER::new (
… …
889 $h = 10 if $self->{scroll_y}; 969 $h = 10 if $self->{scroll_y};
890 970
891 ($w, $h) 971 ($w, $h)
892} 972}
893 973
894sub size_allocate { 974sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 975 my ($self, $w, $h) = @_;
896 976
897 my $child = $self->child; 977 my $child = $self->child;
898 978
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 981
902 $self->child->configure (0, 0, $w, $h); 982 $self->child->configure (0, 0, $w, $h);
903 $self->update; 983 $self->update;
984
985 1
904} 986}
905 987
906sub set_offset { 988sub set_offset {
907 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
908 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}) {
909 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
910 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
911 997
998 $self->emit (changed => $x, $y);
912 $self->update; 999 $self->update;
1000 }
913} 1001}
914 1002
915# 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
916sub coord2local { 1004sub coord2local {
917 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
934 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
936 ) { 1024 ) {
937 $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})
938 } else { 1026 } else {
939 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
940 } 1028 }
941} 1029}
942 1030
943sub _render { 1031sub _render {
944 my ($self) = @_; 1032 my ($self) = @_;
945 1033
946 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};
947 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};
948 1036
949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950 1038
951 $self->SUPER::_render; 1039 $self->SUPER::_render;
952} 1040}
953 1041
954############################################################################# 1042#############################################################################
955 1043
956package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
957 1045
958our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
959 1047
960sub new { 1048sub new {
961 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
962 1050
963 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
964 1052
965 my $self; 1053 my $self;
966 1054
967 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
968 vertical => 1, 1065 vertical => 1,
969 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
970 on_changed => sub { 1067 on_changed => sub {
971 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
972 }, 1070 },
973 ; 1071 ;
974 1072
975 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
977 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
978 %arg, 1081 %arg,
979 ); 1082 );
980 1083
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 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
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
982 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
983 1101
984 $self 1102 $self
985} 1103}
1104
1105#TODO# update range on size_allocate depending on child
986 1106
987sub add { 1107sub add {
988 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
989 1109
990 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
991} 1111}
992 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
993sub update { 1137sub update {
994 my ($self) = @_; 1138 my ($self) = @_;
995 1139
996 $self->SUPER::update; 1140 $self->SUPER::update;
997 1141 $self->update_slider;
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1142}
1002 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
1003sub size_allocate { 1197sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1005 1199
1200 $self->update_slider;
1006 $self->SUPER::size_allocate ($w, $h); 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1202}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1203
1015############################################################################# 1204#############################################################################
1016 1205
1017package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1018 1207
1019our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1020 1209
1021use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1022 1211
1023sub new { 1212sub new {
1024 my $class = shift; 1213 my $class = shift;
1025 1214
1026 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1052 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1053} 1242}
1054 1243
1055############################################################################# 1244#############################################################################
1056 1245
1057package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1058 1247
1059our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1060 1249
1061use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1062
1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070 1251
1071sub new { 1252sub new {
1072 my ($class, %arg) = @_; 1253 my ($class, %arg) = @_;
1073 1254
1074 my $title = delete $arg{title}; 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;
1351
1352my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1354 mipmap => 1, wrap => 1;
1355
1356my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1364sub new {
1365 my ($class, %arg) = @_;
1075 1366
1076 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1369 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1370 border => 0.6,
1080 can_events => 1, 1371 can_events => 1,
1081 min_w => 16, 1372 min_w => 64,
1082 min_h => 16, 1373 min_h => 32,
1083 %arg, 1374 %arg,
1084 ); 1375 );
1085 1376
1086 $self->{title} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1378 align => 0,
1088 valign => 1, 1379 valign => 1,
1089 text => $title, 1380 text => $self->{title},
1090 fontsize => $self->{border} 1381 fontsize => $self->{border},
1091 if defined $title; 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 }
1092 1392
1093 $self 1393 $self
1094} 1394}
1095 1395
1096sub add { 1396sub add {
1097 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1098 1398
1099 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1400 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1402}
1102 1403
1103sub border { 1404sub border {
1104 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1105} 1406}
1106 1407
1107sub size_request { 1408sub size_request {
1108 my ($self) = @_; 1409 my ($self) = @_;
1109 1410
1110 $self->{title}->size_request 1411 $self->{title_widget}->size_request
1111 if $self->{title}; 1412 if $self->{title_widget};
1413
1414 $self->{close_button}->size_request
1415 if $self->{close_button};
1112 1416
1113 my ($w, $h) = $self->SUPER::size_request; 1417 my ($w, $h) = $self->SUPER::size_request;
1114 1418
1115 ( 1419 (
1116 $w + $self->border * 2, 1420 $w + $self->border * 2,
1117 $h + $self->border * 2, 1421 $h + $self->border * 2,
1118 ) 1422 )
1119} 1423}
1120 1424
1121sub size_allocate { 1425sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1426 my ($self, $w, $h) = @_;
1123 1427
1124 if ($self->{title}) { 1428 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1429 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1430 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1431 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1432 }
1129 1433
1130 my $border = $self->border; 1434 my $border = $self->border;
1131 1435
1132 $h -= List::Util::max 0, $border * 2; 1436 $h -= List::Util::max 0, $border * 2;
1133 $w -= List::Util::max 0, $border * 2; 1437 $w -= List::Util::max 0, $border * 2;
1438
1439 $self->child->configure ($border, $border, $w, $h);
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;
1134 1451
1135 $self->child->configure ($border, $border, $w, $h); 1452 1
1136} 1453}
1137 1454
1138sub button_down { 1455sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1456 my ($self, $ev, $x, $y) = @_;
1140 1457
1141 my ($w, $h) = @$self{qw(w h)}; 1458 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1459 my $border = $self->border;
1143 1460
… …
1174 1491
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1492 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1493
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1494 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1495 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1496 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1497 };
1181 } else { 1498 } else {
1182 return 0; 1499 return 0;
1183 } 1500 }
1184 1501
1185 1 1502 1
1186} 1503}
1187 1504
1188sub button_up { 1505sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1190 1507
1191 !!delete $self->{motion} 1508 ! ! delete $self->{motion}
1192} 1509}
1193 1510
1194sub mouse_motion { 1511sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1512 my ($self, $ev, $x, $y) = @_;
1196 1513
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1515
1199 !!$self->{motion} 1516 ! ! $self->{motion}
1517}
1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1200} 1525}
1201 1526
1202sub _draw { 1527sub _draw {
1203 my ($self) = @_; 1528 my ($self) = @_;
1204 1529
… …
1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1212 1537
1213 my $border = $self->border; 1538 my $border = $self->border;
1214 1539
1215 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1216 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1219 $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);
1220 1559
1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1223 1562
1224 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1230 1569
1231 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1232 1571
1233 $child->draw; 1572 $child->draw;
1234 1573
1235 if ($self->{title}) { 1574 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1575 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1576 $self->{title_widget}->_draw;
1577
1578 glTranslate 0, - ($border - $self->{h});
1238 } 1579 }
1580
1581 $self->{close_button}->draw
1582 if $self->{close_button};
1239} 1583}
1240 1584
1241############################################################################# 1585#############################################################################
1242 1586
1243package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1244 1588
1245our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1246 1590
1247use List::Util qw(max sum); 1591use List::Util qw(max sum);
1248 1592
1249use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1250 1594
1251sub new { 1595sub new {
1252 my $class = shift; 1596 my $class = shift;
1253 1597
1254 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1255 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1256 @_, 1602 @_,
1257 ) 1603 )
1258} 1604}
1259 1605
1260sub children { 1606sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262} 1608}
1263 1609
1610# TODO: store row/col info in child widget and use standard add/del
1264sub add { 1611sub add {
1265 my ($self, $x, $y, $child) = @_; 1612 my $self = shift;
1266 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
1267 $child->set_parent ($self); 1624 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1626 }
1269 1627
1628 $self->{force_realloc} = 1;
1629 $self->{force_size_alloc} = 1;
1270 $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 }
1271} 1641}
1272 1642
1273# 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?
1274sub clear { 1644sub clear {
1275 my ($self) = @_; 1645 my ($self) = @_;
… …
1316 (sum @$ws), 1686 (sum @$ws),
1317 (sum @$hs), 1687 (sum @$hs),
1318 ) 1688 )
1319} 1689}
1320 1690
1321sub size_allocate { 1691sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1692 my ($self, $w, $h) = @_;
1323 1693
1324 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1325 1695
1326 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1327 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1328 1698
1329 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1330 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1331 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1332 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1333 1703
1334 # linearly scale sizes
1335 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1336 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1337 1705
1338 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
1339 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1340 1715
1341 my $y; 1716 my $y;
1342 1717
1343 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1344 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1358 } 1733 }
1359 1734
1360 $y += $row_h; 1735 $y += $row_h;
1361 } 1736 }
1362 1737
1738 1
1363} 1739}
1364 1740
1365sub find_widget { 1741sub find_widget {
1366 my ($self, $x, $y) = @_; 1742 my ($self, $x, $y) = @_;
1367 1743
… …
1386 } 1762 }
1387} 1763}
1388 1764
1389############################################################################# 1765#############################################################################
1390 1766
1391package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1392 1768
1769use List::Util qw(min max);
1770
1393our @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::;
1394 1852
1395sub size_request { 1853sub size_request {
1396 my ($self) = @_; 1854 my ($self) = @_;
1397 1855
1398 $self->{vertical} 1856 $self->{vertical}
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1863 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1864 )
1407} 1865}
1408 1866
1409sub size_allocate { 1867sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1868 my ($self, $w, $h) = @_;
1411 1869
1412 my $space = $self->{vertical} ? $h : $w; 1870 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1871 my @children = $self->visible_children;
1414 1872
1415 my @req; 1873 my @req;
1416 1874
1417 if ($self->{homogeneous}) { 1875 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1876 @req = ($space / (@children || 1)) x @children;
1419 } else { 1877 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1878 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1879 my $req = List::Util::sum @req;
1422 1880
1423 if ($req > $space) { 1881 if ($req > $space) {
1424 # ah well, not enough space 1882 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1883 $_ *= $space / $req for @req;
1426 } else { 1884 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1885 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1886
1429 $space = ($space - $req) / $expand; # remaining space to give away 1887 $space = ($space - $req) / $expand; # remaining space to give away
1430 1888
1431 $req[$_] += $space * $children->[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1890 for 0 .. $#children;
1433 } 1891 }
1434 } 1892 }
1435 1893
1436 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1437 1895
1438 my $pos = 0; 1896 my $pos = 0;
1439 for (0 .. $#$children) { 1897 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1441 $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));
1442 1900
1443 $pos += $alloc; 1901 $pos += $alloc;
1444 } 1902 }
1445 1903
1446 1 1904 1
1447} 1905}
1448 1906
1449############################################################################# 1907#############################################################################
1450 1908
1451package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1452 1910
1453our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1454 1912
1455sub new { 1913sub new {
1456 my $class = shift; 1914 my $class = shift;
1457 1915
1458 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1461 ) 1919 )
1462} 1920}
1463 1921
1464############################################################################# 1922#############################################################################
1465 1923
1466package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1467 1925
1468our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1469 1927
1470sub new { 1928sub new {
1471 my $class = shift; 1929 my $class = shift;
1472 1930
1473 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1476 ) 1934 )
1477} 1935}
1478 1936
1479############################################################################# 1937#############################################################################
1480 1938
1481package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1482 1940
1483our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1484 1942
1485use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1486 1944
1487sub new { 1945sub new {
1488 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1489 1947
1490 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1493 #active_bg => none 1951 #active_bg => none
1494 #font => default_font 1952 #font => default_font
1495 #text => initial text 1953 #text => initial text
1496 #markup => initial narkup 1954 #markup => initial narkup
1497 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1498 ellipsise => 3, # end 1957 ellipsise => 3, # end
1499 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1500 fontsize => 1, 1959 fontsize => 1,
1501 align => -1, 1960 align => -1,
1502 valign => -1, 1961 valign => -1,
1503 padding_x => 2, 1962 padding_x => 2,
1504 padding_y => 2, 1963 padding_y => 2,
1505 can_events => 0, 1964 can_events => 0,
1506 %arg 1965 %arg
1507 ); 1966 );
1508 1967
1509 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1511 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout; 1971 $self->{template} = $layout;
1513 } 1972 }
1514 1973
1515 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1519 } 1978 }
1520 1979
1521 $self 1980 $self
1522} 1981}
1523 1982
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1983sub update {
1535 my ($self) = @_; 1984 my ($self) = @_;
1536 1985
1537 delete $self->{texture}; 1986 delete $self->{texture};
1538 $self->SUPER::update; 1987 $self->SUPER::update;
1539} 1988}
1540 1989
1990sub realloc {
1991 my ($self) = @_;
1992
1993 delete $self->{ox};
1994 $self->SUPER::realloc;
1995}
1996
1541sub set_text { 1997sub set_text {
1542 my ($self, $text) = @_; 1998 my ($self, $text) = @_;
1543 1999
1544 return if $self->{text} eq "T$text"; 2000 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 2001 $self->{text} = "T$text";
1546 2002
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 2003 $self->{layout}->set_text ($text);
1549 2004
2005 delete $self->{size_req};
1550 $self->realloc; 2006 $self->realloc;
1551 $self->update; 2007 $self->update;
1552} 2008}
1553 2009
1554sub set_markup { 2010sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 2013 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 2014 $self->{text} = "M$markup";
1559 2015
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2016 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 2017
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 2018 $self->{layout}->set_markup ($markup);
1564 2019
2020 delete $self->{size_req};
1565 $self->realloc; 2021 $self->realloc;
1566 $self->update; 2022 $self->update;
1567} 2023}
1568 2024
1569sub size_request { 2025sub size_request {
1570 my ($self) = @_; 2026 my ($self) = @_;
1571 2027
2028 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2029 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 2030 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2031 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2032 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2033 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 2034
1578 my ($w, $h) = $self->{layout}->size; 2035 my ($w, $h) = $self->{layout}->size;
1579 2036
1580 if (exists $self->{template}) { 2037 if (exists $self->{template}) {
1581 $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);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2040 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 2041
1584 my ($w2, $h2) = $self->{template}->size; 2042 my ($w2, $h2) = $self->{template}->size;
1585 2043
1586 $w = List::Util::max $w, $w2; 2044 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 2045 $h = List::Util::max $h, $h2;
2046 }
2047
2048 [$w, $h]
1588 } 2049 };
1589 2050
1590 ($w, $h) 2051 @{ $self->{size_req} }
1591} 2052}
1592 2053
2054sub baseline_shift {
2055 $_[0]{layout}->descent
2056}
2057
1593sub size_allocate { 2058sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 2059 my ($self, $w, $h) = @_;
1595 2060
1596 delete $self->{ox}; 2061 delete $self->{ox};
1597 2062
1598 delete $self->{texture} 2063 delete $self->{texture}
1599 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
1600} 2067}
1601 2068
1602sub set_fontsize { 2069sub set_fontsize {
1603 my ($self, $fontsize) = @_; 2070 my ($self, $fontsize) = @_;
1604 2071
1605 $self->{fontsize} = $fontsize; 2072 $self->{fontsize} = $fontsize;
2073 delete $self->{size_req};
1606 delete $self->{texture}; 2074 delete $self->{texture};
1607 2075
1608 $self->realloc; 2076 $self->realloc;
1609} 2077}
1610 2078
2079sub reconfigure {
2080 my ($self) = @_;
2081
2082 delete $self->{size_req};
2083 delete $self->{texture};
2084
2085 $self->SUPER::reconfigure;
2086}
2087
1611sub _draw { 2088sub _draw {
1612 my ($self) = @_; 2089 my ($self) = @_;
1613 2090
1614 $self->SUPER::_draw; # draw background, if applicable 2091 $self->SUPER::_draw; # draw background, if applicable
1615 2092
1616 my $tex = $self->{texture} ||= do { 2093 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 2094 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2095 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 2096 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2097 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2098 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2099 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 2100
1624 new_from_layout CFClient::Texture $self->{layout} 2101 [$self->{layout}->size]
1625 }; 2102 };
1626 2103
1627 unless (exists $self->{ox}) { 2104 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2105 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2106 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 2107 : ($self->{w} - $size->[0]) * 0.5);
1631 2108
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 2111 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 2112 };
1636 2113
1637 glEnable GL_TEXTURE_2D; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 2116
1640 glColor_premultiply @{$self->{fg}} 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 2118}
1647 2119
1648############################################################################# 2120#############################################################################
1649 2121
1650package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1651 2123
1652our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1653 2125
1654use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1655 2127
1656sub new { 2128sub new {
1657 my $class = shift; 2129 my $class = shift;
1658 2130
1659 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1663 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1664 can_hover => 1, 2136 can_hover => 1,
1665 can_focus => 1, 2137 can_focus => 1,
1666 valign => 0, 2138 valign => 0,
1667 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1668 #text => ... 2141 #text => ...
2142 #hidden => "*",
1669 @_ 2143 @_
1670 ) 2144 )
1671} 2145}
1672 2146
1673sub _set_text { 2147sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 2154 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 2155 $self->{text} = $text;
1682 2156
1683 $text =~ s/./*/g if $self->{hidden}; 2157 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 2158 $self->{layout}->set_text ("$text ");
2159 delete $self->{size_req};
1685 2160
1686 $self->_emit (changed => $self->{text}); 2161 $self->emit (changed => $self->{text});
2162
2163 $self->realloc;
1687 $self->update; 2164 $self->update;
1688} 2165}
1689 2166
1690sub set_text { 2167sub set_text {
1691 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
1692 2169
1693 $self->{cursor} = length $text; 2170 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 2171 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 2172}
1698 2173
1699sub get_text { 2174sub get_text {
1700 $_[0]{text} 2175 $_[0]{text}
1701} 2176}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 2181 my ($w, $h) = $self->SUPER::size_request;
1707 2182
1708 ($w + 1, $h) # add 1 for cursor 2183 ($w + 1, $h) # add 1 for cursor
1709} 2184}
1710 2185
1711sub key_down { 2186sub invoke_key_down {
1712 my ($self, $ev) = @_; 2187 my ($self, $ev) = @_;
1713 2188
1714 my $mod = $ev->{mod}; 2189 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1717 2192
1718 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;
1719 2196
1720 if ($uni == 8) { 2197 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } 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 = "";
1729 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2221 $self->emit ('escape');
1734 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2226 } else {
1737 return 0; 2227 return 0;
1738 } 2228 }
1739 2229
1740 $self->_set_text ($text); 2230 $self->_set_text ($text);
1741 2231
1742 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1743 2234
1744 1 2235 1
1745} 2236}
1746 2237
1747sub focus_in { 2238sub invoke_focus_in {
1748 my ($self) = @_; 2239 my ($self) = @_;
1749 2240
1750 $self->{last_activity} = $::NOW; 2241 $self->{last_activity} = $::NOW;
1751 2242
1752 $self->SUPER::focus_in; 2243 $self->SUPER::invoke_focus_in
1753} 2244}
1754 2245
1755sub button_down { 2246sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2247 my ($self, $ev, $x, $y) = @_;
1757 2248
1758 $self->SUPER::button_down ($ev, $x, $y); 2249 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2250
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2251 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2252
1762 # byte-index to char-index 2253 # byte-index to char-index
1763 my $text = $self->{text}; 2254 my $text = $self->{text};
1764 utf8::encode $text; 2255 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2256 $self->{cursor} = length $text;
1766 2257
1767 $self->_set_text ($self->{text}); 2258 $self->_set_text ($self->{text});
1768 $self->update; 2259 $self->update;
1769 2260
1770 1 2261 1
1771} 2262}
1772 2263
1773sub mouse_motion { 2264sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 2267
1777 0 2268 1
1778} 2269}
1779 2270
1780sub _draw { 2271sub _draw {
1781 my ($self) = @_; 2272 my ($self) = @_;
1782 2273
… …
1809 utf8::encode $text; 2300 utf8::encode $text;
1810 2301
1811 @$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)
1812 } 2303 }
1813 2304
1814 glColor @{$self->{fg}};
1815 glBegin GL_LINES; 2305 glBegin GL_LINES;
1816 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};
1817 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};
1818 glEnd; 2308 glEnd;
1819 } 2309 }
1820} 2310}
1821 2311
2312#############################################################################
2313
1822package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1823 2315
1824our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1825 2317
1826use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1827 2319
1828sub key_down { 2320sub invoke_key_down {
1829 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1830 2322
1831 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1832 2324
1833 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
2328
1836 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2331 $self->emit (activate => $txt);
1839 $self->update; 2332 $self->update;
1840 2333
1841 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1844 } 2337 }
1845 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2342 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2344 }
1852 2345
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2349
1857 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2352 } else {
1860 $self->set_text ($self->{history_saveback}); 2353 $self->set_text ($self->{history_saveback});
1861 } 2354 }
1862 2355
1863 } else { 2356 } else {
1864 return $self->SUPER::key_down ($ev) 2357 return $self->SUPER::invoke_key_down ($ev)
1865 } 2358 }
1866 2359
1867 1 2360 1
1868} 2361}
1869 2362
1870############################################################################# 2363#############################################################################
1871 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
1872package CFClient::UI::Button; 2404package CFPlus::UI::Button;
1873 2405
1874our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
1875 2407
1876use CFClient::OpenGL; 2408use CFPlus::OpenGL;
1877 2409
1878my @tex = 2410my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
1881 2413
1882sub new { 2414sub new {
1883 my $class = shift; 2415 my $class = shift;
1884 2416
1885 $class->SUPER::new ( 2417 $class->SUPER::new (
1886 padding_x => 4, 2418 padding_x => 4,
1887 padding_y => 4, 2419 padding_y => 4,
1888 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
1889 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
1890 can_hover => 1, 2422 can_hover => 1,
1891 align => 0, 2423 align => 0,
1892 valign => 0, 2424 valign => 0,
1893 can_events => 1, 2425 can_events => 1,
1894 @_ 2426 @_
1895 ) 2427 )
1896} 2428}
1897 2429
1898sub activate { }
1899
1900sub button_up { 2430sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
1902 2432
1903 $self->emit ("activate") 2433 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2434 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2435 && $y >= 0 && $y < $self->{h};
… …
1914 2444
1915 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1917 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
1918 2448
2449 my $tex = $tex[$GRAB == $self];
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 2451
1921 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
1922 2453
1923 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
1924} 2455}
1925 2456
1926############################################################################# 2457#############################################################################
1927 2458
1928package CFClient::UI::CheckBox; 2459package CFPlus::UI::CheckBox;
1929 2460
1930our @ISA = CFClient::UI::DrawBG::; 2461our @ISA = CFPlus::UI::DrawBG::;
1931 2462
1932my @tex = 2463my @tex =
1933 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1934 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1935 2466
1936use CFClient::OpenGL; 2467use CFPlus::OpenGL;
1937 2468
1938sub new { 2469sub new {
1939 my $class = shift; 2470 my $class = shift;
1940 2471
1941 $class->SUPER::new ( 2472 $class->SUPER::new (
… …
1955 my ($self) = @_; 2486 my ($self) = @_;
1956 2487
1957 (6) x 2 2488 (6) x 2
1958} 2489}
1959 2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
1960sub button_down { 2499sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2500 my ($self, $ev, $x, $y) = @_;
1962 2501
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2504 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2505 } else {
1968 return 0 2506 return 0
1969 } 2507 }
1970 2508
1971 1 2509 1
… …
1991 glDisable GL_TEXTURE_2D; 2529 glDisable GL_TEXTURE_2D;
1992} 2530}
1993 2531
1994############################################################################# 2532#############################################################################
1995 2533
1996package CFClient::UI::Image; 2534package CFPlus::UI::Image;
1997 2535
1998our @ISA = CFClient::UI::Base::; 2536our @ISA = CFPlus::UI::Base::;
1999 2537
2000use CFClient::OpenGL; 2538use CFPlus::OpenGL;
2001use Carp qw/confess/;
2002 2539
2003our %loaded_images; 2540our %texture_cache;
2004 2541
2005sub new { 2542sub new {
2006 my $class = shift; 2543 my $class = shift;
2007 2544
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 @_,
2548 );
2009 2549
2010 $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";
2011 2552
2012 $loaded_images{$self->{image}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 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;
2014 2555
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2016 2557
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2559
2021 $self 2560 $self
2022} 2561}
2023 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
2024sub size_request { 2578sub size_request {
2025 my ($self) = @_; 2579 my ($self) = @_;
2026 2580
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2581 ($self->{tex}{w}, $self->{tex}{h})
2028} 2582}
2029 2583
2030sub _draw { 2584sub _draw {
2031 my ($self) = @_; 2585 my ($self) = @_;
2032 2586
… …
2042 } 2596 }
2043 2597
2044 glEnable GL_TEXTURE_2D; 2598 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046 2600
2047 $tex->draw_quad_alpha (0, 0, $w, $h); 2601 $tex->draw_quad (0, 0, $w, $h);
2048 2602
2049 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2050} 2604}
2051 2605
2052############################################################################# 2606#############################################################################
2053 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
2054package CFClient::UI::VGauge; 2644package CFPlus::UI::VGauge;
2055 2645
2056our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2057 2647
2058use List::Util qw(min max); 2648use List::Util qw(min max);
2059 2649
2060use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2061 2651
2062my %tex = ( 2652my %tex = (
2063 food => [ 2653 food => [
2064 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2065 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2066 ], 2656 ],
2067 grace => [ 2657 grace => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 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/
2070 ], 2660 ],
2071 hp => [ 2661 hp => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2074 ], 2664 ],
2075 mana => [ 2665 mana => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 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/
2078 ], 2668 ],
2079); 2669);
2080 2670
2081# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2731 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2732 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2733
2144 my $h1 = $self->{h} * (1 - $ycut1); 2734 my $h1 = $self->{h} * (1 - $ycut1);
2145 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);
2146 2739
2147 glEnable GL_BLEND; 2740 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2741 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2742 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2743 glEnable GL_TEXTURE_2D;
… …
2169 2762
2170 if ($t3) { 2763 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2764 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2765 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2766 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2767 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2768 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2769 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2770 glEnd;
2178 } 2771 }
2179 2772
2180 glDisable GL_BLEND; 2773 glDisable GL_BLEND;
2181 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2182} 2775}
2183 2776
2184############################################################################# 2777#############################################################################
2185 2778
2186package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2187 2780
2188our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2189 2782
2190sub new { 2783sub new {
2191 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2192 2785
2193 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2195 can_hover => 1, 2788 can_hover => 1,
2196 can_events => 1, 2789 can_events => 1,
2197 %arg, 2790 %arg,
2198 ); 2791 );
2199 2792
2200 $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");
2201 $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);
2202 $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");
2203 2796
2204 $self 2797 $self
2205} 2798}
2206 2799
2207sub set_fontsize { 2800sub set_fontsize {
… …
2228 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2229} 2822}
2230 2823
2231############################################################################# 2824#############################################################################
2232 2825
2233package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2234 2827
2235use strict; 2828use strict;
2236 2829
2237use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2238 2831
2239our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2240 2833
2241my @tex = 2834my @tex =
2242 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2243 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2244 2837
2245sub new { 2838sub new {
2246 my $class = shift; 2839 my $class = shift;
2247 2840
… …
2268 $self->update; 2861 $self->update;
2269 2862
2270 $self 2863 $self
2271} 2864}
2272 2865
2273sub changed { }
2274
2275sub set_range { 2866sub set_range {
2276 my ($self, $range) = @_; 2867 my ($self, $range) = @_;
2277 2868
2278 ($range, $self->{range}) = ($self->{range}, $range); 2869 ($range, $self->{range}) = ($self->{range}, $range);
2279 2870
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2871 if ("@$range" ne "@{$self->{range}}") {
2872 $self->update;
2873 $self->set_value ($self->{range}[0]);
2874 }
2282} 2875}
2283 2876
2284sub set_value { 2877sub set_value {
2285 my ($self, $value) = @_; 2878 my ($self, $value) = @_;
2286 2879
… …
2297 if $unit; 2890 if $unit;
2298 2891
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2892 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2893
2301 if ($value != $old_value) { 2894 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2895 $self->emit (changed => $value);
2303 $self->update; 2896 $self->update;
2304 } 2897 }
2305} 2898}
2306 2899
2307sub size_request { 2900sub size_request {
2308 my ($self) = @_; 2901 my ($self) = @_;
2309 2902
2310 ($self->{req_w}, $self->{req_h}) 2903 ($self->{req_w}, $self->{req_h})
2311} 2904}
2312 2905
2313sub button_down { 2906sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2907 my ($self, $ev, $x, $y) = @_;
2315 2908
2316 $self->SUPER::button_down ($ev, $x, $y); 2909 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2910
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2912
2320 $self->mouse_motion ($ev, $x, $y) 2913 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2914}
2322 2915
2323sub mouse_motion { 2916sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2917 my ($self, $ev, $x, $y) = @_;
2325 2918
2326 if ($GRAB == $self) { 2919 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2920 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2921
… …
2334 } else { 2927 } else {
2335 return 0; 2928 return 0;
2336 } 2929 }
2337 2930
2338 1 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
2339} 2944}
2340 2945
2341sub update { 2946sub update {
2342 my ($self) = @_; 2947 my ($self) = @_;
2343 2948
… …
2392 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2393} 2998}
2394 2999
2395############################################################################# 3000#############################################################################
2396 3001
2397package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2398 3003
2399our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2400 3005
2401sub new { 3006sub new {
2402 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2403 3008
2404 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2405 3010
2406 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift }, 3014 to_value => sub { shift },
2410 from_value => sub { shift }, 3015 from_value => sub { shift },
2411 %arg, 3016 %arg,
2412 ); 3017 );
2413 3018
… …
2433sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2435 3040
2436############################################################################# 3041#############################################################################
2437 3042
2438package CFClient::UI::TextView; 3043package CFPlus::UI::TextScroller;
2439 3044
2440our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2441 3046
2442use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2443 3048
2444sub new { 3049sub new {
2445 my $class = shift; 3050 my $class = shift;
2446 3051
2447 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
2448 fontsize => 1, 3053 fontsize => 1,
2449 can_events => 0, 3054 can_events => 1,
3055 indent => 0,
2450 #font => default_font 3056 #font => default_font
2451 @_, 3057 @_,
2452 3058
2453 layout => (new CFClient::Layout 1), 3059 layout => (new CFPlus::Layout),
2454 par => [], 3060 par => [],
3061 max_par => 0,
2455 height => 0, 3062 height => 0,
2456 children => [ 3063 children => [
2457 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2459 ], 3066 ],
2460 ); 3067 );
2461 3068
2462 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2463 3070
… …
2469 3076
2470 $self->{fontsize} = $fontsize; 3077 $self->{fontsize} = $fontsize;
2471 $self->reflow; 3078 $self->reflow;
2472} 3079}
2473 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
2474sub size_allocate { 3090sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 3091 my ($self, $w, $h) = @_;
2476 3092
2477 $self->SUPER::size_allocate ($w, $h); 3093 my ($empty, $slider, @other) = @{ $self->{children} };
3094 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 3095
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3096 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3097 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $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});
2482 3100
2483 $self->reflow; 3101 $self->reflow;
2484}
2485 3102
2486sub text_size { 3103 local $self->{children} = [$empty, $slider];
3104 $self->SUPER::invoke_size_allocate ($w, $h)
3105}
3106
3107sub invoke_mouse_wheel {
2487 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) = @_;
2488 3119
2489 my $layout = $self->{layout}; 3120 my $layout = $self->{layout};
2490 3121
3122 $layout->set_font ($self->{font}) if $self->{font};
3123 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3124 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $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});
2493 $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}}
2494 3133 );
3134
2495 $layout->size 3135 $layout
2496} 3136}
2497 3137
2498sub reflow { 3138sub reflow {
2499 my ($self) = @_; 3139 my ($self) = @_;
2500 3140
… …
2507 3147
2508 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2510} 3150}
2511 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
2512sub clear { 3167sub clear {
2513 my ($self) = @_; 3168 my ($self) = @_;
3169
3170 my (undef, undef, @other) = @{ $self->{children} };
3171 $self->remove ($_) for @other;
2514 3172
2515 $self->{par} = []; 3173 $self->{par} = [];
2516 $self->{height} = 0; 3174 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 3176}
2519 3177
2520sub add_paragraph { 3178sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 3179 my $self = shift;
2522 3180
2523 for my $line (split /\n/, $text) { 3181 for my $para (@_) {
2524 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
2525 $self->{height} += $h; 3233 $self->{height} = $height;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 }
2528 3235
2529 $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 }
2530} 3242}
2531 3243
2532sub update { 3244sub update {
2533 my ($self) = @_; 3245 my ($self) = @_;
2534 3246
… …
2536 3248
2537 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2538 3250
2539 delete $self->{texture}; 3251 delete $self->{texture};
2540 3252
2541 $ROOT->on_post_alloc ($self, sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 3257
2544 if (delete $self->{need_reflow}) {
2545 my $height = 0;
2546
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2562
2563 $self->{height} = $height;
2564
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2566
2567 delete $self->{texture};
2568 }
2569
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2573 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;
2574 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2575 3271
2576 my $y0 = $top; 3272 my $y0 = $top;
2577 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2578 3274
2579 my $y = 0;
2580
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2591 3278
2592 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 3280 my $layout = $self->get_layout ($para);
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 3281
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3282 $layout->render ($para->{indent}, $y - $y0);
2598 3283
2599 glRasterPos $par->[3], $y - $y0; 3284 if (my @w = @{ $para->{widget} }) {
2600 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 }
2601 } 3296 }
2602 3297
2603 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2604 } 3300 }
2605 3301
2606 glDisable GL_BLEND; 3302 $self->{top_paragraph} = $top_paragraph;
2607 }; 3303 };
2608 }); 3304 });
3305}
3306
3307sub reconfigure {
3308 my ($self) = @_;
3309
3310 $self->SUPER::reconfigure;
3311
3312 $_->{w} = 1e10 for @{ $self->{par} };
3313 $self->reflow;
2609} 3314}
2610 3315
2611sub _draw { 3316sub _draw {
2612 my ($self) = @_; 3317 my ($self) = @_;
2613 3318
… …
2616 glColor 0, 0, 0, 1; 3321 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (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});
2618 glDisable GL_TEXTURE_2D; 3323 glDisable GL_TEXTURE_2D;
2619 3324
2620 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2621
2622} 3326}
2623 3327
2624############################################################################# 3328#############################################################################
2625 3329
2626package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2627 3331
2628use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2629 3333
2630our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2631 3335
2632sub moveto { 3336sub moveto {
2633 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2634 3338
2635 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2663 glPopMatrix; 3367 glPopMatrix;
2664} 3368}
2665 3369
2666############################################################################# 3370#############################################################################
2667 3371
2668package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2669 3373
2670our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2671 3375
2672sub new { 3376sub new {
2673 my $class = shift; 3377 my $class = shift;
2674 3378
2675 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2687 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2688} 3392}
2689 3393
2690############################################################################# 3394#############################################################################
2691 3395
2692package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2693 3397
2694our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2695 3399
2696use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2697 3401
2698sub new { 3402sub new {
2699 my $class = shift; 3403 my $class = shift;
2700 3404
2701 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2704 ) 3408 )
2705} 3409}
2706 3410
2707sub set_tooltip_from { 3411sub set_tooltip_from {
2708 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2709 3416
2710 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2711 3418
2712 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 3422 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 3423 . "visible $widget->{visible}";
2717 } 3424 }
2718 3425
3426 $tooltip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//;
3428
2719 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2720 markup => $tooltip, 3430 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 3432 fontsize => 0.8,
2723 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2724 ellipsise => 0, 3434 ellipsise => 0,
2725 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2726 ); 3436 );
2727} 3437}
2728 3438
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3443
2734 ($w + 4, $h + 4) 3444 ($w + 4, $h + 4)
2735} 3445}
2736 3446
2737sub size_allocate { 3447sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3448 my ($self, $w, $h) = @_;
2739 3449
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3450 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3451}
2742 3452
2743sub visibility_change { 3453sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3454 my ($self, $visible) = @_;
2745 3455
2746 return unless $visible; 3456 return unless $visible;
2747 3457
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3458 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3459 my $widget = $self->{owner}
2750 or return; 3460 or return;
2751 3461
3462 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3463 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3464
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3465 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3466 if $x + $self->{w} > $self->{root}{w};
2756 3467
2757 $self->move_abs ($x, $y); 3468 $self->move_abs ($x, $y);
3469 } else {
3470 $self->hide;
3471 }
2758 }); 3472 });
2759} 3473}
2760 3474
2761sub _draw { 3475sub _draw {
2762 my ($self) = @_; 3476 my ($self) = @_;
… …
2786 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
2787} 3501}
2788 3502
2789############################################################################# 3503#############################################################################
2790 3504
2791package CFClient::UI::Face; 3505package CFPlus::UI::Face;
2792 3506
2793our @ISA = CFClient::UI::Base::; 3507our @ISA = CFPlus::UI::DrawBG::;
2794 3508
2795use CFClient::OpenGL; 3509use CFPlus::OpenGL;
2796 3510
2797sub new { 3511sub new {
2798 my $class = shift; 3512 my $class = shift;
2799 3513
2800 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
2801 aspect => 1, 3517 aspect => 1,
2802 can_events => 0, 3518 can_events => 0,
2803 @_, 3519 @_,
2804 ); 3520 );
2805 3521
2806 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
2808 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2809 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1, 3528 parked => 1,
2812 interval => $self->{animspeed},
2813 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
2814 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
2815 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
2816 }, 3537 },
2817 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
2818 } 3542 }
2819 3543
2820 $self 3544 $self
2821} 3545}
2822 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
2823sub size_request { 3577sub size_request {
2824 (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)
2825} 3593}
2826 3594
2827sub update { 3595sub update {
2828 my ($self) = @_; 3596 my ($self) = @_;
2829 3597
2830 return unless $self->{visible}; 3598 return unless $self->{visible};
2831 3599
2832 $self->SUPER::update; 3600 $self->SUPER::update;
2833} 3601}
2834 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
2835sub _draw { 3611sub _draw {
2836 my ($self) = @_; 3612 my ($self) = @_;
2837 3613
2838 return unless $::CONN; 3614 return unless $::CONN;
2839 3615
2840 my $face; 3616 $self->SUPER::_draw;
2841 3617
2842 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
2844 3619 or return;
2845 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim;
2847 }
2848 3620
2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
2850 3622
2851 if ($tex) { 3623 if ($tex) {
2852 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2854 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3628 glDisable GL_TEXTURE_2D;
2857 } 3629 }
2858} 3630}
2859 3631
2860sub DESTROY { 3632sub destroy {
2861 my ($self) = @_; 3633 my ($self) = @_;
2862 3634
2863 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
2864 if $self->{timer}; 3636 if $self->{timer};
2865 3637
2866 $self->SUPER::DESTROY; 3638 $self->SUPER::destroy;
2867} 3639}
2868 3640
2869############################################################################# 3641#############################################################################
2870 3642
2871package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
2872 3644
2873our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
2874 3646
2875# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
2876 3648
2877############################################################################# 3649#############################################################################
2878 3650
2879package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
2880 3652
2881our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
2882 3654
2883use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2884 3656
2885sub new { 3657sub new {
2886 my $class = shift; 3658 my $class = shift;
2887 3659
2888 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
2889 items => [], 3661 items => [],
2890 z => 100, 3662 z => 100,
2891 @_, 3663 @_,
2892 ); 3664 );
2893 3665
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2895 3667
2896 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
2898 3670
2899 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
2900 if (!ref $widget) { 3672 if (!ref $widget) {
3673 if ($widget =~ /\t/) {
3674 my ($left, $right) = split /\t/, $widget, 2;
3675
2901 $widget = new CFClient::UI::Label 3676 $widget = new CFPlus::UI::HBox
2902 can_hover => 1, 3677 can_hover => 1,
2903 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,
2904 text => $widget; 3690 markup => $widget,
3691 tooltip => $tooltip;
3692 }
2905 } 3693 }
2906 3694
2907 $self->{item}{$widget} = $item; 3695 $self->{item}{$widget} = $item;
2908 3696
2909 $self->{vbox}->add ($widget); 3697 $self->{vbox}->add ($widget);
… …
2914 3702
2915# 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)
2916sub popup { 3704sub popup {
2917 my ($self, $ev) = @_; 3705 my ($self, $ev) = @_;
2918 3706
2919 $self->_emit ("popdown"); 3707 $self->emit ("popdown");
2920 3708
2921 # maybe save $GRAB? must be careful about events... 3709 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3710 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3711 $self->{button} = $ev->{button};
2924 3712
2925 $self->show; 3713 $self->show;
2926 $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);
2927} 3715}
2928 3716
2929sub mouse_motion { 3717sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3718 my ($self, $ev, $x, $y) = @_;
2931 3719
2932 # TODO: should use vbox->find_widget or so 3720 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3721 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3722 $self->{hover} = $self->{item}{$HOVER};
2935 3723
2936 0 3724 0
2937} 3725}
2938 3726
2939sub button_up { 3727sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3728 my ($self, $ev, $x, $y) = @_;
2941 3729
2942 if ($ev->{button} == $self->{button}) { 3730 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3731 undef $GRAB;
2944 $self->hide; 3732 $self->hide;
2945 3733
2946 $self->_emit ("popdown"); 3734 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3735 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3736 } else {
2949 return 0 3737 return 0
2950 } 3738 }
2951 3739
2952 1 3740 1
2953} 3741}
2954 3742
2955############################################################################# 3743#############################################################################
2956 3744
2957package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
2958 3746
2959our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
2960 3748
2961sub new { 3749sub new {
2962 my $class = shift; 3750 my $class = shift;
2963 3751
2964 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
2978 3766
2979 $self->{current} = $self->{children}[0] 3767 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3768 if @{ $self->{children} };
2981} 3769}
2982 3770
3771sub get_current_page {
3772 my ($self) = @_;
3773
3774 $self->{current}
3775}
3776
2983sub set_current_page { 3777sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3778 my ($self, $page_or_widget) = @_;
2985 3779
2986 my $widget = ref $page_or_widget 3780 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3781 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3782 : $self->{children}[$page_or_widget];
2989 3783
2990 $self->{current} = $widget; 3784 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3785 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3786
2993 $self->_emit (page_changed => $self->{current}); 3787 $self->emit (page_changed => $self->{current});
2994 3788
2995 $self->realloc; 3789 $self->realloc;
2996} 3790}
2997 3791
2998sub visible_children { 3792sub visible_children {
… …
3003 my ($self) = @_; 3797 my ($self) = @_;
3004 3798
3005 $self->{current}->size_request 3799 $self->{current}->size_request
3006} 3800}
3007 3801
3008sub size_allocate { 3802sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3010 3804
3011 $self->{current}->configure (0, 0, $w, $h); 3805 $self->{current}->configure (0, 0, $w, $h);
3806
3807 1
3012} 3808}
3013 3809
3014sub _draw { 3810sub _draw {
3015 my ($self) = @_; 3811 my ($self) = @_;
3016 3812
3017 $self->{current}->draw; 3813 $self->{current}->draw;
3018} 3814}
3019 3815
3020############################################################################# 3816#############################################################################
3021 3817
3022package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3023 3819
3024our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3025 3821
3026sub new { 3822sub new {
3027 my $class = shift; 3823 my $class = shift;
3028 3824
3029 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3033 @_, 3829 @_,
3034 ); 3830 );
3035 3831
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3040} 3836}
3041 3837
3042sub add { 3838sub add {
3043 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3044 3840
3045 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3046 3842
3047 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3048 markup => $title, 3844 markup => $title,
3049 tooltip => $tooltip, 3845 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3051 ); 3847 );
3052 3848
3053 $self->{multiplexer}->add ($widget); 3849 $self->{multiplexer}->add ($widget);
3054} 3850}
3055 3851
3852sub get_current_page {
3853 my ($self) = @_;
3854
3855 $self->{multiplexer}->get_current_page
3856}
3857
3056sub set_current_page { 3858sub set_current_page {
3057 my ($self, $page) = @_; 3859 my ($self, $page) = @_;
3058 3860
3059 $self->{multiplexer}->set_current_page ($page); 3861 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3863}
3062 3864
3063############################################################################# 3865#############################################################################
3064 3866
3065package CFClient::UI::Statusbox; 3867package CFPlus::UI::Selector;
3066 3868
3869use utf8;
3870
3067our @ISA = CFClient::UI::VBox::; 3871our @ISA = CFPlus::UI::Button::;
3068 3872
3069sub new { 3873sub new {
3070 my $class = shift; 3874 my $class = shift;
3071 3875
3072 $class->SUPER::new ( 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 (
3073 fontsize => 0.8, 3931 fontsize => 0.8,
3074 @_, 3932 @_,
3075 ) 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
3076} 3940}
3077 3941
3078sub reorder { 3942sub reorder {
3079 my ($self) = @_; 3943 my ($self) = @_;
3080 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} };
3081 3950
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3953 }
3085 3954
… …
3088 my @items = sort { 3957 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3958 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3959 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3960 } values %{ $self->{item} };
3092 3961
3962 $self->{timer}->interval (1);
3963
3093 my $count = 10 + 1; 3964 my $count = 10 + 1;
3094 for my $item (@items) { 3965 for my $item (@items) {
3095 last unless --$count; 3966 last unless --$count;
3096 3967
3097 push @widgets, $item->{label} ||= do { 3968 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3969 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3970 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3971 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3972 : $item->{text};
3102 3973
3103 for ($short) { 3974 for ($short) {
3104 s/^\s+//; 3975 s/^\s+//;
3105 s/\s+/ /g; 3976 s/\s+/ /g;
3106 } 3977 }
3107 3978
3108 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3109 markup => $short, 3980 markup => $short,
3110 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3985 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3986 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3987 can_events => 1,
3117 can_hover => 1 3988 can_hover => 1
3118 }; 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;
3119 } 4002 }
3120 4003
3121 $self->clear; 4004 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 4005 $self->SUPER::add (reverse @widgets);
3123} 4006}
… …
3128 $text =~ s/^\s+//; 4011 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 4012 $text =~ s/\s+$//;
3130 4013
3131 return unless $text; 4014 return unless $text;
3132 4015
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 4016 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 4017
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4018 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 4019
3137 if (my $item = $self->{item}{$group}) { 4020 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 4021 if ($item->{text} eq $text) {
3139 $item->{count}++; 4022 $item->{count}++;
3140 } else { 4023 } else {
3141 $item->{count} = 1; 4024 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 4025 $item->{text} = $item->{tooltip} = $text;
3143 } 4026 }
3144 $item->{id} = ++$self->{id}; 4027 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 4028 $item->{timeout} = $timeout;
3146 delete $item->{label}; 4029 delete $item->{label};
3147 } else { 4030 } else {
3148 $self->{item}{$group} = { 4031 $self->{item}{$group} = {
3149 id => ++$self->{id}, 4032 id => ++$self->{id},
… …
3155 count => 1, 4038 count => 1,
3156 %arg, 4039 %arg,
3157 }; 4040 };
3158 } 4041 }
3159 4042
4043 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 4044 $self->reorder;
4045 });
3161} 4046}
3162 4047
3163sub reconfigure { 4048sub reconfigure {
3164 my ($self) = @_; 4049 my ($self) = @_;
3165 4050
… …
3168 4053
3169 $self->reorder; 4054 $self->reorder;
3170 $self->SUPER::reconfigure; 4055 $self->SUPER::reconfigure;
3171} 4056}
3172 4057
4058sub destroy {
4059 my ($self) = @_;
4060
4061 $self->{timer}->cancel;
4062
4063 $self->SUPER::destroy;
4064}
4065
3173############################################################################# 4066#############################################################################
3174 4067
3175package CFClient::UI::Inventory;
3176
3177our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
3424 @_,
3425 )
3426}
3427
3428# XXX: Do sorting? Argl...
3429sub add_spell {
3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
3432
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root; 4068package CFPlus::UI::Root;
3471 4069
3472our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3473 4071
4072use List::Util qw(min max);
4073
3474use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3475 4075
3476sub new { 4076sub new {
3477 my $class = shift; 4077 my $class = shift;
3478 4078
3479 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3480 visible => 1, 4080 visible => 1,
3481 @_, 4081 @_,
3482 ); 4082 );
3483 4083
3484 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3485 4085
3486 $self 4086 $self
3487} 4087}
3488 4088
3489sub size_request { 4089sub size_request {
… …
3504 $coord = $max - $size if $coord > $max - $size; 4104 $coord = $max - $size if $coord > $max - $size;
3505 4105
3506 int $coord + 0.5 4106 int $coord + 0.5
3507} 4107}
3508 4108
3509sub size_allocate { 4109sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 4110 my ($self, $w, $h) = @_;
3511 4111
3512 for my $child ($self->children) { 4112 for my $child ($self->children) {
3513 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)};
3514 4114
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 4118 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 4119 $Y = _to_pixel $Y, $H, $self->{h};
3520 4120
3521 $child->configure ($X, $Y, $W, $H); 4121 $child->configure ($X, $Y, $W, $H);
3522 } 4122 }
4123
4124 1
3523} 4125}
3524 4126
3525sub coord2local { 4127sub coord2local {
3526 my ($self, $x, $y) = @_; 4128 my ($self, $x, $y) = @_;
3527 4129
… …
3612 4214
3613 delete $queue{$widget+0}; 4215 delete $queue{$widget+0};
3614 4216
3615 my ($w, $h) = $widget->size_request; 4217 my ($w, $h) = $widget->size_request;
3616 4218
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4219 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $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};
3619 4224
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 4225 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 4226 $h = $widget->{force_h} if exists $widget->{force_h};
3622 4227
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4228 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 4256
3652 $w = 0 if $w < 0; 4257 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 4258 $h = 0 if $h < 0;
3654 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
3655 $w = int $w + 0.5; 4269 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 4270 $h = int $h + 0.5;
3657 4271
3658 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}) {
3659 $widget->{old_w} = $widget->{w}; 4273 $widget->{old_w} = $widget->{w};
… …
3669 4283
3670 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3671 $_->() 4285 $_->()
3672 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3673 } 4287 }
3674
3675 4288
3676 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3678 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3679 4292
… …
3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3684 glLoadIdentity; 4297 glLoadIdentity;
3685 4298
3686 { 4299 {
3687 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3688 4301
3689 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3691 }
3692 4304
3693 $self->_draw; 4305 $self->_draw;
4306 }
3694} 4307}
3695 4308
3696############################################################################# 4309#############################################################################
3697 4310
3698package CFClient::UI; 4311package CFPlus::UI;
3699 4312
3700$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3701$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3702 4315
37031 43161
3704 4317

Diff Legend

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