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

Diff Legend

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