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

Diff Legend

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