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.369 by root, Sun Jul 15 20:25:26 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
979 # todo: overwrite size_allocate of child 1119 $self->update_slider;
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982} 1120}
983 1121
984sub size_allocate { 1122sub invoke_size_allocate {
985 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
986 1124
1125 $self->update_slider;
1126
987 $self->SUPER::size_allocate ($w, $h); 1127 $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} 1128}
992
993#TODO# update range on size_allocate depending on child
994# update viewport offset on scroll
995 1129
996############################################################################# 1130#############################################################################
997 1131
998package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
999 1133
1000our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1001 1135
1002use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1003 1137
1004sub new { 1138sub new {
1005 my $class = shift; 1139 my $class = shift;
1006 1140
1007 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1015 1149
1016 if ($self->{bg}) { 1150 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)}; 1151 my ($w, $h) = @$self{qw(w h)};
1018 1152
1019 glEnable GL_BLEND; 1153 glEnable GL_BLEND;
1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1154 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021 glColor @{ $self->{bg} }; 1155 glColor_premultiply @{ $self->{bg} };
1022 1156
1023 glBegin GL_QUADS; 1157 glBegin GL_QUADS;
1024 glVertex 0 , 0; 1158 glVertex 0 , 0;
1025 glVertex 0 , $h; 1159 glVertex 0 , $h;
1026 glVertex $w, $h; 1160 glVertex $w, $h;
… …
1033 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1034} 1168}
1035 1169
1036############################################################################# 1170#############################################################################
1037 1171
1038package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1039 1173
1040our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1041 1175
1042use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1043 1277
1044my $bg = 1278my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1047 1281
1048my @border = 1282my @border =
1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 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); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051 1285
1052sub new { 1286sub new {
1053 my $class = shift; 1287 my ($class, %arg) = @_;
1054 1288
1055 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1056 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1057 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1058 border => 0.6, 1292 border => 0.6,
1059 can_events => 1, 1293 can_events => 1,
1060 min_w => 16, 1294 min_w => 64,
1061 min_h => 16, 1295 min_h => 32,
1062 @_ 1296 %arg,
1063 ); 1297 );
1064 1298
1065 $self->{title} &&= new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1066 align => 0, 1300 align => 0,
1067 valign => 1, 1301 valign => 1,
1068 text => $self->{title}, 1302 text => $self->{title},
1069 fontsize => $self->{border}; 1303 fontsize => $self->{border},
1304 if exists $self->{title};
1305
1306 if ($self->{has_close_button}) {
1307 $self->{close_button} =
1308 new CFPlus::UI::ImageButton
1309 path => 'x1_close.png',
1310 on_activate => sub { $self->emit ("delete") };
1311
1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1313 }
1070 1314
1071 $self 1315 $self
1316}
1317
1318sub add {
1319 my ($self, @widgets) = @_;
1320
1321 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1072} 1324}
1073 1325
1074sub border { 1326sub border {
1075 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1076} 1328}
1077 1329
1078sub size_request { 1330sub size_request {
1079 my ($self) = @_; 1331 my ($self) = @_;
1332
1333 $self->{title_widget}->size_request
1334 if $self->{title_widget};
1335
1336 $self->{close_button}->size_request
1337 if $self->{close_button};
1080 1338
1081 my ($w, $h) = $self->SUPER::size_request; 1339 my ($w, $h) = $self->SUPER::size_request;
1082 1340
1083 ( 1341 (
1084 $w + $self->border * 2, 1342 $w + $self->border * 2,
1085 $h + $self->border * 2, 1343 $h + $self->border * 2,
1086 ) 1344 )
1087} 1345}
1088 1346
1089sub size_allocate { 1347sub invoke_size_allocate {
1090 my ($self, $w, $h) = @_; 1348 my ($self, $w, $h) = @_;
1091 1349
1350 if ($self->{title_widget}) {
1351 $self->{title_widget}{w} = $w;
1352 $self->{title_widget}{h} = $h;
1353 $self->{title_widget}->invoke_size_allocate ($w, $h);
1354 }
1355
1356 my $border = $self->border;
1357
1092 $h -= List::Util::max 0, $self->border * 2; 1358 $h -= List::Util::max 0, $border * 2;
1093 $w -= List::Util::max 0, $self->border * 2; 1359 $w -= List::Util::max 0, $border * 2;
1094 1360
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); 1361 $self->child->configure ($border, $border, $w, $h);
1099}
1100 1362
1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1364 if $self->{close_button};
1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1373
1374 1
1375}
1376
1101sub button_down { 1377sub invoke_button_down {
1102 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
1103 1379
1104 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
1105 my $border = $self->border; 1381 my $border = $self->border;
1106 1382
… …
1122 my $dy = $ev->{y} - $oy; 1398 my $dy = $ev->{y} - $oy;
1123 1399
1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1400 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1401 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126 1402
1403 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127 $self->realloc; 1404 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 }; 1405 };
1130 1406
1131 } elsif ($lr ^ $td) { 1407 } elsif ($lr ^ $td) {
1132 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1408 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133 my ($bx, $by) = ($self->{x}, $self->{y}); 1409 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1136 my ($ev, $x, $y) = @_; 1412 my ($ev, $x, $y) = @_;
1137 1413
1138 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
1139 1415
1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1416 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1417 # HACK: the next line is required to enforce placement
1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1141 }; 1419 };
1420 } else {
1421 return 0;
1422 }
1423
1142 } 1424 1
1143} 1425}
1144 1426
1145sub button_up { 1427sub invoke_button_up {
1146 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1147 1429
1148 delete $self->{motion}; 1430 ! ! delete $self->{motion}
1149} 1431}
1150 1432
1151sub mouse_motion { 1433sub invoke_mouse_motion {
1152 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1153 1435
1154 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1437
1438 ! ! $self->{motion}
1439}
1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1155} 1447}
1156 1448
1157sub _draw { 1449sub _draw {
1158 my ($self) = @_; 1450 my ($self) = @_;
1159 1451
1452 my $child = $self->{children}[0];
1453
1160 my ($w, $h ) = ($self->{w}, $self->{h}); 1454 my ($w, $h ) = ($self->{w}, $self->{h});
1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1455 my ($cw, $ch) = ($child->{w}, $child->{h});
1162 1456
1163 glEnable GL_TEXTURE_2D; 1457 glEnable GL_TEXTURE_2D;
1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165 1459
1166 my $border = $self->border; 1460 my $border = $self->border;
… …
1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1475 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 } 1476 }
1183 1477
1184 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
1185 1479
1186 $self->{title}->draw if $self->{title};
1187
1188 $self->child->draw; 1480 $child->draw;
1481
1482 if ($self->{title_widget}) {
1483 glTranslate 0, $border - $self->{h};
1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1189} 1491}
1190 1492
1191############################################################################# 1493#############################################################################
1192 1494
1193package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1194 1496
1195our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1196 1498
1197use List::Util qw(max sum); 1499use List::Util qw(max sum);
1198 1500
1199use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1200 1502
1201sub new { 1503sub new {
1202 my $class = shift; 1504 my $class = shift;
1203 1505
1204 $class->SUPER::new ( 1506 $class->SUPER::new (
1205 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1206 @_, 1509 @_,
1207 ) 1510 )
1208} 1511}
1209 1512
1210sub children { 1513sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1212} 1515}
1213 1516
1214sub add { 1517sub add {
1215 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1216 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1217 $child->set_parent ($self); 1522 $child->set_parent ($self);
1218 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1219 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1220 $self->realloc; 1528 $self->realloc;
1529}
1530
1531sub remove {
1532 my ($self, $child) = @_;
1533
1534 # TODO: not yet implemented
1221} 1535}
1222 1536
1223# TODO: move to container class maybe? send children a signal on removal? 1537# TODO: move to container class maybe? send children a signal on removal?
1224sub clear { 1538sub clear {
1225 my ($self) = @_; 1539 my ($self) = @_;
… …
1266 (sum @$ws), 1580 (sum @$ws),
1267 (sum @$hs), 1581 (sum @$hs),
1268 ) 1582 )
1269} 1583}
1270 1584
1271sub size_allocate { 1585sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1273 1587
1274 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1275 1589
1276 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1277 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1278 1592
1279 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1280 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1281 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1282 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1283 1597
1284 # linearly scale sizes
1285 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1286 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1287 1599
1288 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1289 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1290 1609
1291 my $y; 1610 my $y;
1292 1611
1293 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1294 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1308 } 1627 }
1309 1628
1310 $y += $row_h; 1629 $y += $row_h;
1311 } 1630 }
1312 1631
1632 1
1313} 1633}
1314 1634
1315sub find_widget { 1635sub find_widget {
1316 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1317 1637
… …
1336 } 1656 }
1337} 1657}
1338 1658
1339############################################################################# 1659#############################################################################
1340 1660
1341package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1342 1662
1343our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1344 1664
1345sub size_request { 1665sub size_request {
1346 my ($self) = @_; 1666 my ($self) = @_;
1347 1667
1348 $self->{vertical} 1668 $self->{vertical}
… …
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 ) 1676 )
1357} 1677}
1358 1678
1359sub size_allocate { 1679sub invoke_size_allocate {
1360 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1361 1681
1362 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1363 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1364 1684
1365 my @req; 1685 my @req;
1366 1686
1367 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1368 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1369 } else { 1689 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1371 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1372 1692
1373 if ($req > $space) { 1693 if ($req > $space) {
1374 # ah well, not enough space 1694 # ah well, not enough space
1375 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1376 } else { 1696 } else {
1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1378 1698
1379 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1380 1700
1381 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1382 for 0 .. $#$children; 1702 for 0 .. $#children;
1383 } 1703 }
1384 } 1704 }
1385 1705
1386 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1387 1707
1388 my $pos = 0; 1708 my $pos = 0;
1389 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1390 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1392 1712
1393 $pos += $alloc; 1713 $pos += $alloc;
1394 } 1714 }
1395 1715
1396 1 1716 1
1397} 1717}
1398 1718
1399############################################################################# 1719#############################################################################
1400 1720
1401package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1402 1722
1403our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1404 1724
1405sub new { 1725sub new {
1406 my $class = shift; 1726 my $class = shift;
1407 1727
1408 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1411 ) 1731 )
1412} 1732}
1413 1733
1414############################################################################# 1734#############################################################################
1415 1735
1416package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1417 1737
1418our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1419 1739
1420sub new { 1740sub new {
1421 my $class = shift; 1741 my $class = shift;
1422 1742
1423 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1426 ) 1746 )
1427} 1747}
1428 1748
1429############################################################################# 1749#############################################################################
1430 1750
1431package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1432 1752
1433our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1434 1754
1435use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1436 1756
1437sub new { 1757sub new {
1438 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1439 1759
1440 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1443 #active_bg => none 1763 #active_bg => none
1444 #font => default_font 1764 #font => default_font
1445 #text => initial text 1765 #text => initial text
1446 #markup => initial narkup 1766 #markup => initial narkup
1447 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1448 ellipsise => 3, # end 1769 ellipsise => 3, # end
1449 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1450 fontsize => 1, 1771 fontsize => 1,
1451 align => -1, 1772 align => -1,
1452 valign => -1, 1773 valign => -1,
1453 padding_x => 2, 1774 padding_x => 2,
1454 padding_y => 2, 1775 padding_y => 2,
1455 can_events => 0, 1776 can_events => 0,
1456 %arg 1777 %arg
1457 ); 1778 );
1458 1779
1459 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1460 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1461 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1462 $self->{template} = $layout; 1783 $self->{template} = $layout;
1463 } 1784 }
1464 1785
1465 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1469 } 1790 }
1470 1791
1471 $self 1792 $self
1472} 1793}
1473 1794
1474sub escape($) {
1475 local $_ = $_[0];
1476
1477 s/&/&amp;/g;
1478 s/>/&gt;/g;
1479 s/</&lt;/g;
1480
1481 $_
1482}
1483
1484sub update { 1795sub update {
1485 my ($self) = @_; 1796 my ($self) = @_;
1486 1797
1487 delete $self->{texture}; 1798 delete $self->{texture};
1488 $self->SUPER::update; 1799 $self->SUPER::update;
1489} 1800}
1490 1801
1802sub realloc {
1803 my ($self) = @_;
1804
1805 delete $self->{ox};
1806 $self->SUPER::realloc;
1807}
1808
1491sub set_text { 1809sub set_text {
1492 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1493 1811
1494 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1495 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1496 1814
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1499 1816
1817 delete $self->{size_req};
1500 $self->realloc; 1818 $self->realloc;
1501 $self->update; 1819 $self->update;
1502} 1820}
1503 1821
1504sub set_markup { 1822sub set_markup {
… …
1507 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1508 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1509 1827
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511 1829
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1513 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1514 1831
1832 delete $self->{size_req};
1515 $self->realloc; 1833 $self->realloc;
1516 $self->update; 1834 $self->update;
1517} 1835}
1518 1836
1519sub size_request { 1837sub size_request {
1520 my ($self) = @_; 1838 my ($self) = @_;
1521 1839
1840 $self->{size_req} ||= do {
1522 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1523 $self->{layout}->set_width ($self->{max_w} || -1); 1842 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1843 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527 1846
1528 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1529 1848
1530 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533 1853
1534 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1535 1855
1536 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1537 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1858 }
1859
1860 [$w, $h]
1538 } 1861 };
1539 1862
1540 ($w, $h) 1863 @{ $self->{size_req} }
1541} 1864}
1542 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1543sub size_allocate { 1870sub invoke_size_allocate {
1544 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1872
1873 delete $self->{ox};
1545 1874
1546 delete $self->{texture} 1875 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1876 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1877
1878 1
1548} 1879}
1549 1880
1550sub set_fontsize { 1881sub set_fontsize {
1551 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1552 1883
1553 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1554 delete $self->{texture}; 1886 delete $self->{texture};
1555 1887
1556 $self->realloc; 1888 $self->realloc;
1557} 1889}
1558 1890
1891sub reconfigure {
1892 my ($self) = @_;
1893
1894 delete $self->{size_req};
1895 delete $self->{texture};
1896
1897 $self->SUPER::reconfigure;
1898}
1899
1559sub _draw { 1900sub _draw {
1560 my ($self) = @_; 1901 my ($self) = @_;
1561 1902
1562 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1563 1904
1564 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1565 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1566 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1567 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571 1912
1572 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1913 [$self->{layout}->size]
1914 };
1573 1915
1916 unless (exists $self->{ox}) {
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1577 1920
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1581
1582 $tex
1583 }; 1924 };
1584 1925
1585 glEnable GL_TEXTURE_2D; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1587 1928
1588 if ($tex->{format} == GL_ALPHA) { 1929 $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} 1930}
1597 1931
1598############################################################################# 1932#############################################################################
1599 1933
1600package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1601 1935
1602our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1603 1937
1604use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1605 1939
1606sub new { 1940sub new {
1607 my $class = shift; 1941 my $class = shift;
1608 1942
1609 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1613 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1614 can_hover => 1, 1948 can_hover => 1,
1615 can_focus => 1, 1949 can_focus => 1,
1616 valign => 0, 1950 valign => 0,
1617 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1618 #text => ... 1953 #text => ...
1954 #hidden => "*",
1619 @_ 1955 @_
1620 ) 1956 )
1621} 1957}
1622 1958
1623sub _set_text { 1959sub _set_text {
… …
1625 1961
1626 delete $self->{cur_h}; 1962 delete $self->{cur_h};
1627 1963
1628 return if $self->{text} eq $text; 1964 return if $self->{text} eq $text;
1629 1965
1630 delete $self->{texture};
1631
1632 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1633 $self->{text} = $text; 1967 $self->{text} = $text;
1634 1968
1635 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1636 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1971 delete $self->{size_req};
1637 1972
1638 $self->_emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1974
1975 $self->realloc;
1976 $self->update;
1639} 1977}
1640 1978
1641sub set_text { 1979sub set_text {
1642 my ($self, $text) = @_; 1980 my ($self, $text) = @_;
1643 1981
1644 $self->{cursor} = length $text; 1982 $self->{cursor} = length $text;
1645 $self->_set_text ($text); 1983 $self->_set_text ($text);
1646
1647 $self->realloc;
1648} 1984}
1649 1985
1650sub get_text { 1986sub get_text {
1651 $_[0]{text} 1987 $_[0]{text}
1652} 1988}
… …
1657 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1658 1994
1659 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1660} 1996}
1661 1997
1662sub key_down { 1998sub invoke_key_down {
1663 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1664 2000
1665 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1666 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1667 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1668 2004
1669 my $text = $self->get_text; 2005 my $text = $self->get_text;
2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1670 2008
1671 if ($uni == 8) { 2009 if ($uni == 8) {
1672 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1673 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1674 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1675 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1676 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1677 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1678 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1679 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1680 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1681 } elsif ($sym == CFClient::SDLK_END) {
1682 $self->{cursor} = length $text;
1683 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1684 $self->_emit ('escape'); 2033 $self->emit ('escape');
1685 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1686 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
2038 } else {
2039 return 0;
1687 } 2040 }
1688 2041
1689 $self->_set_text ($text); 2042 $self->_set_text ($text);
1690 2043
1691 $self->realloc; 2044 $self->realloc;
1692} 2045 $self->update;
1693 2046
2047 1
2048}
2049
1694sub focus_in { 2050sub invoke_focus_in {
1695 my ($self) = @_; 2051 my ($self) = @_;
1696 2052
1697 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1698 2054
1699 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1700} 2056}
1701 2057
1702sub button_down { 2058sub invoke_button_down {
1703 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1704 2060
1705 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1706 2062
1707 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1708 2064
1709 # byte-index to char-index 2065 # byte-index to char-index
1710 my $text = $self->{text}; 2066 my $text = $self->{text};
1711 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1712 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1713 2069
1714 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1715 $self->update; 2071 $self->update;
2072
2073 1
1716} 2074}
1717 2075
1718sub mouse_motion { 2076sub invoke_mouse_motion {
1719 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1720# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2078# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2079
2080 1
1721} 2081}
1722 2082
1723sub _draw { 2083sub _draw {
1724 my ($self) = @_; 2084 my ($self) = @_;
1725 2085
1726 local $self->{fg} = $self->{fg}; 2086 local $self->{fg} = $self->{fg};
1727 2087
1728 if ($FOCUS == $self) { 2088 if ($FOCUS == $self) {
1729 glColor @{$self->{active_bg}}; 2089 glColor_premultiply @{$self->{active_bg}};
1730 $self->{fg} = $self->{active_fg}; 2090 $self->{fg} = $self->{active_fg};
1731 } else { 2091 } else {
1732 glColor @{$self->{bg}}; 2092 glColor_premultiply @{$self->{bg}};
1733 } 2093 }
1734 2094
1735 glEnable GL_BLEND; 2095 glEnable GL_BLEND;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737 glBegin GL_QUADS; 2097 glBegin GL_QUADS;
1738 glVertex 0 , 0; 2098 glVertex 0 , 0;
1739 glVertex 0 , $self->{h}; 2099 glVertex 0 , $self->{h};
1740 glVertex $self->{w}, $self->{h}; 2100 glVertex $self->{w}, $self->{h};
1741 glVertex $self->{w}, 0; 2101 glVertex $self->{w}, 0;
… …
1752 utf8::encode $text; 2112 utf8::encode $text;
1753 2113
1754 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1755 } 2115 }
1756 2116
1757 glColor @{$self->{fg}};
1758 glBegin GL_LINES; 2117 glBegin GL_LINES;
1759 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 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}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1761 glEnd; 2120 glEnd;
1762 } 2121 }
1763} 2122}
1764 2123
2124#############################################################################
2125
1765package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1766 2127
1767our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1768 2129
1769use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1770 2131
1771sub key_down { 2132sub invoke_key_down {
1772 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1773 2134
1774 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1775 2136
1776 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1777 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1778 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1779 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1780 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1781 $self->_emit (activate => $txt); 2143 $self->emit (activate => $txt);
1782 $self->update; 2144 $self->update;
1783 2145
1784 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1785 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1786 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1787 } 2149 }
1788 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1789 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1791 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1792 } 2154 }
1793 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1794 } 2156 }
1795 2157
1796 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1797 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1798 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1799 2161
1800 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1801 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1802 } else { 2164 } else {
1803 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1804 } 2166 }
1805 2167
1806 } else { 2168 } else {
1807 $self->SUPER::key_down ($ev); 2169 return $self->SUPER::invoke_key_down ($ev)
2170 }
2171
1808 } 2172 1
1809
1810} 2173}
1811 2174
1812############################################################################# 2175#############################################################################
1813 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1814package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1815 2217
1816our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1817 2219
1818use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1819 2221
1820my @tex = 2222my @tex =
1821 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1822 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1823 2225
1824sub new { 2226sub new {
1825 my $class = shift; 2227 my $class = shift;
1826 2228
… …
1835 can_events => 1, 2237 can_events => 1,
1836 @_ 2238 @_
1837 ) 2239 )
1838} 2240}
1839 2241
1840sub activate { }
1841
1842sub button_up { 2242sub invoke_button_up {
1843 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1844 2244
1845 $self->emit ("activate") 2245 $self->emit ("activate")
1846 if $x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1847 && $y >= 0 && $y < $self->{h}; 2247 && $y >= 0 && $y < $self->{h};
2248
2249 1
1848} 2250}
1849 2251
1850sub _draw { 2252sub _draw {
1851 my ($self) = @_; 2253 my ($self) = @_;
1852 2254
1853 local $self->{fg} = $self->{fg}; 2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855 if ($GRAB == $self) {
1856 $self->{fg} = $self->{active_fg};
1857 }
1858 2256
1859 glEnable GL_TEXTURE_2D; 2257 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 glColor 0, 0, 0, 1; 2259 glColor 0, 0, 0, 1;
1862 2260
… …
1867 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1868} 2266}
1869 2267
1870############################################################################# 2268#############################################################################
1871 2269
1872package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1873 2271
1874our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1875 2273
1876my @tex = 2274my @tex =
1877 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1878 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1879 2277
1880use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1881 2279
1882sub new { 2280sub new {
1883 my $class = shift; 2281 my $class = shift;
1884 2282
1885 $class->SUPER::new ( 2283 $class->SUPER::new (
… …
1899 my ($self) = @_; 2297 my ($self) = @_;
1900 2298
1901 (6) x 2 2299 (6) x 2
1902} 2300}
1903 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1904sub button_down { 2310sub invoke_button_down {
1905 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1906 2312
1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909 $self->{state} = !$self->{state}; 2315 $self->toggle;
1910 $self->_emit (changed => $self->{state}); 2316 } else {
2317 return 0
2318 }
2319
1911 } 2320 1
1912} 2321}
1913 2322
1914sub _draw { 2323sub _draw {
1915 my ($self) = @_; 2324 my ($self) = @_;
1916 2325
… …
1931 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
1932} 2341}
1933 2342
1934############################################################################# 2343#############################################################################
1935 2344
1936package CFClient::UI::Image; 2345package CFPlus::UI::Image;
1937 2346
1938our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
1939 2348
1940use CFClient::OpenGL; 2349use CFPlus::OpenGL;
1941use Carp qw/confess/;
1942 2350
1943our %loaded_images; 2351our %texture_cache;
1944 2352
1945sub new { 2353sub new {
1946 my $class = shift; 2354 my $class = shift;
1947 2355
1948 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
1949 2360
1950 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
1951 2363
1952 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1953 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1954 2366
1955 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
1956 2368
1957 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1958
1959 $self->{aspect} = $tex->{w} / $tex->{h};
1960 2370
1961 $self 2371 $self
1962} 2372}
1963 2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
1964sub size_request { 2389sub size_request {
1965 my ($self) = @_; 2390 my ($self) = @_;
1966 2391
1967 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
1968} 2393}
1969 2394
1970sub _draw { 2395sub _draw {
1971 my ($self) = @_; 2396 my ($self) = @_;
1972 2397
… …
1982 } 2407 }
1983 2408
1984 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2411
1987 $tex->draw_quad_alpha (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
1988 2413
1989 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1990} 2415}
1991 2416
1992############################################################################# 2417#############################################################################
1993 2418
2419package CFPlus::UI::ImageButton;
2420
2421our @ISA = CFPlus::UI::Image::;
2422
2423use CFPlus::OpenGL;
2424
2425my %textures;
2426
2427sub new {
2428 my $class = shift;
2429
2430 my $self = $class->SUPER::new (
2431 padding_x => 4,
2432 padding_y => 4,
2433 fg => [1, 1, 1],
2434 active_fg => [0, 0, 1],
2435 can_hover => 1,
2436 align => 0,
2437 valign => 0,
2438 can_events => 1,
2439 @_
2440 );
2441}
2442
2443sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_;
2445
2446 $self->emit ("activate")
2447 if $x >= 0 && $x < $self->{w}
2448 && $y >= 0 && $y < $self->{h};
2449
2450 1
2451}
2452
2453#############################################################################
2454
1994package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
1995 2456
1996our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
1997 2458
1998use List::Util qw(min max); 2459use List::Util qw(min max);
1999 2460
2000use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2001 2462
2002my %tex = ( 2463my %tex = (
2003 food => [ 2464 food => [
2004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2005 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2006 ], 2467 ],
2007 grace => [ 2468 grace => [
2008 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 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/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2010 ], 2471 ],
2011 hp => [ 2472 hp => [
2012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2013 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2014 ], 2475 ],
2015 mana => [ 2476 mana => [
2016 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 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/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2018 ], 2479 ],
2019); 2480);
2020 2481
2021# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2081 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2082 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2083 2544
2084 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2085 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2086 2550
2087 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2556
2092 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2557 glBindTexture GL_TEXTURE_2D, $t1->{name};
2093 glBegin GL_QUADS; 2558 glBegin GL_QUADS;
… …
2108 2573
2109 if ($t3) { 2574 if ($t3) {
2110 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2111 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2112 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2113 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2114 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2115 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2116 glEnd; 2581 glEnd;
2117 } 2582 }
2118 2583
2119 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2120 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2121} 2586}
2122 2587
2123############################################################################# 2588#############################################################################
2124 2589
2125package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2126 2591
2127our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2128 2593
2129sub new { 2594sub new {
2130 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2131 2596
2132 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2134 can_hover => 1, 2599 can_hover => 1,
2135 can_events => 1, 2600 can_events => 1,
2136 %arg, 2601 %arg,
2137 ); 2602 );
2138 2603
2139 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $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); 2605 $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"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2142 2607
2143 $self 2608 $self
2144} 2609}
2145 2610
2146sub set_fontsize { 2611sub set_fontsize {
… …
2167 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2168} 2633}
2169 2634
2170############################################################################# 2635#############################################################################
2171 2636
2172package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2173 2638
2174use strict; 2639use strict;
2175 2640
2176use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2177 2642
2178our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2179 2644
2180my @tex = 2645my @tex =
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2182 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2183 2648
2184sub new { 2649sub new {
2185 my $class = shift; 2650 my $class = shift;
2186 2651
… …
2207 $self->update; 2672 $self->update;
2208 2673
2209 $self 2674 $self
2210} 2675}
2211 2676
2212sub changed { }
2213
2214sub set_range { 2677sub set_range {
2215 my ($self, $range) = @_; 2678 my ($self, $range) = @_;
2216 2679
2217 ($range, $self->{range}) = ($self->{range}, $range); 2680 ($range, $self->{range}) = ($self->{range}, $range);
2218 2681
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}"; 2682 if ("@$range" ne "@{$self->{range}}") {
2683 $self->update;
2684 $self->set_value ($self->{range}[0]);
2685 }
2221} 2686}
2222 2687
2223sub set_value { 2688sub set_value {
2224 my ($self, $value) = @_; 2689 my ($self, $value) = @_;
2225 2690
… …
2236 if $unit; 2701 if $unit;
2237 2702
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239 2704
2240 if ($value != $old_value) { 2705 if ($value != $old_value) {
2241 $self->_emit (changed => $value); 2706 $self->emit (changed => $value);
2242 $self->update; 2707 $self->update;
2243 } 2708 }
2244} 2709}
2245 2710
2246sub size_request { 2711sub size_request {
2247 my ($self) = @_; 2712 my ($self) = @_;
2248 2713
2249 ($self->{req_w}, $self->{req_h}) 2714 ($self->{req_w}, $self->{req_h})
2250} 2715}
2251 2716
2252sub button_down { 2717sub invoke_button_down {
2253 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2254 2719
2255 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2256 2721
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258 2723
2259 $self->mouse_motion ($ev, $x, $y); 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2260} 2725}
2261 2726
2262sub mouse_motion { 2727sub invoke_mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2264 2729
2265 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267 2732
2268 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2733 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269 2734
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2735 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271 2736
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2737 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2738 } else {
2739 return 0;
2740 }
2741
2273 } 2742 1
2743}
2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2274} 2755}
2275 2756
2276sub update { 2757sub update {
2277 my ($self) = @_; 2758 my ($self) = @_;
2278 2759
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2760 delete $self->{knob_w};
2761 $self->SUPER::update;
2762}
2763
2764sub _draw {
2765 my ($self) = @_;
2766
2767 unless ($self->{knob_w}) {
2280 $self->set_value ($self->{range}[0]); 2768 $self->set_value ($self->{range}[0]);
2281 2769
2282 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2770 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100; 2771 my $range = ($hi - $page - $lo) || 1e-100;
2284 2772
… …
2290 $value = ($value - $lo) / $range; 2778 $value = ($value - $lo) / $range;
2291 $value = $value * $self->{scale} + $self->{offset}; 2779 $value = $value * $self->{scale} + $self->{offset};
2292 2780
2293 $self->{knob_x} = $value - $knob_w * 0.5; 2781 $self->{knob_x} = $value - $knob_w * 0.5;
2294 $self->{knob_w} = $knob_w; 2782 $self->{knob_w} = $knob_w;
2295 }); 2783 }
2296
2297 $self->SUPER::update;
2298}
2299
2300sub _draw {
2301 my ($self) = @_;
2302 2784
2303 $self->SUPER::_draw (); 2785 $self->SUPER::_draw ();
2304 2786
2305 glScale $self->{w}, $self->{h}; 2787 glScale $self->{w}, $self->{h};
2306 2788
… …
2326 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2327} 2809}
2328 2810
2329############################################################################# 2811#############################################################################
2330 2812
2331package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2332 2814
2333our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2334 2816
2335sub new { 2817sub new {
2336 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2337 2819
2338 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2339 2821
2340 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift }, 2825 to_value => sub { shift },
2344 from_value => sub { shift }, 2826 from_value => sub { shift },
2345 %arg, 2827 %arg,
2346 ); 2828 );
2347 2829
… …
2367sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2369 2851
2370############################################################################# 2852#############################################################################
2371 2853
2372package CFClient::UI::TextView; 2854package CFPlus::UI::TextScroller;
2373 2855
2374our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2375 2857
2376use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2377 2859
2378sub new { 2860sub new {
2379 my $class = shift; 2861 my $class = shift;
2380 2862
2381 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2382 fontsize => 1, 2864 fontsize => 1,
2383 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2384 #font => default_font 2867 #font => default_font
2385 @_, 2868 @_,
2386 2869
2387 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2388 par => [], 2871 par => [],
2872 max_par => 0,
2389 height => 0, 2873 height => 0,
2390 children => [ 2874 children => [
2391 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2392 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2393 ], 2877 ],
2394 ); 2878 );
2395 2879
2396 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2397 2881
… …
2403 2887
2404 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2405 $self->reflow; 2889 $self->reflow;
2406} 2890}
2407 2891
2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2408sub size_allocate { 2901sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2410 2903
2411 $self->SUPER::size_allocate ($w, $h); 2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2412 2906
2413 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2415 $self->{layout}->set_width ($self->{children}[0]{w}); 2909 $self->{layout}->set_width ($empty->{w});
2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2416 2911
2417 $self->reflow; 2912 $self->reflow;
2418}
2419 2913
2420sub text_size { 2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2421 my ($self, $text, $indent) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2422 2930
2423 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2424 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($text); 2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2428 2944 );
2945
2429 $layout->size 2946 $layout
2430} 2947}
2431 2948
2432sub reflow { 2949sub reflow {
2433 my ($self) = @_; 2950 my ($self) = @_;
2434 2951
… …
2441 2958
2442 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2444} 2961}
2445 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2446sub clear { 2978sub clear {
2447 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2448 2983
2449 $self->{par} = []; 2984 $self->{par} = [];
2450 $self->{height} = 0; 2985 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452} 2987}
2453 2988
2454sub add_paragraph { 2989sub add_paragraph {
2455 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2456 2991
2457 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2458 my ($w, $h) = $self->text_size ($line); 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
3002
3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2459 $self->{height} += $h; 3044 $self->{height} = $height;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2461 }
2462 3046
2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2464} 3053}
2465 3054
2466sub update { 3055sub update {
2467 my ($self) = @_; 3056 my ($self) = @_;
2468 3057
… …
2470 3059
2471 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2472 3061
2473 delete $self->{texture}; 3062 delete $self->{texture};
2474 3063
2475 $ROOT->on_post_alloc ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477 3068
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 { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2505 glClearColor 0.5, 0.5, 0.5, 0; 3070 glClearColor 0, 0, 0, 0;
2506 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2507 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2508 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2509 3082
2510 my $y0 = $top; 3083 my $y0 = $top;
2511 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2512 3085
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}}) { 3086 for my $para (@{$self->{par}}) {
2524 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2525 3089
2526 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2528 $layout->set_width ($W - $par->[3]);
2529 $layout->set_markup ($par->[4]);
2530 3092
2531 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2532 3094
2533 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2535 } 3107 }
2536 3108
2537 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2538 } 3111 }
2539 3112
2540 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2541 }; 3114 };
2542 }); 3115 });
2543} 3116}
2544 3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
3125}
3126
2545sub _draw { 3127sub _draw {
2546 my ($self) = @_; 3128 my ($self) = @_;
2547 3129
2548 glEnable GL_TEXTURE_2D; 3130 glEnable GL_TEXTURE_2D;
2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550 glColor 1, 1, 1, 1; 3132 glColor 0, 0, 0, 1;
2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2553 3135
2554 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2555
2556} 3137}
2557 3138
2558############################################################################# 3139#############################################################################
2559 3140
2560package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2561 3142
2562use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2563 3144
2564our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2565 3146
2566sub moveto { 3147sub moveto {
2567 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2568 3149
2569 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2597 glPopMatrix; 3178 glPopMatrix;
2598} 3179}
2599 3180
2600############################################################################# 3181#############################################################################
2601 3182
2602package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2603 3184
2604our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2605 3186
2606sub new { 3187sub new {
2607 my $class = shift; 3188 my $class = shift;
2608 3189
2609 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2621 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2622} 3203}
2623 3204
2624############################################################################# 3205#############################################################################
2625 3206
2626package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2627 3208
2628our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2629 3210
2630use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2631 3212
2632sub new { 3213sub new {
2633 my $class = shift; 3214 my $class = shift;
2634 3215
2635 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2638 ) 3219 )
2639} 3220}
2640 3221
2641sub set_tooltip_from { 3222sub set_tooltip_from {
2642 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2643 3227
2644 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2645 3229
2646 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n" 3233 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}"; 3234 . "visible $widget->{visible}";
2651 } 3235 }
2652 3236
3237 $tooltip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//;
3239
2653 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2654 markup => $tooltip, 3241 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8, 3243 fontsize => 0.8,
2657 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2658 ellipsise => 0, 3245 ellipsise => 0,
2659 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2660 ); 3247 );
2661} 3248}
2662 3249
… …
2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2667 3254
2668 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2669} 3256}
2670 3257
2671sub size_allocate { 3258sub invoke_size_allocate {
2672 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2673 3260
2674 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2675} 3262}
2676 3263
2677sub visibility_change { 3264sub invoke_visibility_change {
2678 my ($self, $visible) = @_; 3265 my ($self, $visible) = @_;
2679 3266
2680 return unless $visible; 3267 return unless $visible;
2681 3268
2682 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2684 or return; 3271 or return;
2685 3272
3273 if ($widget->{visible}) {
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687 3275
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH; 3277 if $x + $self->{w} > $self->{root}{w};
2690 3278
2691 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2692 }); 3283 });
2693} 3284}
2694 3285
2695sub _draw { 3286sub _draw {
2696 my ($self) = @_; 3287 my ($self) = @_;
… …
2720 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2721} 3312}
2722 3313
2723############################################################################# 3314#############################################################################
2724 3315
2725package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2726 3317
2727our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2728 3319
2729use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2730 3321
2731sub new { 3322sub new {
2732 my $class = shift; 3323 my $class = shift;
2733 3324
2734 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2736 can_events => 0, 3327 can_events => 0,
2737 @_, 3328 @_,
2738 ); 3329 );
2739 3330
2740 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2742 3333
2743 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1, 3336 hard => 1,
2746 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
… …
2769sub _draw { 3360sub _draw {
2770 my ($self) = @_; 3361 my ($self) = @_;
2771 3362
2772 return unless $::CONN; 3363 return unless $::CONN;
2773 3364
3365 $self->SUPER::_draw;
3366
2774 my $face; 3367 my $face;
2775 3368
2776 if ($self->{frame}) { 3369 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}]; 3370 my $anim = $::CONN->{anim}[$self->{anim}];
2778 3371
… …
2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3376 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2784 3377
2785 if ($tex) { 3378 if ($tex) {
2786 glEnable GL_TEXTURE_2D; 3379 glEnable GL_TEXTURE_2D;
2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3380 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788 glColor 1, 1, 1, 1; 3381 glColor 0, 0, 0, 1;
2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790 glDisable GL_TEXTURE_2D; 3383 glDisable GL_TEXTURE_2D;
2791 } 3384 }
2792} 3385}
2793 3386
2794sub DESTROY { 3387sub destroy {
2795 my ($self) = @_; 3388 my ($self) = @_;
2796 3389
2797 $self->{timer}->cancel 3390 $self->{timer}->cancel
2798 if $self->{timer}; 3391 if $self->{timer};
2799 3392
2800 $self->SUPER::DESTROY; 3393 $self->SUPER::destroy;
2801} 3394}
2802 3395
2803############################################################################# 3396#############################################################################
2804 3397
3398package CFPlus::UI::Buttonbar;
3399
3400our @ISA = CFPlus::UI::HBox::;
3401
3402# TODO: should actually wrap buttons and other goodies.
3403
3404#############################################################################
3405
2805package CFClient::UI::Menu; 3406package CFPlus::UI::Menu;
2806 3407
2807our @ISA = CFClient::UI::FancyFrame::; 3408our @ISA = CFPlus::UI::Toplevel::;
2808 3409
2809use CFClient::OpenGL; 3410use CFPlus::OpenGL;
2810 3411
2811sub new { 3412sub new {
2812 my $class = shift; 3413 my $class = shift;
2813 3414
2814 my $self = $class->SUPER::new ( 3415 my $self = $class->SUPER::new (
2815 items => [], 3416 items => [],
2816 z => 100, 3417 z => 100,
2817 @_, 3418 @_,
2818 ); 3419 );
2819 3420
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3421 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2821 3422
2822 for my $item (@{ $self->{items} }) { 3423 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item; 3424 my ($widget, $cb, $tooltip) = @$item;
2824 3425
2825 # handle various types of items, only text for now 3426 # handle various types of items, only text for now
2826 if (!ref $widget) { 3427 if (!ref $widget) {
3428 if ($widget =~ /\t/) {
3429 my ($left, $right) = split /\t/, $widget, 2;
3430
2827 $widget = new CFClient::UI::Label 3431 $widget = new CFPlus::UI::HBox
2828 can_hover => 1, 3432 can_hover => 1,
2829 can_events => 1, 3433 can_events => 1,
3434 tooltip => $tooltip,
3435 children => [
3436 (new CFPlus::UI::Label markup => $left, expand => 1),
3437 (new CFPlus::UI::Label markup => $right, align => +1),
3438 ],
3439 ;
3440
3441 } else {
3442 $widget = new CFPlus::UI::Label
3443 can_hover => 1,
3444 can_events => 1,
2830 text => $widget; 3445 markup => $widget,
3446 tooltip => $tooltip;
3447 }
2831 } 3448 }
2832 3449
2833 $self->{item}{$widget} = $item; 3450 $self->{item}{$widget} = $item;
2834 3451
2835 $self->{vbox}->add ($widget); 3452 $self->{vbox}->add ($widget);
… …
2840 3457
2841# popup given the event (must be a mouse button down event currently) 3458# popup given the event (must be a mouse button down event currently)
2842sub popup { 3459sub popup {
2843 my ($self, $ev) = @_; 3460 my ($self, $ev) = @_;
2844 3461
2845 $self->_emit ("popdown"); 3462 $self->emit ("popdown");
2846 3463
2847 # maybe save $GRAB? must be careful about events... 3464 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self; 3465 $GRAB = $self;
2849 $self->{button} = $ev->{button}; 3466 $self->{button} = $ev->{button};
2850 3467
2851 $self->show; 3468 $self->show;
2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3469 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853} 3470}
2854 3471
2855sub mouse_motion { 3472sub invoke_mouse_motion {
2856 my ($self, $ev, $x, $y) = @_; 3473 my ($self, $ev, $x, $y) = @_;
2857 3474
2858 # TODO: should use vbox->find_widget or so 3475 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3476 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER}; 3477 $self->{hover} = $self->{item}{$HOVER};
2861}
2862 3478
3479 0
3480}
3481
2863sub button_up { 3482sub invoke_button_up {
2864 my ($self, $ev, $x, $y) = @_; 3483 my ($self, $ev, $x, $y) = @_;
2865 3484
2866 if ($ev->{button} == $self->{button}) { 3485 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB; 3486 undef $GRAB;
2868 $self->hide; 3487 $self->hide;
2869 3488
2870 $self->_emit ("popdown"); 3489 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover}; 3490 $self->{hover}[1]->() if $self->{hover};
3491 } else {
3492 return 0
3493 }
3494
2872 } 3495 1
2873} 3496}
2874 3497
2875############################################################################# 3498#############################################################################
2876 3499
2877package CFClient::UI::Statusbox; 3500package CFPlus::UI::Multiplexer;
2878 3501
2879our @ISA = CFClient::UI::VBox::; 3502our @ISA = CFPlus::UI::Container::;
2880 3503
2881sub new { 3504sub new {
2882 my $class = shift; 3505 my $class = shift;
2883 3506
2884 $class->SUPER::new ( 3507 my $self = $class->SUPER::new (
3508 @_,
3509 );
3510
3511 $self->{current} = $self->{children}[0]
3512 if @{ $self->{children} };
3513
3514 $self
3515}
3516
3517sub add {
3518 my ($self, @widgets) = @_;
3519
3520 $self->SUPER::add (@widgets);
3521
3522 $self->{current} = $self->{children}[0]
3523 if @{ $self->{children} };
3524}
3525
3526sub get_current_page {
3527 my ($self) = @_;
3528
3529 $self->{current}
3530}
3531
3532sub set_current_page {
3533 my ($self, $page_or_widget) = @_;
3534
3535 my $widget = ref $page_or_widget
3536 ? $page_or_widget
3537 : $self->{children}[$page_or_widget];
3538
3539 $self->{current} = $widget;
3540 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3541
3542 $self->emit (page_changed => $self->{current});
3543
3544 $self->realloc;
3545}
3546
3547sub visible_children {
3548 $_[0]{current}
3549}
3550
3551sub size_request {
3552 my ($self) = @_;
3553
3554 $self->{current}->size_request
3555}
3556
3557sub invoke_size_allocate {
3558 my ($self, $w, $h) = @_;
3559
3560 $self->{current}->configure (0, 0, $w, $h);
3561
3562 1
3563}
3564
3565sub _draw {
3566 my ($self) = @_;
3567
3568 $self->{current}->draw;
3569}
3570
3571#############################################################################
3572
3573package CFPlus::UI::Notebook;
3574
3575our @ISA = CFPlus::UI::VBox::;
3576
3577sub new {
3578 my $class = shift;
3579
3580 my $self = $class->SUPER::new (
3581 buttonbar => (new CFPlus::UI::Buttonbar),
3582 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3583 # filter => # will be put between multiplexer and $self
3584 @_,
3585 );
3586
3587 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3588 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3589
3590 $self
3591}
3592
3593sub add {
3594 my ($self, $title, $widget, $tooltip) = @_;
3595
3596 CFPlus::weaken $self;
3597
3598 $self->{buttonbar}->add (new CFPlus::UI::Button
3599 markup => $title,
3600 tooltip => $tooltip,
3601 on_activate => sub { $self->set_current_page ($widget) },
3602 );
3603
3604 $self->{multiplexer}->add ($widget);
3605}
3606
3607sub get_current_page {
3608 my ($self) = @_;
3609
3610 $self->{multiplexer}->get_current_page
3611}
3612
3613sub set_current_page {
3614 my ($self, $page) = @_;
3615
3616 $self->{multiplexer}->set_current_page ($page);
3617 $self->emit (page_changed => $self->{multiplexer}{current});
3618}
3619
3620#############################################################################
3621
3622package CFPlus::UI::Selector;
3623
3624use utf8;
3625
3626our @ISA = CFPlus::UI::Button::;
3627
3628sub new {
3629 my $class = shift;
3630
3631 my $self = $class->SUPER::new (
3632 options => [], # [value, title, longdesc], ...
3633 value => undef,
3634 @_,
3635 );
3636
3637 $self->_set_value ($self->{value});
3638
3639 $self
3640}
3641
3642sub invoke_button_down {
3643 my ($self, $ev) = @_;
3644
3645 my @menu_items;
3646
3647 for (@{ $self->{options} }) {
3648 my ($value, $title, $tooltip) = @$_;
3649
3650 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3651 }
3652
3653 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3654}
3655
3656sub _set_value {
3657 my ($self, $value) = @_;
3658
3659 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3660 or return;
3661
3662 $self->{value} = $item->[0];
3663 $self->set_markup ("$item->[1] ⇓");
3664 $self->set_tooltip ($item->[2]);
3665}
3666
3667sub set_value {
3668 my ($self, $value) = @_;
3669
3670 return unless $self->{value} ne $value;
3671
3672 $self->_set_value ($value);
3673 $self->emit (changed => $value);
3674}
3675
3676#############################################################################
3677
3678package CFPlus::UI::Statusbox;
3679
3680our @ISA = CFPlus::UI::VBox::;
3681
3682sub new {
3683 my $class = shift;
3684
3685 my $self = $class->SUPER::new (
2885 fontsize => 0.8, 3686 fontsize => 0.8,
2886 @_, 3687 @_,
2887 ) 3688 );
3689
3690 CFPlus::weaken (my $this = $self);
3691
3692 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3693
3694 $self
2888} 3695}
2889 3696
2890sub reorder { 3697sub reorder {
2891 my ($self) = @_; 3698 my ($self) = @_;
2892 my $NOW = time; 3699 my $NOW = Time::HiRes::time;
3700
3701 # freeze display when hovering over any label
3702 return if $CFPlus::UI::TOOLTIP->{owner}
3703 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3704 values %{ $self->{item} };
2893 3705
2894 while (my ($k, $v) = each %{ $self->{item} }) { 3706 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3707 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 } 3708 }
2897 3709
… …
2900 my @items = sort { 3712 my @items = sort {
2901 $a->{pri} <=> $b->{pri} 3713 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id} 3714 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} }; 3715 } values %{ $self->{item} };
2904 3716
3717 $self->{timer}->interval (1);
3718
2905 my $count = 10 + 1; 3719 my $count = 10 + 1;
2906 for my $item (@items) { 3720 for my $item (@items) {
2907 last unless --$count; 3721 last unless --$count;
2908 3722
2909 push @widgets, $item->{label} ||= do { 3723 my $label = $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all) 3724 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1 3725 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}" 3726 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text}; 3727 : $item->{text};
2914 3728
2915 for ($short) { 3729 for ($short) {
2916 s/^\s+//; 3730 s/^\s+//;
2917 s/\s+/ /g; 3731 s/\s+/ /g;
2918 } 3732 }
2919 3733
2920 new CFClient::UI::Label 3734 new CFPlus::UI::Label
2921 markup => $short, 3735 markup => $short,
2922 tooltip => $item->{tooltip}, 3736 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP, 3737 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67, 3738 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize}, 3739 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44, 3740 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg}, 3741 fg => [@{ $item->{fg} }],
2928 can_events => 1, 3742 can_events => 1,
2929 can_hover => 1 3743 can_hover => 1
2930 }; 3744 };
3745
3746 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3747 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3748 $label->update;
3749 $label->set_max_size (undef, $label->{req_h} * $diff)
3750 if $diff < 1;
3751 $self->{timer}->interval (1/30);
3752 } else {
3753 $label->{fg}[3] = $item->{fg}[3] || 1;
3754 }
3755
3756 push @widgets, $label;
2931 } 3757 }
2932 3758
2933 $self->clear; 3759 $self->clear;
2934 $self->SUPER::add (reverse @widgets); 3760 $self->SUPER::add (reverse @widgets);
2935} 3761}
… …
2940 $text =~ s/^\s+//; 3766 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//; 3767 $text =~ s/\s+$//;
2942 3768
2943 return unless $text; 3769 return unless $text;
2944 3770
2945 my $timeout = time + ((delete $arg{timeout}) || 60); 3771 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946 3772
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3773 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948 3774
2949 if (my $item = $self->{item}{$group}) { 3775 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) { 3776 if ($item->{text} eq $text) {
2951 $item->{count}++; 3777 $item->{count}++;
2952 } else { 3778 } else {
2953 $item->{count} = 1; 3779 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text; 3780 $item->{text} = $item->{tooltip} = $text;
2955 } 3781 }
2956 $item->{id} = ++$self->{id}; 3782 $item->{id} += 0.2;#d#
2957 $item->{timeout} = $timeout; 3783 $item->{timeout} = $timeout;
2958 delete $item->{label}; 3784 delete $item->{label};
2959 } else { 3785 } else {
2960 $self->{item}{$group} = { 3786 $self->{item}{$group} = {
2961 id => ++$self->{id}, 3787 id => ++$self->{id},
… …
2967 count => 1, 3793 count => 1,
2968 %arg, 3794 %arg,
2969 }; 3795 };
2970 } 3796 }
2971 3797
3798 $ROOT->on_refresh (reorder => sub {
2972 $self->reorder; 3799 $self->reorder;
3800 });
2973} 3801}
2974 3802
2975sub reconfigure { 3803sub reconfigure {
2976 my ($self) = @_; 3804 my ($self) = @_;
2977 3805
… …
2980 3808
2981 $self->reorder; 3809 $self->reorder;
2982 $self->SUPER::reconfigure; 3810 $self->SUPER::reconfigure;
2983} 3811}
2984 3812
3813sub destroy {
3814 my ($self) = @_;
3815
3816 $self->{timer}->cancel;
3817
3818 $self->SUPER::destroy;
3819}
3820
2985############################################################################# 3821#############################################################################
2986 3822
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; 3823package CFPlus::UI::Root;
3279 3824
3280our @ISA = CFClient::UI::Container::; 3825our @ISA = CFPlus::UI::Container::;
3281 3826
3827use List::Util qw(min max);
3828
3282use CFClient::OpenGL; 3829use CFPlus::OpenGL;
3283 3830
3284sub new { 3831sub new {
3285 my $class = shift; 3832 my $class = shift;
3286 3833
3287 my $self = $class->SUPER::new ( 3834 my $self = $class->SUPER::new (
3288 visible => 1, 3835 visible => 1,
3289 @_, 3836 @_,
3290 ); 3837 );
3291 3838
3292 Scalar::Util::weaken ($self->{root} = $self); 3839 CFPlus::weaken ($self->{root} = $self);
3293 3840
3294 $self 3841 $self
3295} 3842}
3296 3843
3297sub size_request { 3844sub size_request {
… …
3312 $coord = $max - $size if $coord > $max - $size; 3859 $coord = $max - $size if $coord > $max - $size;
3313 3860
3314 int $coord + 0.5 3861 int $coord + 0.5
3315} 3862}
3316 3863
3317sub size_allocate { 3864sub invoke_size_allocate {
3318 my ($self, $w, $h) = @_; 3865 my ($self, $w, $h) = @_;
3319 3866
3320 for my $child ($self->children) { 3867 for my $child ($self->children) {
3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3868 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3322 3869
… …
3326 $X = _to_pixel $X, $W, $self->{w}; 3873 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h}; 3874 $Y = _to_pixel $Y, $H, $self->{h};
3328 3875
3329 $child->configure ($X, $Y, $W, $H); 3876 $child->configure ($X, $Y, $W, $H);
3330 } 3877 }
3878
3879 1
3331} 3880}
3332 3881
3333sub coord2local { 3882sub coord2local {
3334 my ($self, $x, $y) = @_; 3883 my ($self, $x, $y) = @_;
3335 3884
… …
3420 3969
3421 delete $queue{$widget+0}; 3970 delete $queue{$widget+0};
3422 3971
3423 my ($w, $h) = $widget->size_request; 3972 my ($w, $h) = $widget->size_request;
3424 3973
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3974 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3975 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3976
3977 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427 3979
3428 $w = $widget->{force_w} if exists $widget->{force_w}; 3980 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h}; 3981 $h = $widget->{force_h} if exists $widget->{force_h};
3430 3982
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3983 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3457 4009
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4010 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3459 4011
3460 $w = 0 if $w < 0; 4012 $w = 0 if $w < 0;
3461 $h = 0 if $h < 0; 4013 $h = 0 if $h < 0;
4014
4015 $w = max $widget->{min_w}, $w;
4016 $h = max $widget->{min_h}, $h;
4017
4018# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4019# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4020
4021 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4022 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3462 4023
3463 $w = int $w + 0.5; 4024 $w = int $w + 0.5;
3464 $h = int $h + 0.5; 4025 $h = int $h + 0.5;
3465 4026
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4027 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4051 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3491 glMatrixMode GL_MODELVIEW; 4052 glMatrixMode GL_MODELVIEW;
3492 glLoadIdentity; 4053 glLoadIdentity;
3493 4054
3494 { 4055 {
3495 package CFClient::UI::Base; 4056 package CFPlus::UI::Base;
3496 4057
3497 ($draw_x, $draw_y, $draw_w, $draw_h) = 4058 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h}); 4059 (0, 0, $self->{w}, $self->{h});
3499 }
3500 4060
3501 $self->_draw; 4061 $self->_draw;
4062 }
3502} 4063}
3503 4064
3504############################################################################# 4065#############################################################################
3505 4066
3506package CFClient::UI; 4067package CFPlus::UI;
3507 4068
3508$ROOT = new CFClient::UI::Root; 4069$ROOT = new CFPlus::UI::Root;
3509$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4070$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3510 4071
35111 40721
3512 4073

Diff Legend

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