ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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