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

Diff Legend

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