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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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