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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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