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

Diff Legend

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