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.386 by root, Fri Jul 20 16:33:45 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
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
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_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
995sub update { 1137sub update {
996 my ($self) = @_; 1138 my ($self) = @_;
997 1139
1140 $self->update_slider;
998 $self->SUPER::update; 1141 $self->SUPER::update;
999
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 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1620
1621 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1269 $child->set_parent ($self); 1624 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1626 }
1271 1627
1628 $self->{force_realloc} = 1;
1629 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1630 $self->realloc;
1631}
1632
1633sub remove {
1634 my ($self, $child) = @_;
1635
1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1273} 1641}
1274 1642
1275# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1644sub clear {
1277 my ($self) = @_; 1645 my ($self) = @_;
… …
1318 (sum @$ws), 1686 (sum @$ws),
1319 (sum @$hs), 1687 (sum @$hs),
1320 ) 1688 )
1321} 1689}
1322 1690
1323sub size_allocate { 1691sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1692 my ($self, $w, $h) = @_;
1325 1693
1326 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1327 1695
1328 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1329 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1330 1698
1331 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1332 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1333 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1334 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1335 1703
1336 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1705
1340 CFClient::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1341 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1342 1715
1343 my $y; 1716 my $y;
1344 1717
1345 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1360 } 1733 }
1361 1734
1362 $y += $row_h; 1735 $y += $row_h;
1363 } 1736 }
1364 1737
1738 1
1365} 1739}
1366 1740
1367sub find_widget { 1741sub find_widget {
1368 my ($self, $x, $y) = @_; 1742 my ($self, $x, $y) = @_;
1369 1743
… …
1388 } 1762 }
1389} 1763}
1390 1764
1391############################################################################# 1765#############################################################################
1392 1766
1393package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1394 1768
1769use List::Util qw(min max);
1770
1395our @ISA = CFClient::UI::Container::; 1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1845}
1846
1847#############################################################################
1848
1849package CFPlus::UI::Box;
1850
1851our @ISA = CFPlus::UI::Container::;
1396 1852
1397sub size_request { 1853sub size_request {
1398 my ($self) = @_; 1854 my ($self) = @_;
1399 1855
1400 $self->{vertical} 1856 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1863 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1864 )
1409} 1865}
1410 1866
1411sub size_allocate { 1867sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1868 my ($self, $w, $h) = @_;
1413 1869
1414 my $space = $self->{vertical} ? $h : $w; 1870 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1871 my @children = $self->visible_children;
1416 1872
1417 my @req; 1873 my @req;
1418 1874
1419 if ($self->{homogeneous}) { 1875 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1876 @req = ($space / (@children || 1)) x @children;
1421 } else { 1877 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1878 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1879 my $req = List::Util::sum @req;
1424 1880
1425 if ($req > $space) { 1881 if ($req > $space) {
1426 # ah well, not enough space 1882 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1883 $_ *= $space / $req for @req;
1428 } else { 1884 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1885 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1886
1431 $space = ($space - $req) / $expand; # remaining space to give away 1887 $space = ($space - $req) / $expand; # remaining space to give away
1432 1888
1433 $req[$_] += $space * $children->[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1890 for 0 .. $#children;
1435 } 1891 }
1436 } 1892 }
1437 1893
1438 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1439 1895
1440 my $pos = 0; 1896 my $pos = 0;
1441 for (0 .. $#$children) { 1897 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1900
1445 $pos += $alloc; 1901 $pos += $alloc;
1446 } 1902 }
1447 1903
1448 1 1904 1
1449} 1905}
1450 1906
1451############################################################################# 1907#############################################################################
1452 1908
1453package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1454 1910
1455our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1456 1912
1457sub new { 1913sub new {
1458 my $class = shift; 1914 my $class = shift;
1459 1915
1460 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1463 ) 1919 )
1464} 1920}
1465 1921
1466############################################################################# 1922#############################################################################
1467 1923
1468package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1469 1925
1470our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1471 1927
1472sub new { 1928sub new {
1473 my $class = shift; 1929 my $class = shift;
1474 1930
1475 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1478 ) 1934 )
1479} 1935}
1480 1936
1481############################################################################# 1937#############################################################################
1482 1938
1483package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1484 1940
1485our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1486 1942
1487use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1488 1944
1489sub new { 1945sub new {
1490 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1491 1947
1492 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1951 #active_bg => none
1496 #font => default_font 1952 #font => default_font
1497 #text => initial text 1953 #text => initial text
1498 #markup => initial narkup 1954 #markup => initial narkup
1499 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1500 ellipsise => 3, # end 1957 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1959 fontsize => 1,
1503 align => -1, 1960 align => -1,
1504 valign => -1, 1961 valign => -1,
1505 padding_x => 2, 1962 padding_x => 2,
1506 padding_y => 2, 1963 padding_y => 2,
1507 can_events => 0, 1964 can_events => 0,
1508 %arg 1965 %arg
1509 ); 1966 );
1510 1967
1511 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1971 $self->{template} = $layout;
1515 } 1972 }
1516 1973
1517 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1521 } 1978 }
1522 1979
1523 $self 1980 $self
1524} 1981}
1525 1982
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1983sub update {
1537 my ($self) = @_; 1984 my ($self) = @_;
1538 1985
1539 delete $self->{texture}; 1986 delete $self->{texture};
1540 $self->SUPER::update; 1987 $self->SUPER::update;
1541} 1988}
1542 1989
1990sub realloc {
1991 my ($self) = @_;
1992
1993 delete $self->{ox};
1994 $self->SUPER::realloc;
1995}
1996
1543sub set_text { 1997sub set_text {
1544 my ($self, $text) = @_; 1998 my ($self, $text) = @_;
1545 1999
1546 return if $self->{text} eq "T$text"; 2000 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 2001 $self->{text} = "T$text";
1548 2002
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 2003 $self->{layout}->set_text ($text);
1551 2004
2005 delete $self->{size_req};
1552 $self->realloc; 2006 $self->realloc;
1553 $self->update; 2007 $self->update;
1554} 2008}
1555 2009
1556sub set_markup { 2010sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 2013 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 2014 $self->{text} = "M$markup";
1561 2015
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2016 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 2017
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 2018 $self->{layout}->set_markup ($markup);
1566 2019
2020 delete $self->{size_req};
1567 $self->realloc; 2021 $self->realloc;
1568 $self->update; 2022 $self->update;
1569} 2023}
1570 2024
1571sub size_request { 2025sub size_request {
1572 my ($self) = @_; 2026 my ($self) = @_;
1573 2027
2028 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2029 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 2030 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2031 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2032 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2033 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 2034
1580 my ($w, $h) = $self->{layout}->size; 2035 my ($w, $h) = $self->{layout}->size;
1581 2036
1582 if (exists $self->{template}) { 2037 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 2038 $self->{template}->set_font ($self->{font}) if $self->{font};
2039 $self->{template}->set_width ($self->{max_w} || -1);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2040 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 2041
1586 my ($w2, $h2) = $self->{template}->size; 2042 my ($w2, $h2) = $self->{template}->size;
1587 2043
1588 $w = List::Util::max $w, $w2; 2044 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 2045 $h = List::Util::max $h, $h2;
2046 }
2047
2048 [$w, $h]
1590 } 2049 };
1591 2050
1592 ($w, $h) 2051 @{ $self->{size_req} }
1593} 2052}
1594 2053
2054sub baseline_shift {
2055 $_[0]{layout}->descent
2056}
2057
1595sub size_allocate { 2058sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 2059 my ($self, $w, $h) = @_;
1597 2060
1598 delete $self->{ox}; 2061 delete $self->{ox};
1599 2062
1600 delete $self->{texture} 2063 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2064 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2065
2066 1
1602} 2067}
1603 2068
1604sub set_fontsize { 2069sub set_fontsize {
1605 my ($self, $fontsize) = @_; 2070 my ($self, $fontsize) = @_;
1606 2071
1607 $self->{fontsize} = $fontsize; 2072 $self->{fontsize} = $fontsize;
2073 delete $self->{size_req};
1608 delete $self->{texture}; 2074 delete $self->{texture};
1609 2075
1610 $self->realloc; 2076 $self->realloc;
1611} 2077}
1612 2078
2079sub reconfigure {
2080 my ($self) = @_;
2081
2082 delete $self->{size_req};
2083 delete $self->{texture};
2084
2085 $self->SUPER::reconfigure;
2086}
2087
1613sub _draw { 2088sub _draw {
1614 my ($self) = @_; 2089 my ($self) = @_;
1615 2090
1616 $self->SUPER::_draw; # draw background, if applicable 2091 $self->SUPER::_draw; # draw background, if applicable
1617 2092
1618 my $tex = $self->{texture} ||= do { 2093 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 2094 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2095 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 2096 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2097 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2098 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2099 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 2100
1626 new_from_layout CFClient::Texture $self->{layout} 2101 [$self->{layout}->size]
1627 }; 2102 };
1628 2103
1629 unless (exists $self->{ox}) { 2104 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2105 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2106 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 2107 : ($self->{w} - $size->[0]) * 0.5);
1633 2108
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 2111 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 2112 };
1638 2113
1639 glEnable GL_TEXTURE_2D; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 2116
1642 glColor_premultiply @{$self->{fg}} 2117 $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} 2118}
1649 2119
1650############################################################################# 2120#############################################################################
1651 2121
1652package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1653 2123
1654our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1655 2125
1656use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1657 2127
1658sub new { 2128sub new {
1659 my $class = shift; 2129 my $class = shift;
1660 2130
1661 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1665 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1666 can_hover => 1, 2136 can_hover => 1,
1667 can_focus => 1, 2137 can_focus => 1,
1668 valign => 0, 2138 valign => 0,
1669 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1670 #text => ... 2141 #text => ...
2142 #hidden => "*",
1671 @_ 2143 @_
1672 ) 2144 )
1673} 2145}
1674 2146
1675sub _set_text { 2147sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 2154 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 2155 $self->{text} = $text;
1684 2156
1685 $text =~ s/./*/g if $self->{hidden}; 2157 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 2158 $self->{layout}->set_text ("$text ");
2159 delete $self->{size_req};
1687 2160
1688 $self->_emit (changed => $self->{text}); 2161 $self->emit (changed => $self->{text});
2162
2163 $self->realloc;
1689 $self->update; 2164 $self->update;
1690} 2165}
1691 2166
1692sub set_text { 2167sub set_text {
1693 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
1694 2169
1695 $self->{cursor} = length $text; 2170 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 2171 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 2172}
1700 2173
1701sub get_text { 2174sub get_text {
1702 $_[0]{text} 2175 $_[0]{text}
1703} 2176}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 2181 my ($w, $h) = $self->SUPER::size_request;
1709 2182
1710 ($w + 1, $h) # add 1 for cursor 2183 ($w + 1, $h) # add 1 for cursor
1711} 2184}
1712 2185
1713sub key_down { 2186sub invoke_key_down {
1714 my ($self, $ev) = @_; 2187 my ($self, $ev) = @_;
1715 2188
1716 my $mod = $ev->{mod}; 2189 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1719 2192
1720 my $text = $self->get_text; 2193 my $text = $self->get_text;
2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1721 2196
1722 if ($uni == 8) { 2197 if ($uni == 8) {
1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1724 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1725 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1726 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1727 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1728 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1729 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1730 } elsif ($sym == CFClient::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1731 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 2221 $self->emit ('escape');
1736 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 2226 } else {
1739 return 0; 2227 return 0;
1740 } 2228 }
1741 2229
1742 $self->_set_text ($text); 2230 $self->_set_text ($text);
1743 2231
1744 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1745 2234
1746 1 2235 1
1747} 2236}
1748 2237
1749sub focus_in { 2238sub invoke_focus_in {
1750 my ($self) = @_; 2239 my ($self) = @_;
1751 2240
1752 $self->{last_activity} = $::NOW; 2241 $self->{last_activity} = $::NOW;
1753 2242
1754 $self->SUPER::focus_in; 2243 $self->SUPER::invoke_focus_in
1755} 2244}
1756 2245
1757sub button_down { 2246sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 2247 my ($self, $ev, $x, $y) = @_;
1759 2248
1760 $self->SUPER::button_down ($ev, $x, $y); 2249 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 2250
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 2251 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 2252
1764 # byte-index to char-index 2253 # byte-index to char-index
1765 my $text = $self->{text}; 2254 my $text = $self->{text};
1766 utf8::encode $text; 2255 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 2256 $self->{cursor} = length $text;
1768 2257
1769 $self->_set_text ($self->{text}); 2258 $self->_set_text ($self->{text});
1770 $self->update; 2259 $self->update;
1771 2260
1772 1 2261 1
1773} 2262}
1774 2263
1775sub mouse_motion { 2264sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2266# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 2267
1779 0 2268 1
1780} 2269}
1781 2270
1782sub _draw { 2271sub _draw {
1783 my ($self) = @_; 2272 my ($self) = @_;
1784 2273
… …
1811 utf8::encode $text; 2300 utf8::encode $text;
1812 2301
1813 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1814 } 2303 }
1815 2304
1816 glColor @{$self->{fg}};
1817 glBegin GL_LINES; 2305 glBegin GL_LINES;
1818 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1819 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1820 glEnd; 2308 glEnd;
1821 } 2309 }
1822} 2310}
1823 2311
2312#############################################################################
2313
1824package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1825 2315
1826our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1827 2317
1828use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1829 2319
1830sub key_down { 2320sub invoke_key_down {
1831 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1832 2322
1833 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1834 2324
1835 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1836 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
2328
1838 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 2331 $self->emit (activate => $txt);
1841 $self->update; 2332 $self->update;
1842 2333
1843 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1846 } 2337 }
1847 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1848 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1850 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1851 } 2342 }
1852 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1853 } 2344 }
1854 2345
1855 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1856 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1857 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1858 2349
1859 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1860 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1861 } else { 2352 } else {
1862 $self->set_text ($self->{history_saveback}); 2353 $self->set_text ($self->{history_saveback});
1863 } 2354 }
1864 2355
1865 } else { 2356 } else {
1866 return $self->SUPER::key_down ($ev) 2357 return $self->SUPER::invoke_key_down ($ev)
1867 } 2358 }
1868 2359
1869 1 2360 1
1870} 2361}
1871 2362
1872############################################################################# 2363#############################################################################
1873 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
1874package CFClient::UI::Button; 2404package CFPlus::UI::Button;
1875 2405
1876our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
1877 2407
1878use CFClient::OpenGL; 2408use CFPlus::OpenGL;
1879 2409
1880my @tex = 2410my @tex =
1881 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1882 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
1883 2413
1884sub new { 2414sub new {
1885 my $class = shift; 2415 my $class = shift;
1886 2416
1887 $class->SUPER::new ( 2417 $class->SUPER::new (
1888 padding_x => 4, 2418 padding_x => 4,
1889 padding_y => 4, 2419 padding_y => 4,
1890 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
1891 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
1892 can_hover => 1, 2422 can_hover => 1,
1893 align => 0, 2423 align => 0,
1894 valign => 0, 2424 valign => 0,
1895 can_events => 1, 2425 can_events => 1,
1896 @_ 2426 @_
1897 ) 2427 )
1898} 2428}
1899 2429
1900sub activate { }
1901
1902sub button_up { 2430sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
1904 2432
1905 $self->emit ("activate") 2433 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 2434 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 2435 && $y >= 0 && $y < $self->{h};
… …
1916 2444
1917 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1919 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
1920 2448
2449 my $tex = $tex[$GRAB == $self];
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 2451
1923 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
1924 2453
1925 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
1926} 2455}
1927 2456
1928############################################################################# 2457#############################################################################
1929 2458
1930package CFClient::UI::CheckBox; 2459package CFPlus::UI::CheckBox;
1931 2460
1932our @ISA = CFClient::UI::DrawBG::; 2461our @ISA = CFPlus::UI::DrawBG::;
1933 2462
1934my @tex = 2463my @tex =
1935 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1936 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1937 2466
1938use CFClient::OpenGL; 2467use CFPlus::OpenGL;
1939 2468
1940sub new { 2469sub new {
1941 my $class = shift; 2470 my $class = shift;
1942 2471
1943 $class->SUPER::new ( 2472 $class->SUPER::new (
… …
1957 my ($self) = @_; 2486 my ($self) = @_;
1958 2487
1959 (6) x 2 2488 (6) x 2
1960} 2489}
1961 2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
1962sub button_down { 2499sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2500 my ($self, $ev, $x, $y) = @_;
1964 2501
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2504 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2505 } else {
1970 return 0 2506 return 0
1971 } 2507 }
1972 2508
1973 1 2509 1
… …
1993 glDisable GL_TEXTURE_2D; 2529 glDisable GL_TEXTURE_2D;
1994} 2530}
1995 2531
1996############################################################################# 2532#############################################################################
1997 2533
1998package CFClient::UI::Image; 2534package CFPlus::UI::Image;
1999 2535
2000our @ISA = CFClient::UI::Base::; 2536our @ISA = CFPlus::UI::Base::;
2001 2537
2002use CFClient::OpenGL; 2538use CFPlus::OpenGL;
2003use Carp qw/confess/;
2004 2539
2005our %loaded_images; 2540our %texture_cache;
2006 2541
2007sub new { 2542sub new {
2008 my $class = shift; 2543 my $class = shift;
2009 2544
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 @_,
2548 );
2011 2549
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2550 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required";
2013 2552
2014 $loaded_images{$self->{image}} ||= 2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2016 2555
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2556 CFPlus::weaken $texture_cache{$self->{path}};
2018 2557
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2559
2023 $self 2560 $self
2024} 2561}
2025 2562
2563sub STORABLE_freeze {
2564 my ($self, $cloning) = @_;
2565
2566 $self->{path}
2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2568
2569 $self->{path}
2570}
2571
2572sub STORABLE_attach {
2573 my ($self, $cloning, $path) = @_;
2574
2575 $self->new (path => $path)
2576}
2577
2026sub size_request { 2578sub size_request {
2027 my ($self) = @_; 2579 my ($self) = @_;
2028 2580
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2581 ($self->{tex}{w}, $self->{tex}{h})
2030} 2582}
2031 2583
2032sub _draw { 2584sub _draw {
2033 my ($self) = @_; 2585 my ($self) = @_;
2034 2586
… …
2044 } 2596 }
2045 2597
2046 glEnable GL_TEXTURE_2D; 2598 glEnable GL_TEXTURE_2D;
2047 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2048 2600
2049 $tex->draw_quad_alpha (0, 0, $w, $h); 2601 $tex->draw_quad (0, 0, $w, $h);
2050 2602
2051 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2052} 2604}
2053 2605
2054############################################################################# 2606#############################################################################
2055 2607
2608package CFPlus::UI::ImageButton;
2609
2610our @ISA = CFPlus::UI::Image::;
2611
2612use CFPlus::OpenGL;
2613
2614my %textures;
2615
2616sub new {
2617 my $class = shift;
2618
2619 my $self = $class->SUPER::new (
2620 padding_x => 4,
2621 padding_y => 4,
2622 fg => [1, 1, 1],
2623 active_fg => [0, 0, 1],
2624 can_hover => 1,
2625 align => 0,
2626 valign => 0,
2627 can_events => 1,
2628 @_
2629 );
2630}
2631
2632sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 $self->emit ("activate")
2636 if $x >= 0 && $x < $self->{w}
2637 && $y >= 0 && $y < $self->{h};
2638
2639 1
2640}
2641
2642#############################################################################
2643
2056package CFClient::UI::VGauge; 2644package CFPlus::UI::VGauge;
2057 2645
2058our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2059 2647
2060use List::Util qw(min max); 2648use List::Util qw(min max);
2061 2649
2062use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2063 2651
2064my %tex = ( 2652my %tex = (
2065 food => [ 2653 food => [
2066 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2067 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2068 ], 2656 ],
2069 grace => [ 2657 grace => [
2070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 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/ 2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2072 ], 2660 ],
2073 hp => [ 2661 hp => [
2074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2075 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2076 ], 2664 ],
2077 mana => [ 2665 mana => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 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/ 2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2080 ], 2668 ],
2081); 2669);
2082 2670
2083# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2731 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2732 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2733
2146 my $h1 = $self->{h} * (1 - $ycut1); 2734 my $h1 = $self->{h} * (1 - $ycut1);
2147 my $h2 = $self->{h} * (1 - $ycut2); 2735 my $h2 = $self->{h} * (1 - $ycut2);
2736 my $h3 = $self->{h};
2737
2738 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148 2739
2149 glEnable GL_BLEND; 2740 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2741 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2742 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2743 glEnable GL_TEXTURE_2D;
… …
2171 2762
2172 if ($t3) { 2763 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2764 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2765 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2766 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2767 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2768 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2769 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2770 glEnd;
2180 } 2771 }
2181 2772
2182 glDisable GL_BLEND; 2773 glDisable GL_BLEND;
2183 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2184} 2775}
2185 2776
2186############################################################################# 2777#############################################################################
2187 2778
2188package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2189 2780
2190our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2191 2782
2192sub new { 2783sub new {
2193 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2194 2785
2195 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2197 can_hover => 1, 2788 can_hover => 1,
2198 can_events => 1, 2789 can_events => 1,
2199 %arg, 2790 %arg,
2200 ); 2791 );
2201 2792
2202 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2203 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2204 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2205 2796
2206 $self 2797 $self
2207} 2798}
2208 2799
2209sub set_fontsize { 2800sub set_fontsize {
… …
2230 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2231} 2822}
2232 2823
2233############################################################################# 2824#############################################################################
2234 2825
2235package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2236 2827
2237use strict; 2828use strict;
2238 2829
2239use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2240 2831
2241our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2242 2833
2243my @tex = 2834my @tex =
2244 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2245 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2246 2837
2247sub new { 2838sub new {
2248 my $class = shift; 2839 my $class = shift;
2249 2840
… …
2270 $self->update; 2861 $self->update;
2271 2862
2272 $self 2863 $self
2273} 2864}
2274 2865
2275sub changed { }
2276
2277sub set_range { 2866sub set_range {
2278 my ($self, $range) = @_; 2867 my ($self, $range) = @_;
2279 2868
2280 ($range, $self->{range}) = ($self->{range}, $range); 2869 ($range, $self->{range}) = ($self->{range}, $range);
2281 2870
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2871 if ("@$range" ne "@{$self->{range}}") {
2872 $self->update;
2873 $self->set_value ($self->{range}[0]);
2874 }
2284} 2875}
2285 2876
2286sub set_value { 2877sub set_value {
2287 my ($self, $value) = @_; 2878 my ($self, $value) = @_;
2288 2879
… …
2299 if $unit; 2890 if $unit;
2300 2891
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2892 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2893
2303 if ($value != $old_value) { 2894 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2895 $self->emit (changed => $value);
2305 $self->update; 2896 $self->update;
2306 } 2897 }
2307} 2898}
2308 2899
2309sub size_request { 2900sub size_request {
2310 my ($self) = @_; 2901 my ($self) = @_;
2311 2902
2312 ($self->{req_w}, $self->{req_h}) 2903 ($self->{req_w}, $self->{req_h})
2313} 2904}
2314 2905
2315sub button_down { 2906sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2907 my ($self, $ev, $x, $y) = @_;
2317 2908
2318 $self->SUPER::button_down ($ev, $x, $y); 2909 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2910
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2912
2322 $self->mouse_motion ($ev, $x, $y) 2913 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2914}
2324 2915
2325sub mouse_motion { 2916sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2917 my ($self, $ev, $x, $y) = @_;
2327 2918
2328 if ($GRAB == $self) { 2919 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2920 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2921
… …
2336 } else { 2927 } else {
2337 return 0; 2928 return 0;
2338 } 2929 }
2339 2930
2340 1 2931 1
2932}
2933
2934sub invoke_mouse_wheel {
2935 my ($self, $ev) = @_;
2936
2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942
2943 ! ! $delta
2341} 2944}
2342 2945
2343sub update { 2946sub update {
2344 my ($self) = @_; 2947 my ($self) = @_;
2345 2948
… …
2394 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2395} 2998}
2396 2999
2397############################################################################# 3000#############################################################################
2398 3001
2399package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2400 3003
2401our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2402 3005
2403sub new { 3006sub new {
2404 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2405 3008
2406 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2407 3010
2408 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 3014 to_value => sub { shift },
2412 from_value => sub { shift }, 3015 from_value => sub { shift },
2413 %arg, 3016 %arg,
2414 ); 3017 );
2415 3018
… …
2435sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2437 3040
2438############################################################################# 3041#############################################################################
2439 3042
2440package CFClient::UI::TextView; 3043package CFPlus::UI::TextScroller;
2441 3044
2442our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2443 3046
2444use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2445 3048
2446sub new { 3049sub new {
2447 my $class = shift; 3050 my $class = shift;
2448 3051
2449 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
2450 fontsize => 1, 3053 fontsize => 1,
2451 can_events => 0, 3054 can_events => 1,
3055 indent => 0,
2452 #font => default_font 3056 #font => default_font
2453 @_, 3057 @_,
2454 3058
2455 layout => (new CFClient::Layout 1), 3059 layout => (new CFPlus::Layout),
2456 par => [], 3060 par => [],
3061 max_par => 0,
2457 height => 0, 3062 height => 0,
2458 children => [ 3063 children => [
2459 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2461 ], 3066 ],
2462 ); 3067 );
2463 3068
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2465 3070
… …
2471 3076
2472 $self->{fontsize} = $fontsize; 3077 $self->{fontsize} = $fontsize;
2473 $self->reflow; 3078 $self->reflow;
2474} 3079}
2475 3080
3081sub size_request {
3082 my ($self) = @_;
3083
3084 my ($empty, $slider) = @{ $self->{children} };
3085
3086 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request
3088}
3089
2476sub size_allocate { 3090sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 3091 my ($self, $w, $h) = @_;
2478 3092
2479 $self->SUPER::size_allocate ($w, $h); 3093 my ($empty, $slider, @other) = @{ $self->{children} };
3094 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 3095
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3096 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3097 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 3098 $self->{layout}->set_width ($empty->{w});
3099 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 3100
2485 $self->reflow; 3101 $self->reflow;
2486}
2487 3102
2488sub text_size { 3103 local $self->{children} = [$empty, $slider];
3104 $self->SUPER::invoke_size_allocate ($w, $h)
3105}
3106
3107sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 3108 my ($self, $ev) = @_;
3109
3110 return 0 unless $ev->{dy}; # only vertical movements
3111
3112 $self->{children}[1]->emit (mouse_wheel => $ev);
3113
3114 1
3115}
3116
3117sub get_layout {
3118 my ($self, $para) = @_;
2490 3119
2491 my $layout = $self->{layout}; 3120 my $layout = $self->{layout};
2492 3121
3122 $layout->set_font ($self->{font}) if $self->{font};
3123 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3124 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 3125 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3126 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 3127 $layout->set_markup ($para->{markup});
3128
3129 $layout->set_shapes (
3130 map
3131 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3132 @{$para->{widget}}
2496 3133 );
3134
2497 $layout->size 3135 $layout
2498} 3136}
2499 3137
2500sub reflow { 3138sub reflow {
2501 my ($self) = @_; 3139 my ($self) = @_;
2502 3140
… …
2509 3147
2510 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2512} 3150}
2513 3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
3165}
3166
2514sub clear { 3167sub clear {
2515 my ($self) = @_; 3168 my ($self) = @_;
3169
3170 my (undef, undef, @other) = @{ $self->{children} };
3171 $self->remove ($_) for @other;
2516 3172
2517 $self->{par} = []; 3173 $self->{par} = [];
2518 $self->{height} = 0; 3174 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 3176}
2521 3177
2522sub add_paragraph { 3178sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 3179 my $self = shift;
2524 3180
2525 for my $line (split /\n/, $text) { 3181 for my $para (@_) {
2526 my ($w, $h) = $self->text_size ($line); 3182 $para = {
3183 fg => [1, 1, 1, 1],
3184 indent => 0,
3185 markup => "",
3186 widget => [],
3187 ref $para ? %$para : (markup => $para),
3188 w => 1e10,
3189 wrapped => 1,
3190 };
3191
3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
3199
3200 $self->{need_reflow}++;
3201 $self->update;
3202}
3203
3204sub scroll_to_bottom {
3205 my ($self) = @_;
3206
3207 $self->{scroll_to} = $#{$self->{par}};
3208 $self->update;
3209}
3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
2527 $self->{height} += $h; 3233 $self->{height} = $height;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529 }
2530 3235
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
2532} 3242}
2533 3243
2534sub update { 3244sub update {
2535 my ($self) = @_; 3245 my ($self) = @_;
2536 3246
… …
2538 3248
2539 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2540 3250
2541 delete $self->{texture}; 3251 delete $self->{texture};
2542 3252
2543 $ROOT->on_post_alloc ($self, sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 3257
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 { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2575 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2576 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2577 3271
2578 my $y0 = $top; 3272 my $y0 = $top;
2579 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2580 3274
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}}) { 3275 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2593 3278
2594 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 3280 my $layout = $self->get_layout ($para);
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 3281
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3282 $layout->render ($para->{indent}, $y - $y0);
2600 3283
2601 glRasterPos $par->[3], $y - $y0; 3284 if (my @w = @{ $para->{widget} }) {
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3285 my @s = $layout->get_shapes;
3286
3287 for (@w) {
3288 my ($dx, $dy) = splice @s, 0, 2, ();
3289
3290 $_->{x} = $dx + $para->{indent};
3291 $_->{y} = $dy + $y - $y0;
3292
3293 $_->draw;
3294 }
3295 }
2603 } 3296 }
2604 3297
2605 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2606 } 3300 }
2607 3301
2608 glDisable GL_BLEND; 3302 $self->{top_paragraph} = $top_paragraph;
2609 }; 3303 };
2610 }); 3304 });
3305}
3306
3307sub reconfigure {
3308 my ($self) = @_;
3309
3310 $self->SUPER::reconfigure;
3311
3312 $_->{w} = 1e10 for @{ $self->{par} };
3313 $self->reflow;
2611} 3314}
2612 3315
2613sub _draw { 3316sub _draw {
2614 my ($self) = @_; 3317 my ($self) = @_;
2615 3318
… …
2618 glColor 0, 0, 0, 1; 3321 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 3323 glDisable GL_TEXTURE_2D;
2621 3324
2622 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2623
2624} 3326}
2625 3327
2626############################################################################# 3328#############################################################################
2627 3329
2628package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2629 3331
2630use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2631 3333
2632our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2633 3335
2634sub moveto { 3336sub moveto {
2635 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2636 3338
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 3367 glPopMatrix;
2666} 3368}
2667 3369
2668############################################################################# 3370#############################################################################
2669 3371
2670package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2671 3373
2672our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2673 3375
2674sub new { 3376sub new {
2675 my $class = shift; 3377 my $class = shift;
2676 3378
2677 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2690} 3392}
2691 3393
2692############################################################################# 3394#############################################################################
2693 3395
2694package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2695 3397
2696our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2697 3399
2698use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2699 3401
2700sub new { 3402sub new {
2701 my $class = shift; 3403 my $class = shift;
2702 3404
2703 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2706 ) 3408 )
2707} 3409}
2708 3410
2709sub set_tooltip_from { 3411sub set_tooltip_from {
2710 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2711 3416
2712 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2713 3418
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 3422 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 3423 . "visible $widget->{visible}";
2719 } 3424 }
2720 3425
3426 $tooltip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//;
3428
2721 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2722 markup => $tooltip, 3430 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 3432 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3434 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3436 );
2729} 3437}
2730 3438
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3443
2736 ($w + 4, $h + 4) 3444 ($w + 4, $h + 4)
2737} 3445}
2738 3446
2739sub size_allocate { 3447sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3448 my ($self, $w, $h) = @_;
2741 3449
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3450 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3451}
2744 3452
2745sub visibility_change { 3453sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3454 my ($self, $visible) = @_;
2747 3455
2748 return unless $visible; 3456 return unless $visible;
2749 3457
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3458 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3459 my $widget = $self->{owner}
2752 or return; 3460 or return;
2753 3461
3462 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3463 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3464
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3465 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3466 if $x + $self->{w} > $self->{root}{w};
2758 3467
2759 $self->move_abs ($x, $y); 3468 $self->move_abs ($x, $y);
3469 } else {
3470 $self->hide;
3471 }
2760 }); 3472 });
2761} 3473}
2762 3474
2763sub _draw { 3475sub _draw {
2764 my ($self) = @_; 3476 my ($self) = @_;
… …
2788 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
2789} 3501}
2790 3502
2791############################################################################# 3503#############################################################################
2792 3504
2793package CFClient::UI::Face; 3505package CFPlus::UI::Face;
2794 3506
2795our @ISA = CFClient::UI::Base::; 3507our @ISA = CFPlus::UI::DrawBG::;
2796 3508
2797use CFClient::OpenGL; 3509use CFPlus::OpenGL;
2798 3510
2799sub new { 3511sub new {
2800 my $class = shift; 3512 my $class = shift;
2801 3513
2802 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
2803 aspect => 1, 3517 aspect => 1,
2804 can_events => 0, 3518 can_events => 0,
2805 @_, 3519 @_,
2806 ); 3520 );
2807 3521
2808 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
2810 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2811 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1, 3528 parked => 1,
2814 interval => $self->{animspeed},
2815 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
2816 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
2817 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
2818 }, 3537 },
2819 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
2820 } 3542 }
2821 3543
2822 $self 3544 $self
2823} 3545}
2824 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
2825sub size_request { 3577sub size_request {
2826 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
2827} 3593}
2828 3594
2829sub update { 3595sub update {
2830 my ($self) = @_; 3596 my ($self) = @_;
2831 3597
2832 return unless $self->{visible}; 3598 return unless $self->{visible};
2833 3599
2834 $self->SUPER::update; 3600 $self->SUPER::update;
2835} 3601}
2836 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
2837sub _draw { 3611sub _draw {
2838 my ($self) = @_; 3612 my ($self) = @_;
2839 3613
2840 return unless $::CONN; 3614 return unless $::CONN;
2841 3615
2842 my $face; 3616 $self->SUPER::_draw;
2843 3617
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
2846 3619 or return;
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850 3620
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
2852 3622
2853 if ($tex) { 3623 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3628 glDisable GL_TEXTURE_2D;
2859 } 3629 }
2860} 3630}
2861 3631
2862sub DESTROY { 3632sub destroy {
2863 my ($self) = @_; 3633 my ($self) = @_;
2864 3634
2865 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
2866 if $self->{timer}; 3636 if $self->{timer};
2867 3637
2868 $self->SUPER::DESTROY; 3638 $self->SUPER::destroy;
2869} 3639}
2870 3640
2871############################################################################# 3641#############################################################################
2872 3642
2873package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
2874 3644
2875our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
2876 3646
2877# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
2878 3648
2879############################################################################# 3649#############################################################################
2880 3650
2881package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
2882 3652
2883our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
2884 3654
2885use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2886 3656
2887sub new { 3657sub new {
2888 my $class = shift; 3658 my $class = shift;
2889 3659
2890 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
2891 items => [], 3661 items => [],
2892 z => 100, 3662 z => 100,
2893 @_, 3663 @_,
2894 ); 3664 );
2895 3665
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897 3667
2898 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
2900 3670
2901 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
2902 if (!ref $widget) { 3672 if (!ref $widget) {
3673 if ($widget =~ /\t/) {
3674 my ($left, $right) = split /\t/, $widget, 2;
3675
2903 $widget = new CFClient::UI::Label 3676 $widget = new CFPlus::UI::HBox
2904 can_hover => 1, 3677 can_hover => 1,
2905 can_events => 1, 3678 can_events => 1,
3679 tooltip => $tooltip,
3680 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ],
3684 ;
3685
3686 } else {
3687 $widget = new CFPlus::UI::Label
3688 can_hover => 1,
3689 can_events => 1,
2906 text => $widget; 3690 markup => $widget,
3691 tooltip => $tooltip;
3692 }
2907 } 3693 }
2908 3694
2909 $self->{item}{$widget} = $item; 3695 $self->{item}{$widget} = $item;
2910 3696
2911 $self->{vbox}->add ($widget); 3697 $self->{vbox}->add ($widget);
… …
2916 3702
2917# popup given the event (must be a mouse button down event currently) 3703# popup given the event (must be a mouse button down event currently)
2918sub popup { 3704sub popup {
2919 my ($self, $ev) = @_; 3705 my ($self, $ev) = @_;
2920 3706
2921 $self->_emit ("popdown"); 3707 $self->emit ("popdown");
2922 3708
2923 # maybe save $GRAB? must be careful about events... 3709 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3710 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3711 $self->{button} = $ev->{button};
2926 3712
2927 $self->show; 3713 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3714 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3715}
2930 3716
2931sub mouse_motion { 3717sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3718 my ($self, $ev, $x, $y) = @_;
2933 3719
2934 # TODO: should use vbox->find_widget or so 3720 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3721 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3722 $self->{hover} = $self->{item}{$HOVER};
2937 3723
2938 0 3724 0
2939} 3725}
2940 3726
2941sub button_up { 3727sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3728 my ($self, $ev, $x, $y) = @_;
2943 3729
2944 if ($ev->{button} == $self->{button}) { 3730 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3731 undef $GRAB;
2946 $self->hide; 3732 $self->hide;
2947 3733
2948 $self->_emit ("popdown"); 3734 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3735 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3736 } else {
2951 return 0 3737 return 0
2952 } 3738 }
2953 3739
2954 1 3740 1
2955} 3741}
2956 3742
2957############################################################################# 3743#############################################################################
2958 3744
2959package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
2960 3746
2961our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
2962 3748
2963sub new { 3749sub new {
2964 my $class = shift; 3750 my $class = shift;
2965 3751
2966 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
2980 3766
2981 $self->{current} = $self->{children}[0] 3767 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3768 if @{ $self->{children} };
2983} 3769}
2984 3770
3771sub get_current_page {
3772 my ($self) = @_;
3773
3774 $self->{current}
3775}
3776
2985sub set_current_page { 3777sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3778 my ($self, $page_or_widget) = @_;
2987 3779
2988 my $widget = ref $page_or_widget 3780 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3781 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3782 : $self->{children}[$page_or_widget];
2991 3783
2992 $self->{current} = $widget; 3784 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3785 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3786
2995 $self->_emit (page_changed => $self->{current}); 3787 $self->emit (page_changed => $self->{current});
2996 3788
2997 $self->realloc; 3789 $self->realloc;
2998} 3790}
2999 3791
3000sub visible_children { 3792sub visible_children {
… …
3005 my ($self) = @_; 3797 my ($self) = @_;
3006 3798
3007 $self->{current}->size_request 3799 $self->{current}->size_request
3008} 3800}
3009 3801
3010sub size_allocate { 3802sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3012 3804
3013 $self->{current}->configure (0, 0, $w, $h); 3805 $self->{current}->configure (0, 0, $w, $h);
3806
3807 1
3014} 3808}
3015 3809
3016sub _draw { 3810sub _draw {
3017 my ($self) = @_; 3811 my ($self) = @_;
3018 3812
3019 $self->{current}->draw; 3813 $self->{current}->draw;
3020} 3814}
3021 3815
3022############################################################################# 3816#############################################################################
3023 3817
3024package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3025 3819
3026our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3027 3821
3028sub new { 3822sub new {
3029 my $class = shift; 3823 my $class = shift;
3030 3824
3031 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3035 @_, 3829 @_,
3036 ); 3830 );
3037 3831
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3042} 3836}
3043 3837
3044sub add { 3838sub add {
3045 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3046 3840
3047 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3048 3842
3049 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3050 markup => $title, 3844 markup => $title,
3051 tooltip => $tooltip, 3845 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3053 ); 3847 );
3054 3848
3055 $self->{multiplexer}->add ($widget); 3849 $self->{multiplexer}->add ($widget);
3056} 3850}
3057 3851
3852sub get_current_page {
3853 my ($self) = @_;
3854
3855 $self->{multiplexer}->get_current_page
3856}
3857
3058sub set_current_page { 3858sub set_current_page {
3059 my ($self, $page) = @_; 3859 my ($self, $page) = @_;
3060 3860
3061 $self->{multiplexer}->set_current_page ($page); 3861 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3863}
3064 3864
3065############################################################################# 3865#############################################################################
3066 3866
3867package CFPlus::UI::Selector;
3868
3869use utf8;
3870
3871our @ISA = CFPlus::UI::Button::;
3872
3873sub new {
3874 my $class = shift;
3875
3876 my $self = $class->SUPER::new (
3877 options => [], # [value, title, longdesc], ...
3878 value => undef,
3879 @_,
3880 );
3881
3882 $self->_set_value ($self->{value});
3883
3884 $self
3885}
3886
3887sub invoke_button_down {
3888 my ($self, $ev) = @_;
3889
3890 my @menu_items;
3891
3892 for (@{ $self->{options} }) {
3893 my ($value, $title, $tooltip) = @$_;
3894
3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3896 }
3897
3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3899}
3900
3901sub _set_value {
3902 my ($self, $value) = @_;
3903
3904 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3905 or return;
3906
3907 $self->{value} = $item->[0];
3908 $self->set_markup ("$item->[1] ⇓");
3909 $self->set_tooltip ($item->[2]);
3910}
3911
3912sub set_value {
3913 my ($self, $value) = @_;
3914
3915 return unless $self->{value} ne $value;
3916
3917 $self->_set_value ($value);
3918 $self->emit (changed => $value);
3919}
3920
3921#############################################################################
3922
3067package CFClient::UI::Statusbox; 3923package CFPlus::UI::Statusbox;
3068 3924
3069our @ISA = CFClient::UI::VBox::; 3925our @ISA = CFPlus::UI::VBox::;
3070 3926
3071sub new { 3927sub new {
3072 my $class = shift; 3928 my $class = shift;
3073 3929
3074 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3931 fontsize => 0.8,
3076 @_, 3932 @_,
3077 ); 3933 );
3078 3934
3079 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3080 3936
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3938
3086 $self 3939 $self
3087} 3940}
3088 3941
3089sub reorder { 3942sub reorder {
3090 my ($self) = @_; 3943 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3944 my $NOW = Time::HiRes::time;
3945
3946 # freeze display when hovering over any label
3947 return if $CFPlus::UI::TOOLTIP->{owner}
3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3949 values %{ $self->{item} };
3092 3950
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3953 }
3096 3954
… …
3105 3963
3106 my $count = 10 + 1; 3964 my $count = 10 + 1;
3107 for my $item (@items) { 3965 for my $item (@items) {
3108 last unless --$count; 3966 last unless --$count;
3109 3967
3110 push @widgets, $item->{label} ||= do { 3968 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3969 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3970 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3971 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3972 : $item->{text};
3115 3973
3116 for ($short) { 3974 for ($short) {
3117 s/^\s+//; 3975 s/^\s+//;
3118 s/\s+/ /g; 3976 s/\s+/ /g;
3119 } 3977 }
3120 3978
3121 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3122 markup => $short, 3980 markup => $short,
3123 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3985 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3986 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3987 can_events => 1,
3131 can_hover => 1 3988 can_hover => 1
3132 }; 3989 };
3133 3990
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3991 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3992 $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; 3993 $label->update;
3994 $label->set_max_size (undef, $label->{req_h} * $diff)
3995 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3996 $self->{timer}->interval (1/30);
3997 } else {
3998 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3999 }
4000
4001 push @widgets, $label;
3143 } 4002 }
3144 4003
3145 $self->clear; 4004 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 4005 $self->SUPER::add (reverse @widgets);
3147} 4006}
… …
3163 $item->{count}++; 4022 $item->{count}++;
3164 } else { 4023 } else {
3165 $item->{count} = 1; 4024 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 4025 $item->{text} = $item->{tooltip} = $text;
3167 } 4026 }
3168 $item->{id} = ++$self->{id}; 4027 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 4028 $item->{timeout} = $timeout;
3170 delete $item->{label}; 4029 delete $item->{label};
3171 } else { 4030 } else {
3172 $self->{item}{$group} = { 4031 $self->{item}{$group} = {
3173 id => ++$self->{id}, 4032 id => ++$self->{id},
… …
3179 count => 1, 4038 count => 1,
3180 %arg, 4039 %arg,
3181 }; 4040 };
3182 } 4041 }
3183 4042
4043 $ROOT->on_refresh (reorder => sub {
3184 $self->reorder; 4044 $self->reorder;
4045 });
3185} 4046}
3186 4047
3187sub reconfigure { 4048sub reconfigure {
3188 my ($self) = @_; 4049 my ($self) = @_;
3189 4050
… …
3192 4053
3193 $self->reorder; 4054 $self->reorder;
3194 $self->SUPER::reconfigure; 4055 $self->SUPER::reconfigure;
3195} 4056}
3196 4057
3197sub DESTROY { 4058sub destroy {
3198 my ($self) = @_; 4059 my ($self) = @_;
3199 4060
3200 $self->{timer}->cancel; 4061 $self->{timer}->cancel;
3201 4062
3202 $self->SUPER::DESTROY; 4063 $self->SUPER::destroy;
3203} 4064}
3204 4065
3205############################################################################# 4066#############################################################################
3206 4067
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; 4068package CFPlus::UI::Root;
3503 4069
3504our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3505 4071
3506use List::Util qw(min max); 4072use List::Util qw(min max);
3507 4073
3508use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3509 4075
3510sub new { 4076sub new {
3511 my $class = shift; 4077 my $class = shift;
3512 4078
3513 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3514 visible => 1, 4080 visible => 1,
3515 @_, 4081 @_,
3516 ); 4082 );
3517 4083
3518 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3519 4085
3520 $self 4086 $self
3521} 4087}
3522 4088
3523sub size_request { 4089sub size_request {
… …
3538 $coord = $max - $size if $coord > $max - $size; 4104 $coord = $max - $size if $coord > $max - $size;
3539 4105
3540 int $coord + 0.5 4106 int $coord + 0.5
3541} 4107}
3542 4108
3543sub size_allocate { 4109sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 4110 my ($self, $w, $h) = @_;
3545 4111
3546 for my $child ($self->children) { 4112 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4113 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 4114
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 4118 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 4119 $Y = _to_pixel $Y, $H, $self->{h};
3554 4120
3555 $child->configure ($X, $Y, $W, $H); 4121 $child->configure ($X, $Y, $W, $H);
3556 } 4122 }
4123
4124 1
3557} 4125}
3558 4126
3559sub coord2local { 4127sub coord2local {
3560 my ($self, $x, $y) = @_; 4128 my ($self, $x, $y) = @_;
3561 4129
… …
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3688 4256
3689 $w = 0 if $w < 0; 4257 $w = 0 if $w < 0;
3690 $h = 0 if $h < 0; 4258 $h = 0 if $h < 0;
3691 4259
4260 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h;
4262
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268
3692 $w = int $w + 0.5; 4269 $w = int $w + 0.5;
3693 $h = int $h + 0.5; 4270 $h = int $h + 0.5;
3694 4271
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w}; 4273 $widget->{old_w} = $widget->{w};
… …
3706 4283
3707 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3708 $_->() 4285 $_->()
3709 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3710 } 4287 }
3711
3712 4288
3713 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3715 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3716 4292
… …
3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3720 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3721 glLoadIdentity; 4297 glLoadIdentity;
3722 4298
3723 { 4299 {
3724 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3725 4301
3726 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3728 }
3729 4304
3730 $self->_draw; 4305 $self->_draw;
4306 }
3731} 4307}
3732 4308
3733############################################################################# 4309#############################################################################
3734 4310
3735package CFClient::UI; 4311package CFPlus::UI;
3736 4312
3737$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3738$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3739 4315
37401 43161
3741 4317

Diff Legend

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