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.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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