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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_text ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
45} 75}
46 76
47sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
49} 80}
50 81
51sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
52 my ($ev) = @_; 83 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 92 check_tooltip;
62 } 93 }
63 94
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 96
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
67} 99}
68 100
69sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
70 my ($ev) = @_; 102 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
72 104
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 106
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 108
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
78 111
79 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 114 $grab->update if $grab;
82 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 132
100 check_tooltip; 133 check_tooltip;
101 } 134 }
102 135
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
104} 138}
105 139
106# convert position array to integers 140# convert position array to integers
107sub harmonize { 141sub harmonize {
108 my ($vals) = @_; 142 my ($vals) = @_;
… …
114 $rem += $_ - $i; 148 $rem += $_ - $i;
115 $_ = $i; 149 $_ = $i;
116 } 150 }
117} 151}
118 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
119############################################################################# 194#############################################################################
120 195
121package CFClient::UI::Base; 196package CFClient::UI::Base;
122 197
123use strict; 198use strict;
… …
126 201
127sub new { 202sub new {
128 my $class = shift; 203 my $class = shift;
129 204
130 my $self = bless { 205 my $self = bless {
131 x => 0, 206 x => "center",
132 y => 0, 207 y => "center",
133 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
134 can_events => 1, 211 can_events => 1,
135 @_ 212 @_
136 }, $class; 213 }, $class;
137 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
138 for (keys %$self) { 217 for (keys %$self) {
139 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
141 } 220 }
142 } 221 }
143 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
144 $self 235 $self
145} 236}
146 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
147sub show { 245sub show {
148 my ($self) = @_; 246 my ($self) = @_;
149 247
150 return if $self->{parent}; 248 return if $self->{parent};
151 249
152 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
153} 251}
154 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
155sub hide { 306sub hide {
156 my ($self) = @_; 307 my ($self) = @_;
157 308
158 return unless $self->{parent}; 309 $self->set_invisible;
159 310
160 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
161} 313}
162 314
163sub move { 315sub move_abs {
164 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
165 317
166 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
169 321
170 $self->update; 322 $self->update;
171} 323}
172 324
173sub needs_redraw { 325sub set_size {
174 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
175} 332}
176 333
177sub size_request { 334sub size_request {
178 require Carp; 335 require Carp;
179 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
181 338
182sub configure { 339sub configure {
183 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
184 341
185 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
186 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
187 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
188 347
189 # use alignment to adjust x, y 348 # use alignment to adjust x, y
190 349
191 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
192 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
193
194 ($w, $h) = ($w2, $h2);
195 } 352 }
196 353
197 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
198 $self->{x} = $x; 355 $self->{x} = $x;
199 $self->{y} = $y; 356 $self->{y} = $y;
200 $self->update; 357 $self->update;
201 } 358 }
202 359
203 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 361 return unless $self->{visible};
205 $self->{h} = $h;
206 362
207 $self->size_allocate ($w, $h); 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
208 $self->update;
209 } 364 }
210} 365}
211 366
212sub size_allocate { 367sub size_allocate {
213 # nothing to be done 368 # nothing to be done
214} 369}
215 370
371sub children {
372}
373
216sub set_max_size { 374sub set_max_size {
217 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
218 376
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 379}
222 380
223# return top left coordinates 381sub set_tooltip {
224sub _topleft {
225 my ($self, $x, $y) = @_; 382 my ($self, $tooltip) = @_;
226 383
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
228} 395}
229 396
230# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
231sub coord2local { 398sub coord2local {
232 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
233 400
234 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 402}
237 403
238# translate local coordinates to global coordinate system 404# translate local coordinates to global coordinate system
239sub coord2global { 405sub coord2global {
240 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
241 407
242 my ($X, $Y) = $self->_topleft; 408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 409}
245 410
246sub focus_in { 411sub focus_in {
247 my ($self) = @_; 412 my ($self) = @_;
248 413
249 return if $FOCUS == $self; 414 return if $FOCUS == $self;
250 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
251 416
252 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
253 418
254 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
255 420
256 $focus->update if $focus; 421 $focus->update if $focus;
257 $FOCUS->update; 422 $FOCUS->update;
258} 423}
259 424
… …
262 427
263 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
264 429
265 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
266 431
267 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
268 433
269 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
270} 438}
271 439
272sub mouse_motion { } 440sub mouse_motion { }
273sub button_up { } 441sub button_up { }
274sub key_down { } 442sub key_down { }
275sub key_up { } 443sub key_up { }
276 444
277sub button_down { 445sub button_down {
278 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
279 447
280 $self->focus_in; 448 $self->focus_in;
… …
283sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
284sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
285sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
286sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
287sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
288 525
289sub draw { 526sub draw {
290 my ($self) = @_; 527 my ($self) = @_;
291 528
292 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 545 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
310 glEnd; 547 glEnd;
311 glDisable GL_BLEND; 548 glDisable GL_BLEND;
312 } 549 }
550
551 if ($ENV{CFPLUS_DEBUG}) {
552 glPushMatrix;
553 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
555 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1;
560 glEnd;
561 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 }
313} 564}
314 565
315sub _draw { 566sub _draw {
316 my ($self) = @_; 567 my ($self) = @_;
317 568
318 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
319} 570}
320 571
321sub find_widget {
322 my ($self, $x, $y) = @_;
323
324 return () unless $self->{can_events};
325
326 return $self
327 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
328 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
329
330 ()
331}
332
333sub set_parent {
334 my ($self, $parent) = @_;
335
336 Scalar::Util::weaken ($self->{parent} = $parent);
337}
338
339sub check_size {
340 my ($self) = @_;
341
342 return unless $self->{parent};
343
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352}
353
354sub update {
355 my ($self) = @_;
356
357 $self->{parent}->update
358 if $self->{parent};
359}
360
361sub connect {
362 my ($self, $signal, $cb) = @_;
363
364 push @{ $self->{signal_cb}{$signal} }, $cb;
365}
366
367sub emit {
368 my ($self, $signal, @args) = @_;
369
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
371 $cb->($self, @args);
372 }
373}
374
375sub DESTROY { 572sub DESTROY {
376 my ($self) = @_; 573 my ($self) = @_;
377 574
575 delete $WIDGET{$self+0};
378 #$self->deactivate; 576 #$self->deactivate;
379} 577}
380 578
381############################################################################# 579#############################################################################
382 580
… …
391 my $class = shift; 589 my $class = shift;
392 590
393 # range [value, low, high, page] 591 # range [value, low, high, page]
394 592
395 $class->SUPER::new ( 593 $class->SUPER::new (
396 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
397 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
398 @_ 596 @_
399 ) 597 )
400} 598}
401 599
402sub _draw { 600sub _draw {
403 my ($self) = @_; 601 my ($self) = @_;
404 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
405 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
406 609
407 glEnable GL_BLEND; 610 glEnable GL_BLEND;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
410 613
411 glBegin GL_QUADS; 614 glBegin GL_QUADS;
412 glVertex 0 , 0; 615 glVertex 0 , 0;
413 glVertex 0 , $h; 616 glVertex 0 , $h;
414 glVertex $w, $h; 617 glVertex $w, $h;
415 glVertex $w, 0; 618 glVertex $w, 0;
416 glEnd; 619 glEnd;
417 620
418 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
419} 623}
420 624
421############################################################################# 625#############################################################################
422 626
423package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
428 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
429 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
430} 634}
431 635
432sub size_request { 636sub size_request {
433 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
434} 640}
435 641
436sub draw { } 642sub draw { }
437 643
438############################################################################# 644#############################################################################
… …
444sub new { 650sub new {
445 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
446 652
447 my $children = delete $arg{children} || []; 653 my $children = delete $arg{children} || [];
448 654
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 655 my $self = $class->SUPER::new (
656 children => [],
657 can_events => 0,
658 %arg,
659 );
450 $self->add ($_) for @$children; 660 $self->add ($_) for @$children;
451 661
452 $self 662 $self
453} 663}
454 664
455sub add { 665sub add {
456 my ($self, $child) = @_; 666 my ($self, @widgets) = @_;
457 667
458 $child->set_parent ($self); 668 $_->set_parent ($self)
669 for @widgets;
459 670
460 use sort 'stable'; 671 use sort 'stable';
461 672
462 $self->{children} = [ 673 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 675 @{$self->{children}}, @widgets
465 ]; 676 ];
466 677
467 $child->check_size; 678 $self->realloc;
679}
680
681sub children {
682 @{ $_[0]{children} }
468} 683}
469 684
470sub remove { 685sub remove {
471 my ($self, $child) = @_; 686 my ($self, $child) = @_;
472 687
473 delete $child->{parent}; 688 delete $child->{parent};
689 $child->hide;
474 690
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
476 692
477 $self->check_size; 693 $self->realloc;
478 $self->update; 694}
695
696sub clear {
697 my ($self) = @_;
698
699 my $children = delete $self->{children};
700 $self->{children} = [];
701
702 for (@$children) {
703 delete $_->{parent};
704 $_->hide;
705 }
706
707 $self->realloc;
479} 708}
480 709
481sub find_widget { 710sub find_widget {
482 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
483 712
… …
536sub size_request { 765sub size_request {
537 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
538} 767}
539 768
540sub size_allocate { 769sub size_allocate {
541 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
542 771
543 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
544} 773}
545 774
546############################################################################# 775#############################################################################
… …
558} 787}
559 788
560sub update { 789sub update {
561 my ($self) = @_; 790 my ($self) = @_;
562 791
563 # we want to do this delayed... 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 793 $self->SUPER::update;
566} 794}
567 795
796sub size_allocate {
797 my ($self, $w, $h, $changed) = @_;
798
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update
801 if $changed;
802}
803
804sub _render {
805 $_[0]{children}[0]->draw;
806}
807
568sub render_chld { 808sub render_child {
569 my ($self) = @_; 809 my ($self) = @_;
570 810
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1; 812 glClearColor 0, 0, 0, 0;
573 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw; 814
815 $self->_render;
575 }; 816 };
576}
577
578sub size_allocate {
579 my ($self, $w, $h) = @_;
580
581 $self->child->configure (0, 0, $w, $h);
582
583 $self->render_chld;
584} 817}
585 818
586sub _draw { 819sub _draw {
587 my ($self) = @_; 820 my ($self) = @_;
588 821
589 my ($w, $h) = ($self->w, $self->h); 822 my ($w, $h) = ($self->w, $self->h);
590 823
591 my $tex = $self->{texture} 824 my $tex = $self->{texture}
592 or return; 825 or return;
593 826
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1;
598 830
599 $tex->draw_quad (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 832
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
603} 834}
604 835
605############################################################################# 836#############################################################################
606 837
607package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
608 839
609our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
610
611sub new { die }
612
613sub size_request {
614 my ($self) = @_;
615
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
618
619 @$self{qw(child_w child_h)}
620}
621
622sub _draw {
623 my ($self) = @_;
624
625 $self->{children}[1]->draw;
626}
627
628
629#############################################################################
630
631package CFClient::UI::Frame;
632
633our @ISA = CFClient::UI::Bin::;
634
635use CFClient::OpenGL;
636 841
637sub new { 842sub new {
638 my $class = shift; 843 my $class = shift;
639 844
640 my $self = $class->SUPER::new ( 845 $class->SUPER::new (
641 bg => [1, 1, 1, 1], 846 scroll_x => 0,
642 border_bg => [1, 1, 1, 1], 847 scroll_y => 1,
643 border => 0.8,
644 @_ 848 @_,
645 ); 849 )
646
647 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655} 850}
656 851
657sub size_request { 852sub size_request {
658 my ($self) = @_; 853 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h}) 854
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
856
857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
660} 861}
661 862
662sub size_allocate { 863sub size_allocate {
663 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
664 $self->{w} = $w; 865
665 $self->{h} = $h; 866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
666 $self->child->configure (0, 0, $w, $h); 869 $self->child->configure (0, 0, $w, $h);
870 $self->update;
667} 871}
668 872
669sub _draw { 873sub set_offset {
670 my ($self) = @_; 874 my ($self, $x, $y) = @_;
671 875
672 my ($w, $h) = ($self->{w}, $self->{h}); 876 $self->{view_x} = int $x;
877 $self->{view_y} = int $y;
673 878
674 glEnable GL_BLEND; 879 $self->update;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 880}
676 glEnable GL_TEXTURE_2D;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678 881
679# glBegin GL_QUADS; 882# hmm, this does not work for topleft of $self... but we should not ask for that
680# glColor 0, 0, 0, 0; 883sub coord2local {
681# glVertex 0 , 0; 884 my ($self, $x, $y) = @_;
682# glVertex 0 , $h;
683# glVertex $w, $h;
684# glVertex $w, 0;
685# glEnd;
686 885
886 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
887}
687 888
688 $self->child->draw; 889sub coord2global {
689 glDisable GL_BLEND; 890 my ($self, $x, $y) = @_;
690 glDisable GL_TEXTURE_2D; 891
892 $x = List::Util::min $self->{w}, $x - $self->{view_x};
893 $y = List::Util::min $self->{h}, $y - $self->{view_y};
894
895 $self->SUPER::coord2global ($x, $y)
896}
897
898sub find_widget {
899 my ($self, $x, $y) = @_;
900
901 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
903 ) {
904 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905 } else {
906 $self->CFClient::UI::Base::find_widget ($x, $y)
907 }
908}
909
910sub _render {
911 my ($self) = @_;
912
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914
915 $self->SUPER::_render;
691} 916}
692 917
693############################################################################# 918#############################################################################
694 919
695package CFClient::UI::FancyFrame; 920package CFClient::UI::ScrolledWindow;
696 921
697our @ISA = CFClient::UI::Bin::; 922our @ISA = CFClient::UI::HBox::;
698
699use CFClient::OpenGL;
700
701my @tex =
702 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
703 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
704 923
705sub new { 924sub new {
706 my $class = shift; 925 my $class = shift;
707 926
708 # TODO: user_x, user_y, overwrite moveto? 927 my $self;
928
929 my $slider = new CFClient::UI::Slider
930 vertical => 1,
931 range => [0, 0, 1, 0.01], # HACK fix
932 on_changed => sub {
933 $self->{vp}->set_offset (0, $_[1]);
934 },
935 ;
936
937 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider,
940 @_,
941 );
942
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider});
946
947 $self
948}
949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971
972#############################################################################
973
974package CFClient::UI::Frame;
975
976our @ISA = CFClient::UI::Bin::;
977
978use CFClient::OpenGL;
979
980sub new {
981 my $class = shift;
982
983 $class->SUPER::new (
984 bg => undef,
985 @_,
986 )
987}
988
989sub _draw {
990 my ($self) = @_;
991
992 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)};
994
995 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} };
998
999 glBegin GL_QUADS;
1000 glVertex 0 , 0;
1001 glVertex 0 , $h;
1002 glVertex $w, $h;
1003 glVertex $w, 0;
1004 glEnd;
1005
1006 glDisable GL_BLEND;
1007 }
1008
1009 $self->SUPER::_draw;
1010}
1011
1012#############################################################################
1013
1014package CFClient::UI::FancyFrame;
1015
1016our @ISA = CFClient::UI::Bin::;
1017
1018use CFClient::OpenGL;
1019
1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027
1028sub new {
1029 my $class = shift;
709 1030
710 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
713 border => 0.8, 1034 border => 0.6,
714 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
715 @_ 1038 @_
716 ); 1039 );
717 1040
718 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 1042 align => 0,
720 valign => 1, 1043 valign => 1,
721 text => $self->{title}, 1044 text => $self->{title},
722 fontsize => 1; 1045 fontsize => $self->{border};
723 1046
724 $self 1047 $self
725} 1048}
726 1049
727sub border { 1050sub border {
728 int $_[0]{border} * $::FONTSIZE 1051 int $_[0]{border} * $::FONTSIZE
729} 1052}
730 1053
731sub size_request { 1054sub size_request {
732 my ($self) = @_; 1055 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 1056
736 my ($w, $h) = $self->SUPER::size_request; 1057 my ($w, $h) = $self->SUPER::size_request;
737 1058
738 ( 1059 (
739 $w + $self->border * 2, 1060 $w + $self->border * 2,
740 $h + $self->border * 2, 1061 $h + $self->border * 2,
741 ) 1062 )
742} 1063}
743 1064
744sub size_allocate { 1065sub size_allocate {
745 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
746 1069
747 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
748 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
749 1072
750 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
751 if $self->{title}; 1074 if $self->{title};
752 1075
753 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
754} 1077}
755 1078
756sub button_down { 1079sub button_down {
757 my ($self, $ev, $x, $y) = @_; 1080 my ($self, $ev, $x, $y) = @_;
758 1081
1082 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 1083 my $border = $self->border;
760 1084
761 if ($x < $self->{w} && $x >= $self->{w} - $border 1085 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 1086 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 1087
1088 if ($lr & $td) {
1089 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1090 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 1091 my ($bw, $bh) = ($self->{w}, $self->{h});
766 1092
1093 my $mx = $x < $border;
1094 my $my = $y < $border;
1095
767 $self->{motion} = sub { 1096 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
769 1098
770 ($x, $y) = ($ev->{x}, $ev->{y}); 1099 my $dx = $ev->{x} - $ox;
1100 my $dy = $ev->{y} - $oy;
771 1101
772 $self->{user_w} = $bw + $x - $ox; 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
774 $self->check_size; 1104
1105 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
775 }; 1107 };
776 1108
777 } elsif ($x >= 0 && $x < $self->{w} 1109 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
782 1112
783 $self->{motion} = sub { 1113 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
785 1115
786 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
787 1117
788 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
789 $self->update;
790 }; 1119 };
791 } 1120 }
792} 1121}
793 1122
794sub button_up { 1123sub button_up {
… …
807 my ($self) = @_; 1136 my ($self) = @_;
808 1137
809 my ($w, $h ) = ($self->{w}, $self->{h}); 1138 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 1140
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 1141 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 1143
817 my $border = $self->border; 1144 my $border = $self->border;
818 1145
819 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
824 1151
825 my $bg = $tex[0]; 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1153 glColor @{ $self->{bg} };
826 1154
827 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 1156 # solve this better(?)
829 my $rep_y = $ch / $bg->{h}; 1157 $bg->{s} = $cw / $bg->{w};
830 1158 $bg->{t} = $ch / $bg->{h};
831 glColor @{ $self->{bg} };
832
833 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 }
837 1161
838 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 1163
841 $self->{title}->draw if $self->{title}; 1164 $self->{title}->draw if $self->{title};
1165
842 $self->child->draw; 1166 $self->child->draw;
843} 1167}
844 1168
845############################################################################# 1169#############################################################################
846 1170
… …
855sub new { 1179sub new {
856 my $class = shift; 1180 my $class = shift;
857 1181
858 $class->SUPER::new ( 1182 $class->SUPER::new (
859 col_expand => [], 1183 col_expand => [],
860 @_ 1184 @_,
861 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
862} 1190}
863 1191
864sub add { 1192sub add {
865 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
866 1194
867 $child->set_parent ($self); 1195 $child->set_parent ($self);
868 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
869 1197
870 $child->check_size; 1198 $self->realloc;
871} 1199}
872 1200
873# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
874sub clear { 1202sub clear {
875 my ($self) = @_; 1203 my ($self) = @_;
876 1204
1205 my @children = $self->children;
877 delete $self->{children}; 1206 delete $self->{children};
878 $self->update; 1207
1208 for (@children) {
1209 delete $_->{parent};
1210 $_->hide;
1211 }
1212
1213 $self->realloc;
879} 1214}
880 1215
881sub get_wh { 1216sub get_wh {
882 my ($self) = @_; 1217 my ($self) = @_;
883 1218
… …
910 (sum @$hs), 1245 (sum @$hs),
911 ) 1246 )
912} 1247}
913 1248
914sub size_allocate { 1249sub size_allocate {
915 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
916 1251
917 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
918 1253
919 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
920 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
921 1256
922 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
923 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
924 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
925 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
979 } 1314 }
980} 1315}
981 1316
982############################################################################# 1317#############################################################################
983 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
984package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
985 1380
986# TODO: wrap into common Box base class
987
988our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
989 1382
990sub size_request { 1383sub new {
991 my ($self) = @_; 1384 my $class = shift;
992 1385
993 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
994 1387 vertical => 0,
995 ( 1388 @_,
996 (List::Util::sum map $_->[0], @alloc),
997 (List::Util::max map $_->[1], @alloc),
998 ) 1389 )
999} 1390}
1000 1391
1001sub size_allocate {
1002 my ($self, $w, $h) = @_;
1003
1004 ($h, $w) = ($w, $h);
1005
1006 my $children = $self->{children};
1007
1008 my @h = map $_->{req_w}, @$children;
1009
1010 my $req_h = List::Util::sum @h;
1011
1012 if ($req_h > $h) {
1013 # ah well, not enough space
1014 $_ *= $h / $req_h for @h;
1015 } else {
1016 my $exp = List::Util::sum map $_->{expand}, @$children;
1017 $exp ||= 1;
1018
1019 for (0 .. $#$children) {
1020 my $child = $children->[$_];
1021
1022 my $alloc_h = $h[$_];
1023 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1024 $h[$_] = $alloc_h;
1025 }
1026 }
1027
1028 CFClient::UI::harmonize \@h;
1029
1030 my $y = 0;
1031 for (0 .. $#$children) {
1032 my $child = $children->[$_];
1033 my $h = $h[$_];
1034 $child->configure ($y, 0, $h, $w);
1035
1036 $y += $h;
1037 }
1038
1039 1
1040}
1041
1042############################################################################# 1392#############################################################################
1043 1393
1044package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1045 1395
1046# TODO: wrap into common Box base class
1047
1048our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1049 1397
1050sub size_request { 1398sub new {
1051 my ($self) = @_; 1399 my $class = shift;
1052 1400
1053 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1054 1402 vertical => 1,
1055 ( 1403 @_,
1056 (List::Util::max map $_->[0], @alloc),
1057 (List::Util::sum map $_->[1], @alloc),
1058 ) 1404 )
1059} 1405}
1060 1406
1061sub size_allocate {
1062 my ($self, $w, $h) = @_;
1063
1064 my $children = $self->{children};
1065
1066 my @h = map $_->{req_h}, @$children;
1067
1068 my $req_h = List::Util::sum @h;
1069
1070 if ($req_h > $h) {
1071 # ah well, not enough space
1072 $_ *= $h / $req_h for @h;
1073 } else {
1074 my $exp = List::Util::sum map $_->{expand}, @$children;
1075 $exp ||= 1;
1076
1077 for (0 .. $#$children) {
1078 my $child = $children->[$_];
1079
1080 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1081 }
1082 }
1083
1084 CFClient::UI::harmonize \@h;
1085
1086 my $y = 0;
1087 for (0 .. $#$children) {
1088 my $child = $children->[$_];
1089 my $h = $h[$_];
1090 $child->configure (0, $y, $w, $h);
1091
1092 $y += $h;
1093 }
1094
1095 1
1096}
1097
1098############################################################################# 1407#############################################################################
1099 1408
1100package CFClient::UI::Label; 1409package CFClient::UI::Label;
1101 1410
1102our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1103 1412
1104use CFClient::OpenGL; 1413use CFClient::OpenGL;
1105 1414
1106sub new { 1415sub new {
1107 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1108 1417
1109 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1111 #font => default_font 1422 #font => default_font
1423 #text => initial text
1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1427 layout => (new CFClient::Layout),
1112 fontsize => 1, 1428 fontsize => 1,
1113 text => "",
1114 align => -1, 1429 align => -1,
1115 valign => -1, 1430 valign => -1,
1116 padding => 2, 1431 padding_x => 2,
1117 layout => new CFClient::Layout, 1432 padding_y => 2,
1118 can_events => 0, 1433 can_events => 0,
1119 %arg 1434 %arg
1120 ); 1435 );
1121 1436
1122 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1438 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1439 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1440 $self->{template} = $layout;
1126 } 1441 }
1127 1442
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1443 if (exists $self->{markup}) {
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1444 $self->set_markup (delete $self->{markup});
1445 } else {
1446 $self->set_text (delete $self->{text});
1447 }
1130 1448
1131 $self 1449 $self
1132} 1450}
1133 1451
1134sub escape_text { 1452sub escape($) {
1135 local $_ = $_[1]; 1453 local $_ = $_[0];
1136 1454
1137 s/&/&amp;/g; 1455 s/&/&amp;/g;
1138 s/>/&gt;/g; 1456 s/>/&gt;/g;
1139 s/</&lt;/g; 1457 s/</&lt;/g;
1140 1458
1141 $_[1] 1459 $_
1460}
1461
1462sub update {
1463 my ($self) = @_;
1464
1465 delete $self->{texture};
1466 $self->SUPER::update;
1142} 1467}
1143 1468
1144sub set_text { 1469sub set_text {
1145 my ($self, $text) = @_; 1470 my ($self, $text) = @_;
1146 1471
1472 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text";
1474
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1148 1477
1149 delete $self->{texture}; 1478 $self->realloc;
1150 $self->check_size;
1151 $self->update; 1479 $self->update;
1152} 1480}
1153 1481
1154sub set_markup { 1482sub set_markup {
1155 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1156 1484
1485 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup";
1487
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1158 1492
1159 delete $self->{texture}; 1493 $self->realloc;
1160 $self->check_size;
1161 $self->update; 1494 $self->update;
1162} 1495}
1163 1496
1164sub size_request { 1497sub size_request {
1165 my ($self) = @_; 1498 my ($self) = @_;
1166 1499
1167 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1168 $self->{layout}->set_width ($self->{max_w} || -1); 1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1169 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1170 1505
1171 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1172 1507
1173 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1178 1513
1179 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1180 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1181 } 1516 }
1182 1517
1183 ( 1518 ($w, $h)
1184 $w + $self->{padding} * 2,
1185 $h + $self->{padding} * 2,
1186 )
1187} 1519}
1188 1520
1189sub size_allocate { 1521sub size_allocate {
1190 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1191 1523
1192 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1193} 1526}
1194 1527
1195sub set_fontsize { 1528sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1197 1530
1198 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1532 delete $self->{texture};
1200 $self->check_size; 1533
1201 $self->update; 1534 $self->realloc;
1202} 1535}
1203 1536
1204sub _draw { 1537sub _draw {
1205 my ($self) = @_; 1538 my ($self) = @_;
1206 1539
1540 $self->SUPER::_draw; # draw background, if applicable
1541
1207 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549
1211 new_from_layout CFClient::Texture $self->{layout} 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1551
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5);
1555
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1212 }; 1561 };
1213 1562
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1565
1566 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1567 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $tex->draw_quad ($self->{ox}, $self->{oy}); 1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1234 1572
1235 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1574}
1238 1575
1239############################################################################# 1576#############################################################################
1240 1577
1241package CFClient::UI::EntryBase; 1578package CFClient::UI::EntryBase;
… …
1246 1583
1247sub new { 1584sub new {
1248 my $class = shift; 1585 my $class = shift;
1249 1586
1250 $class->SUPER::new ( 1587 $class->SUPER::new (
1251 fg => [1, 1, 1], 1588 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1589 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1590 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1255 can_hover => 1, 1592 can_hover => 1,
1256 can_focus => 1, 1593 can_focus => 1,
1257 valign => 0, 1594 valign => 0,
1258 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1259 @_ 1597 @_
1260 ) 1598 )
1261} 1599}
1262 1600
1263sub _set_text { 1601sub _set_text {
… …
1273 $self->{text} = $text; 1611 $self->{text} = $text;
1274 1612
1275 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1276 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1277 1615
1278 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1617}
1618
1619sub set_text {
1620 my ($self, $text) = @_;
1621
1622 $self->{cursor} = length $text;
1623 $self->_set_text ($text);
1624
1625 $self->realloc;
1279} 1626}
1280 1627
1281sub get_text { 1628sub get_text {
1282 $_[0]{text} 1629 $_[0]{text}
1283} 1630}
… …
1286 my ($self) = @_; 1633 my ($self) = @_;
1287 1634
1288 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1289 1636
1290 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1291}
1292
1293sub size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297}
1298
1299sub set_text {
1300 my ($self, $text) = @_;
1301
1302 $self->{cursor} = length $text;
1303 $self->_set_text ($text);
1304 $self->update;
1305} 1638}
1306 1639
1307sub key_down { 1640sub key_down {
1308 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1309 1642
… …
1311 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1312 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1313 1646
1314 my $text = $self->get_text; 1647 my $text = $self->get_text;
1315 1648
1316 if ($sym == 8) { 1649 if ($uni == 8) {
1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1319 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1320 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1321 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1322 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1323 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1324 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1325 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1326 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1327 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1328 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1329 $self->emit ('escape'); 1662 $self->_emit ('escape');
1330 } elsif ($uni) { 1663 } elsif ($uni) {
1331 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1332 } 1665 }
1333 1666
1334 $self->_set_text ($text); 1667 $self->_set_text ($text);
1335 $self->update; 1668
1669 $self->realloc;
1336} 1670}
1337 1671
1338sub focus_in { 1672sub focus_in {
1339 my ($self) = @_; 1673 my ($self) = @_;
1340 1674
… …
1416 my ($self, $ev) = @_; 1750 my ($self, $ev) = @_;
1417 1751
1418 my $sym = $ev->{sym}; 1752 my $sym = $ev->{sym};
1419 1753
1420 if ($sym == 13) { 1754 if ($sym == 13) {
1755 unshift @{$self->{history}},
1756 my $txt = $self->get_text;
1757 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1759 $self->_emit (activate => $txt);
1422 $self->update; 1760 $self->update;
1761
1762 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text;
1765 }
1766 if (@{$self->{history} || []} > 0) {
1767 $self->{history_pointer}++;
1768 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1769 $self->{history_pointer} = @{$self->{history} || []} - 1;
1770 }
1771 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1772 }
1773
1774 } elsif ($sym == CFClient::SDLK_DOWN) {
1775 $self->{history_pointer}--;
1776 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777
1778 if ($self->{history_pointer} >= 0) {
1779 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1780 } else {
1781 $self->set_text ($self->{history_saveback});
1782 }
1423 1783
1424 } else { 1784 } else {
1425 $self->SUPER::key_down ($ev); 1785 $self->SUPER::key_down ($ev);
1426 } 1786 }
1427 1787
… …
1441 1801
1442sub new { 1802sub new {
1443 my $class = shift; 1803 my $class = shift;
1444 1804
1445 $class->SUPER::new ( 1805 $class->SUPER::new (
1446 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1447 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1450 can_hover => 1, 1810 can_hover => 1,
1451 align => 0, 1811 align => 0,
1452 valign => 0, 1812 valign => 0,
1453 can_events => 1, 1813 can_events => 1,
1454 @_ 1814 @_
1455 ) 1815 )
1456} 1816}
1457 1817
1818sub activate { }
1819
1458sub button_up { 1820sub button_up {
1459 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1460 1822
1823 $self->emit ("activate")
1461 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1462 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1463 $self->emit ("activate");
1464 }
1465} 1826}
1466 1827
1467sub _draw { 1828sub _draw {
1468 my ($self) = @_; 1829 my ($self) = @_;
1469 1830
… …
1471 1832
1472 if ($GRAB == $self) { 1833 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1834 $self->{fg} = $self->{active_fg};
1474 } 1835 }
1475 1836
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1839 glColor 0, 0, 0, 1;
1481 1840
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1842
1484 glDisable GL_TEXTURE_2D; 1843 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1844
1487 $self->SUPER::_draw; 1845 $self->SUPER::_draw;
1488} 1846}
1489 1847
1490############################################################################# 1848#############################################################################
… …
1501 1859
1502sub new { 1860sub new {
1503 my $class = shift; 1861 my $class = shift;
1504 1862
1505 $class->SUPER::new ( 1863 $class->SUPER::new (
1506 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1507 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1508 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1509 state => 0, 1870 state => 0,
1510 can_hover => 1, 1871 can_hover => 1,
1511 @_ 1872 @_
1512 ) 1873 )
1513} 1874}
1514 1875
1515sub size_request { 1876sub size_request {
1516 my ($self) = @_; 1877 my ($self) = @_;
1517 1878
1518 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1519} 1880}
1520 1881
1521sub button_down { 1882sub button_down {
1522 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1523 1884
1524 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1525 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1526 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1527 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1528 } 1889 }
1529} 1890}
1530 1891
1531sub _draw { 1892sub _draw {
1532 my ($self) = @_; 1893 my ($self) = @_;
1533 1894
1534 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1535 1896
1536 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1537 1898
1538 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1539 1902
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1904
1542 glEnable GL_BLEND; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1906
1543 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1908 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1909 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1910}
1553 1911
1554############################################################################# 1912#############################################################################
1555 1913
1556package CFClient::UI::Image; 1914package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 1957 glTranslate 0, -$self->{w}, 0;
1600 1958
1601 ($w, $h) = ($h, $w); 1959 ($w, $h) = ($h, $w);
1602 } 1960 }
1603 1961
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1964
1609 $tex->draw_quad (0, 0, $w, $h); 1965 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1966
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1967 glDisable GL_TEXTURE_2D;
1613} 1968}
1614 1969
1615############################################################################# 1970#############################################################################
1616 1971
1617package CFClient::UI::VGauge; 1972package CFClient::UI::VGauge;
1618 1973
1619our @ISA = CFClient::UI::Base::; 1974our @ISA = CFClient::UI::Base::;
1975
1976use List::Util qw(min max);
1620 1977
1621use CFClient::OpenGL; 1978use CFClient::OpenGL;
1622 1979
1623my %tex = ( 1980my %tex = (
1624 food => [ 1981 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1983 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1984 ],
1628 grace => [ 1985 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1987 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1988 ],
1632 hp => [ 1989 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1991 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1992 ],
1636 mana => [ 1993 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1995 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1996 ],
1640); 1997);
1641 1998
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1999# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 2000sub new {
… …
1662} 2019}
1663 2020
1664sub set_max { 2021sub set_max {
1665 my ($self, $max) = @_; 2022 my ($self, $max) = @_;
1666 2023
2024 return if $self->{max_val} == $max;
2025
1667 $self->{max_val} = $max; 2026 $self->{max_val} = $max;
2027 $self->update;
1668} 2028}
1669 2029
1670sub set_value { 2030sub set_value {
1671 my ($self, $val, $max) = @_; 2031 my ($self, $val, $max) = @_;
1672 2032
1673 $self->set_max ($max) 2033 $self->set_max ($max)
1674 if defined $max; 2034 if defined $max;
1675 2035
1676 $max = $self->{max_val}; 2036 return if $self->{val} == $val;
2037
1677 $self->{val} = $val; 2038 $self->{val} = $val;
1678
1679 $self->update; 2039 $self->update;
1680} 2040}
1681 2041
1682sub _draw { 2042sub _draw {
1683 my ($self) = @_; 2043 my ($self) = @_;
1684 2044
1685 my $tex = $tex{$self->{type}}; 2045 my $tex = $tex{$self->{type}};
2046 my ($t1, $t2, $t3) = @$tex;
1686 2047
1687 my ($w, $h) = ($self->{w}, $self->{h}); 2048 my ($w, $h) = ($self->{w}, $self->{h});
1688 2049
1689 if ($self->{vertical}) { 2050 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 2051 glRotate 90, 0, 0, 1;
… …
1692 2053
1693 ($w, $h) = ($h, $w); 2054 ($w, $h) = ($h, $w);
1694 } 2055 }
1695 2056
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 2057 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 2058
1699 my $t1 = $tex->[0]; 2059 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 2060 my $ycut2 = max 0, min 1, $ycut - 1;
2061
2062 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2);
1701 2064
1702 glEnable GL_BLEND; 2065 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 2067 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 2069
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2070 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 2071 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 2072 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2073 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2074 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2075 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 2076 glEnd;
1717 2077
2078 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2079 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 2080 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2081 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2082 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2083 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2084 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 2085 glEnd;
2086
2087 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd;
2095 }
1725 2096
1726 glDisable GL_BLEND; 2097 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 2098 glDisable GL_TEXTURE_2D;
1728} 2099}
1729 2100
… …
1735 2106
1736sub new { 2107sub new {
1737 my ($class, %arg) = @_; 2108 my ($class, %arg) = @_;
1738 2109
1739 my $self = $class->SUPER::new ( 2110 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 2111 tooltip => $arg{type},
2112 can_hover => 1,
2113 can_events => 1,
1741 %arg, 2114 %arg,
1742 ); 2115 );
1743 2116
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2117 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2118 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2119 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 2120
1748 $self 2121 $self
1749} 2122}
1750 2123
1751sub set_fontsize { 2124sub set_fontsize {
… …
1753 2126
1754 $self->{value}->set_fontsize ($fsize); 2127 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 2128 $self->{max} ->set_fontsize ($fsize);
1756} 2129}
1757 2130
2131sub set_max {
2132 my ($self, $max) = @_;
2133
2134 $self->{gauge}->set_max ($max);
2135 $self->{max}->set_text ($max);
2136}
2137
1758sub set_value { 2138sub set_value {
1759 my ($self, $val, $max) = @_; 2139 my ($self, $val, $max) = @_;
1760 2140
1761 $self->set_max ($max) 2141 $self->set_max ($max)
1762 if defined $max; 2142 if defined $max;
1763 2143
1764 $self->{gauge}->set_value ($val, $max); 2144 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 2145 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 2146}
1774 2147
1775############################################################################# 2148#############################################################################
1776 2149
1777package CFClient::UI::Slider; 2150package CFClient::UI::Slider;
… …
1787 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
1788 2161
1789sub new { 2162sub new {
1790 my $class = shift; 2163 my $class = shift;
1791 2164
1792 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
1793 2166
1794 # TODO: 0-width page 2167 # TODO: 0-width page
1795 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
1796 # TODO: calculations are off 2169 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
1800 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
1801 req_w => 20, 2176 min_w => $::WIDTH / 80,
1802 req_h => 20, 2177 min_h => $::WIDTH / 80,
1803 vertical => 0, 2178 vertical => 0,
1804 can_hover => 1, 2179 can_hover => 1,
1805 inner_pad => 5, 2180 inner_pad => 0.02,
1806 @_ 2181 @_
1807 ); 2182 );
1808 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
1809 $self 2187 $self
1810} 2188}
1811 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2201sub set_value {
2202 my ($self, $value) = @_;
2203
2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205
2206 $hi = $lo + 1 if $hi <= $lo;
2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2210 $value = $lo if $value < $lo;
2211 $value = $hi - $page if $value > $hi - $page;
2212
2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2214 if $unit;
2215
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217
2218 if ($value != $old_value) {
2219 $self->_emit (changed => $value);
2220 $self->update;
2221 }
2222}
2223
1812sub size_request { 2224sub size_request {
1813 my ($self) = @_; 2225 my ($self) = @_;
1814 2226
1815 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
1816 my $h = $self->{req_h};
1817
1818 $self->{vertical} ? ($h, $w) : ($w, $h)
1819} 2228}
1820 2229
1821sub button_down { 2230sub button_down {
1822 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1823 2232
1824 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
1825 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
1826} 2238}
1827 2239
1828sub mouse_motion { 2240sub mouse_motion {
1829 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1830 2242
1831 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245
2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2251 }
2252}
2253
2254sub update {
2255 my ($self) = @_;
2256
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2258 $self->set_value ($self->{range}[0]);
2259
1832 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
1833 2262
1834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1835 2264
1836 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1837 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1838 2267
1839 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
1840 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
1841 $x = $lo if $x < $lo;
1842 $x = $hi - $page if $x > $hi - $page;
1843 $self->{range}[0] = $x;
1844 2270
1845 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
1846 $self->update; 2272 $self->{knob_w} = $knob_w;
1847 } 2273 });
1848}
1849 2274
1850# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
1851# so that the handle doesn't leave the texture. This calculation isn't 100%
1852# correct propably, but it does the job for now
1853sub _calc_inner_pad_px {
1854 my ($self, $w) = @_;
1855 ($w / 100) * $self->{inner_pad} # % to pixels
1856} 2276}
1857 2277
1858sub _draw { 2278sub _draw {
1859 my ($self) = @_; 2279 my ($self) = @_;
1860 2280
1861 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
1862 2282
1863 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
1864 2284
1865 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
1866 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
1867 2287
2288 glTranslate 1, 0, 0;
1868 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
1869 glTranslate 0, -$self->{w}, 0;
1870
1871 ($w, $h) = ($h, $w);
1872 } 2290 }
1873 2291
1874 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1875 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1876 2294
1877 my ($value, $lo, $hi, $page) = @{$self->{range}};
1878
1879 $hi = $value + 1 if $lo == $hi;
1880
1881 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1882 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1883
1884 $page = int $page * $inner_w / ($hi - $lo);
1885 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1886
1887 $w -= $page;
1888 $page &= ~1;
1889 glTranslate $page * 0.5, 0, 0;
1890 $page ||= 2;
1891
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2297
1900 # draw background 2298 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1902 2300
1903 # draw handle 2301 # draw handle
1904 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1905 2303
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
1908} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
1909 2347
1910############################################################################# 2348#############################################################################
1911 2349
1912package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
1913 2351
… …
1917 2355
1918sub new { 2356sub new {
1919 my $class = shift; 2357 my $class = shift;
1920 2358
1921 my $self = $class->SUPER::new ( 2359 my $self = $class->SUPER::new (
1922 fontsize => 1, 2360 fontsize => 1,
2361 can_events => 0,
1923 #font => default_font 2362 #font => default_font
1924 @_, 2363 @_,
1925 2364
1926 layout => (new CFClient::Layout), 2365 layout => (new CFClient::Layout 1),
1927 par => [], 2366 par => [],
1928 height => 0, 2367 height => 0,
1929 children => [ 2368 children => [
1930 (new CFClient::UI::Empty expand => 1), 2369 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2370 (new CFClient::UI::Slider vertical => 1),
1932 ], 2371 ],
1933 ); 2372 );
1934 2373
1935 $self->{children}[1]->connect (changed => sub { 2374 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2375
1939 $self 2376 $self
1940} 2377}
1941 2378
1942sub set_fontsize { 2379sub set_fontsize {
… …
1944 2381
1945 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
1946 $self->reflow; 2383 $self->reflow;
1947} 2384}
1948 2385
1949sub text_height {
1950 my ($self, $text) = @_;
1951
1952 my $layout = $self->{layout};
1953
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w});
1956 $layout->set_text ($text);
1957
1958 ($layout->size)[1]
1959}
1960
1961sub reflow {
1962 my ($self) = @_;
1963
1964 $self->{need_reflow}++;
1965 $self->update;
1966}
1967
1968sub size_allocate { 2386sub size_allocate {
1969 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
1970 2388
1971 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
1972 2392
1973 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
1974 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1975 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
1976 2396
1977 $self->reflow; 2397 $self->reflow;
1978} 2398}
1979 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
1980sub add_paragraph { 2434sub add_paragraph {
1981 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1982 2436
1983 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1984 2438 my ($w, $h) = $self->text_size ($line);
1985 my $height = $self->text_height ($text);
1986
1987 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1988 2442
1989 push @{$self->{par}}, [$height, $color, $text];
1990
1991 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1992 $self->{children}[1]->update;
1993} 2444}
1994 2445
1995sub update { 2446sub update {
1996 my ($self) = @_; 2447 my ($self) = @_;
1997 2448
… …
1999 2450
2000 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2001 2452
2002 delete $self->{texture}; 2453 delete $self->{texture};
2003 2454
2004 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2005 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2459 my $height = 0;
2007 2460
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2009 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2010 2476
2011 $self->{height} = $height; 2477 $self->{height} = $height;
2012 2478
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2014 2480
2015 delete $self->{texture}; 2481 delete $self->{texture};
2016 } 2482 }
2017 2483
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2019 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2021 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2022 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026
2027 my $top = int $self->{children}[1]{range}[0];
2028
2029 my $y0 = $top;
2030 my $y1 = $top + $self->{h};
2031
2032 my $y = 0;
2033
2034 my $layout = $self->{layout};
2035
2036 $layout->set_font ($self->{font}) if $self->{font};
2037 2502
2038 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2504 my $h = $par->[1];
2040 2505
2041 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2042 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2043 2510
2044 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2045 my ($W, $H) = $layout->size; 2512
2046 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2047 } 2515 }
2048 2516
2049 $y += $h; 2517 $y += $h;
2050 } 2518 }
2051 2519
2052 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2054 }; 2521 };
2055 }); 2522 });
2056} 2523}
2057 2524
2058sub _draw { 2525sub _draw {
2059 my ($self) = @_; 2526 my ($self) = @_;
2060 2527
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2066 }
2067 2533
2068 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2069 2535
2070} 2536}
2071 2537
… …
2119 2585
2120sub new { 2586sub new {
2121 my $class = shift; 2587 my $class = shift;
2122 2588
2123 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2124 state => 0, 2590 state => 0,
2125 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2592 @_
2128 ); 2593 );
2129 2594
2130 if ($self->{state}) {
2131 $self->{state} = 0;
2132 $self->toggle_flopper;
2133 }
2134
2135 $self 2595 $self
2136} 2596}
2137 2597
2138sub toggle_flopper { 2598sub toggle_flopper {
2139 my ($self) = @_; 2599 my ($self) = @_;
2140 2600
2141 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2142 if ($self->{state} = !$self->{state}) {
2143 $CFClient::UI::ROOT->add ($self->{other});
2144 $self->{other}->move ($self->coord2global (0, $self->{h}));
2145 $self->emit ("open");
2146 } else {
2147 $CFClient::UI::ROOT->remove ($self->{other});
2148 $self->emit ("close");
2149 }
2150
2151 $self->emit (changed => $self->{state});
2152} 2602}
2153 2603
2154############################################################################# 2604#############################################################################
2155 2605
2156package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2166 @_, 2616 @_,
2167 can_events => 0, 2617 can_events => 0,
2168 ) 2618 )
2169} 2619}
2170 2620
2171sub set_text { 2621sub set_tooltip_from {
2172 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2173 2623
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2625 markup => $widget->{tooltip},
2176 $self->add ($self->{label}); 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8,
2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 );
2177} 2632}
2178 2633
2179sub size_request { 2634sub size_request {
2180 my ($self) = @_; 2635 my ($self) = @_;
2181 2636
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2638
2186 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2187} 2640}
2188 2641
2642sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_;
2644
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2666}
2667
2189sub _draw { 2668sub _draw {
2190 my ($self) = @_; 2669 my ($self) = @_;
2191 2670
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2671 glTranslate 0.375, 0.375;
2194 2672
2195 my ($w, $h) = @$self{qw(w h)}; 2673 my ($w, $h) = @$self{qw(w h)};
2196 2674
2197 glColor 1, 0.8, 0.4; 2675 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2686 glVertex 0 , $h;
2209 glVertex $w, $h; 2687 glVertex $w, $h;
2210 glVertex $w, 0; 2688 glVertex $w, 0;
2211 glEnd; 2689 glEnd;
2212 2690
2213 glPopMatrix; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2214 2692
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2217} 2694}
2218 2695
2219############################################################################# 2696#############################################################################
2220 2697
2698package CFClient::UI::Face;
2699
2700our @ISA = CFClient::UI::Base::;
2701
2702use CFClient::OpenGL;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 aspect => 1,
2709 can_events => 0,
2710 @_,
2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2728}
2729
2730sub size_request {
2731 (32, 8)
2732}
2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2742sub _draw {
2743 my ($self) = @_;
2744
2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757
2758 if ($tex) {
2759 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D;
2764 }
2765}
2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2776#############################################################################
2777
2778package CFClient::UI::Inventory;
2779
2780our @ISA = CFClient::UI::ScrolledWindow::;
2781
2782sub new {
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817
2818#############################################################################
2819
2820package CFClient::UI::Menu;
2821
2822our @ISA = CFClient::UI::FancyFrame::;
2823
2824use CFClient::OpenGL;
2825
2826sub new {
2827 my $class = shift;
2828
2829 my $self = $class->SUPER::new (
2830 items => [],
2831 z => 100,
2832 @_,
2833 );
2834
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836
2837 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item;
2839
2840 # handle various types of items, only text for now
2841 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label
2843 can_hover => 1,
2844 can_events => 1,
2845 text => $widget;
2846 }
2847
2848 $self->{item}{$widget} = $item;
2849
2850 $self->{vbox}->add ($widget);
2851 }
2852
2853 $self
2854}
2855
2856# popup given the event (must be a mouse button down event currently)
2857sub popup {
2858 my ($self, $ev) = @_;
2859
2860 $self->_emit ("popdown");
2861
2862 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self;
2864 $self->{button} = $ev->{button};
2865
2866 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868}
2869
2870sub mouse_motion {
2871 my ($self, $ev, $x, $y) = @_;
2872
2873 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER};
2876}
2877
2878sub button_up {
2879 my ($self, $ev, $x, $y) = @_;
2880
2881 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB;
2883 $self->hide;
2884
2885 $self->_emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover};
2887 }
2888}
2889
2890#############################################################################
2891
2892package CFClient::UI::Statusbox;
2893
2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2904
2905sub reorder {
2906 my ($self) = @_;
2907 my $NOW = time;
2908
2909 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 }
2912
2913 my @widgets;
2914
2915 my @items = sort {
2916 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} };
2919
2920 my $count = 10 + 1;
2921 for my $item (@items) {
2922 last unless --$count;
2923
2924 push @widgets, $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text};
2929
2930 for ($short) {
2931 s/^\s+//;
2932 s/\s+/ /g;
2933 }
2934
2935 new CFClient::UI::Label
2936 markup => $short,
2937 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg},
2943 can_events => 1,
2944 can_hover => 1
2945 };
2946 }
2947
2948 $self->clear;
2949 $self->SUPER::add (reverse @widgets);
2950}
2951
2952sub add {
2953 my ($self, $text, %arg) = @_;
2954
2955 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2959
2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2961
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963
2964 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) {
2966 $item->{count}++;
2967 } else {
2968 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text;
2970 }
2971 $item->{id} = ++$self->{id};
2972 $item->{timeout} = $timeout;
2973 delete $item->{label};
2974 } else {
2975 $self->{item}{$group} = {
2976 id => ++$self->{id},
2977 text => $text,
2978 timeout => $timeout,
2979 tooltip => $text,
2980 fg => [0.8, 0.8, 0.8, 0.8],
2981 pri => 0,
2982 count => 1,
2983 %arg,
2984 };
2985 }
2986
2987 $self->reorder;
2988}
2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2998}
2999
3000#############################################################################
3001
2221package CFClient::UI::Root; 3002package CFClient::UI::Root;
2222 3003
2223our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
2224 3005
2225use CFClient::OpenGL; 3006use CFClient::OpenGL;
2226 3007
2227sub check_size { 3008sub new {
2228 my ($self) = @_; 3009 my $class = shift;
2229 3010
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3011 my $self = $class->SUPER::new (
2231} 3012 visible => 1,
3013 @_,
3014 );
2232 3015
2233sub size_request { 3016 Scalar::Util::weaken ($self->{root} = $self);
2234 ($::WIDTH, $::HEIGHT) 3017
3018 $self
2235} 3019}
2236 3020
2237sub configure { 3021sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2239 3023
2240 $self->SUPER::configure ($x, $y, $w, $h); 3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
2241 3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 ($self->{w}, $self->{h})
3041}
3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
3057sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_;
3059
2242 for my $child (@{$self->{children}}) { 3060 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 3062
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3065
3066 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h};
3068
2247 $child->configure ($X, $Y, $W,$H); 3069 $child->configure ($X, $Y, $W, $H);
2248 } 3070 }
2249} 3071}
2250 3072
2251sub _topleft { 3073sub coord2local {
2252 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2253 3075
2254 ($x, $y) 3076 ($x, $y)
2255} 3077}
2256 3078
3079sub coord2global {
3080 my ($self, $x, $y) = @_;
3081
3082 ($x, $y)
3083}
3084
2257sub update { 3085sub update {
2258 my ($self) = @_; 3086 my ($self) = @_;
2259 3087
2260 $self->check_size; 3088 $::WANT_REFRESH++;
2261 ::refresh ();
2262} 3089}
2263 3090
2264sub add { 3091sub add {
2265 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2266 3093
2267 # integerize window positions 3094 $_->{is_toplevel} = 1
2268 $child->{x} = int $child->{x}; 3095 for @children;
2269 $child->{y} = int $child->{y};
2270 3096
2271 $self->SUPER::add ($child); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2272} 3113}
2273 3114
2274sub on_refresh { 3115sub on_refresh {
2275 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2276 3117
2277 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2278} 3119}
2279 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2280sub draw { 3127sub draw {
2281 my ($self) = @_; 3128 my ($self) = @_;
2282 3129
2283 while (my $rcb = delete $self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 3131 $_->()
3132 for values %{delete $self->{refresh_hook}};
3133 }
3134
3135 if ($self->{realloc}) {
3136 my @queue;
3137
3138 while () {
3139 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach
3141
3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3144 }
3145
3146 my $widget = pop @queue || last;
3147
3148 $widget->{visible} or last; # do not resize invisible widgets
3149
3150 my ($w, $h) = $widget->size_request;
3151
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154
3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3158 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h;
3160
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3162
3163 push @queue, $widget->{parent}
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3165 }
3166 }
3167
3168 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177
3178 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0;
3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h, $changed);
3190 }
3191 }
3192
3193 while ($self->{post_alloc_hook}) {
3194 $_->()
3195 for values %{delete $self->{post_alloc_hook}};
2285 } 3196 }
2286 3197
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2290 3201
2291 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2292 glLoadIdentity; 3203 glLoadIdentity;
2293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2294 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2295 glLoadIdentity; 3206 glLoadIdentity;
2296 3207
2297 $self->_draw; 3208 $self->_draw;
2298} 3209}
… …
2300############################################################################# 3211#############################################################################
2301 3212
2302package CFClient::UI; 3213package CFClient::UI;
2303 3214
2304$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2306 3217
23071 32181
2308 3219

Diff Legend

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