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.166 by root, Mon Apr 24 08:38:36 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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