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

Diff Legend

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