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.283 by root, Mon Jun 5 02:28:30 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
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 $self->{max_w} = int $w if defined $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $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;
1541}
1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1142} 1548}
1143 1549
1144sub set_text { 1550sub set_text {
1145 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1146 1552
1553 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text";
1555
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1148
1149 delete $self->{texture}; 1558 delete $self->{req_h};
1150 $self->check_size; 1559
1560 $self->realloc;
1151 $self->update; 1561 $self->update;
1152} 1562}
1153 1563
1154sub set_markup { 1564sub set_markup {
1155 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1156 1566
1567 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup";
1569
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1158
1159 delete $self->{texture}; 1574 delete $self->{req_h};
1160 $self->check_size; 1575
1576 $self->realloc;
1161 $self->update; 1577 $self->update;
1162} 1578}
1163 1579
1164sub size_request { 1580sub size_request {
1165 my ($self) = @_; 1581 my ($self) = @_;
1166 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1167 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1168 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1169 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1170 1591
1171 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1172 1593
1173 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1174 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1175 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1176 1597
1177 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1178 1599
1179 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1180 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1181 } 1602 }
1182 1603
1604 ($w, $h)
1183 ( 1605 }
1184 $w + $self->{padding} * 2,
1185 $h + $self->{padding} * 2,
1186 )
1187} 1606}
1188 1607
1189sub size_allocate { 1608sub size_allocate {
1190 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1191 1610
1611 delete $self->{ox};
1612
1192 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1193} 1615}
1194 1616
1195sub set_fontsize { 1617sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1197 1619
1198 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1621 delete $self->{texture};
1200 $self->check_size; 1622
1201 $self->update; 1623 $self->realloc;
1202} 1624}
1203 1625
1204sub _draw { 1626sub _draw {
1205 my ($self) = @_; 1627 my ($self) = @_;
1206 1628
1629 $self->SUPER::_draw; # draw background, if applicable
1630
1207 my $tex = $self->{texture} ||= do { 1631 my $tex = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1633 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638
1211 new_from_layout CFClient::Texture $self->{layout} 1639 new_from_layout CFClient::Texture $self->{layout}
1212 }; 1640 };
1213 1641
1214 glEnable GL_BLEND; 1642 unless (exists $self->{ox}) {
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5);
1646
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5);
1650 };
1651
1216 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1654
1219 glColor @{$self->{fg}}; 1655 glColor_premultiply @{$self->{fg}}
1656 if $tex->{format} == GL_ALPHA;
1220 1657
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}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1234 1659
1235 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1661}
1238 1662
1239############################################################################# 1663#############################################################################
1240 1664
1241package CFClient::UI::EntryBase; 1665package CFClient::UI::EntryBase;
… …
1246 1670
1247sub new { 1671sub new {
1248 my $class = shift; 1672 my $class = shift;
1249 1673
1250 $class->SUPER::new ( 1674 $class->SUPER::new (
1251 fg => [1, 1, 1], 1675 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1676 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1677 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1678 active_fg => [0, 0, 0],
1255 can_hover => 1, 1679 can_hover => 1,
1256 can_focus => 1, 1680 can_focus => 1,
1257 valign => 0, 1681 valign => 0,
1258 can_events => 1, 1682 can_events => 1,
1683 #text => ...
1259 @_ 1684 @_
1260 ) 1685 )
1261} 1686}
1262 1687
1263sub _set_text { 1688sub _set_text {
… …
1265 1690
1266 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1267 1692
1268 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1269 1694
1270 delete $self->{texture};
1271
1272 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1273 $self->{text} = $text; 1696 $self->{text} = $text;
1274 1697
1275 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1276 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1277 1701
1278 $self->emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1706}
1707
1708sub set_text {
1709 my ($self, $text) = @_;
1710
1711 $self->{cursor} = length $text;
1712 $self->_set_text ($text);
1279} 1713}
1280 1714
1281sub get_text { 1715sub get_text {
1282 $_[0]{text} 1716 $_[0]{text}
1283} 1717}
… …
1286 my ($self) = @_; 1720 my ($self) = @_;
1287 1721
1288 my ($w, $h) = $self->SUPER::size_request; 1722 my ($w, $h) = $self->SUPER::size_request;
1289 1723
1290 ($w + 1, $h) # add 1 for cursor 1724 ($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} 1725}
1306 1726
1307sub key_down { 1727sub key_down {
1308 my ($self, $ev) = @_; 1728 my ($self, $ev) = @_;
1309 1729
… …
1311 my $sym = $ev->{sym}; 1731 my $sym = $ev->{sym};
1312 my $uni = $ev->{unicode}; 1732 my $uni = $ev->{unicode};
1313 1733
1314 my $text = $self->get_text; 1734 my $text = $self->get_text;
1315 1735
1316 if ($sym == 8) { 1736 if ($uni == 8) {
1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318 } elsif ($sym == 127) { 1738 } elsif ($uni == 127) {
1319 substr $text, $self->{cursor}, 1, ""; 1739 substr $text, $self->{cursor}, 1, "";
1320 } elsif ($sym == CFClient::SDLK_LEFT) { 1740 } elsif ($sym == CFClient::SDLK_LEFT) {
1321 --$self->{cursor} if $self->{cursor}; 1741 --$self->{cursor} if $self->{cursor};
1322 } elsif ($sym == CFClient::SDLK_RIGHT) { 1742 } elsif ($sym == CFClient::SDLK_RIGHT) {
1323 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1743 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1324 } elsif ($sym == CFClient::SDLK_HOME) { 1744 } elsif ($sym == CFClient::SDLK_HOME) {
1325 $self->{cursor} = 0; 1745 $self->{cursor} = 0;
1326 } elsif ($sym == CFClient::SDLK_END) { 1746 } elsif ($sym == CFClient::SDLK_END) {
1327 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1328 } elsif ($sym == 27) { 1748 } elsif ($uni == 27) {
1329 $self->emit ('escape'); 1749 $self->_emit ('escape');
1330 } elsif ($uni) { 1750 } elsif ($uni) {
1331 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1332 } 1754 }
1333 1755
1334 $self->_set_text ($text); 1756 $self->_set_text ($text);
1335 $self->update; 1757
1758 $self->realloc;
1759
1760 1
1336} 1761}
1337 1762
1338sub focus_in { 1763sub focus_in {
1339 my ($self) = @_; 1764 my ($self) = @_;
1340 1765
… …
1355 utf8::encode $text; 1780 utf8::encode $text;
1356 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1357 1782
1358 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1359 $self->update; 1784 $self->update;
1785
1786 1
1360} 1787}
1361 1788
1362sub mouse_motion { 1789sub mouse_motion {
1363 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1364# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1365} 1794}
1366 1795
1367sub _draw { 1796sub _draw {
1368 my ($self) = @_; 1797 my ($self) = @_;
1369 1798
1370 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1371 1800
1372 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1373 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1374 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1375 } else { 1804 } else {
1376 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1377 } 1806 }
1378 1807
1379 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1380 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1381 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1382 glVertex 0 , 0; 1811 glVertex 0 , 0;
1383 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1384 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1385 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1416 my ($self, $ev) = @_; 1845 my ($self, $ev) = @_;
1417 1846
1418 my $sym = $ev->{sym}; 1847 my $sym = $ev->{sym};
1419 1848
1420 if ($sym == 13) { 1849 if ($sym == 13) {
1850 unshift @{$self->{history}},
1851 my $txt = $self->get_text;
1852 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1854 $self->_emit (activate => $txt);
1422 $self->update; 1855 $self->update;
1423 1856
1857 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text;
1860 }
1861 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++;
1863 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1864 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 }
1868
1869 } elsif ($sym == CFClient::SDLK_DOWN) {
1870 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872
1873 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else {
1876 $self->set_text ($self->{history_saveback});
1877 }
1878
1424 } else { 1879 } else {
1425 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1426 } 1883 1
1427
1428} 1884}
1429 1885
1430############################################################################# 1886#############################################################################
1431 1887
1432package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1441 1897
1442sub new { 1898sub new {
1443 my $class = shift; 1899 my $class = shift;
1444 1900
1445 $class->SUPER::new ( 1901 $class->SUPER::new (
1446 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1447 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1450 can_hover => 1, 1906 can_hover => 1,
1451 align => 0, 1907 align => 0,
1452 valign => 0, 1908 valign => 0,
1453 can_events => 1, 1909 can_events => 1,
1454 @_ 1910 @_
1455 ) 1911 )
1456} 1912}
1457 1913
1914sub activate { }
1915
1458sub button_up { 1916sub button_up {
1459 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1460 1918
1919 $self->emit ("activate")
1461 if ($x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1462 && $y >= 0 && $y < $self->{h}) { 1921 && $y >= 0 && $y < $self->{h};
1463 $self->emit ("activate"); 1922
1464 } 1923 1
1465} 1924}
1466 1925
1467sub _draw { 1926sub _draw {
1468 my ($self) = @_; 1927 my ($self) = @_;
1469 1928
1470 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1471 1930
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; 1931 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1481 1934
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1936
1484 glDisable GL_TEXTURE_2D; 1937 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1938
1487 $self->SUPER::_draw; 1939 $self->SUPER::_draw;
1488} 1940}
1489 1941
1490############################################################################# 1942#############################################################################
… …
1501 1953
1502sub new { 1954sub new {
1503 my $class = shift; 1955 my $class = shift;
1504 1956
1505 $class->SUPER::new ( 1957 $class->SUPER::new (
1506 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1507 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1508 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1962 bg => [0, 0, 0, 0.2],
1963 active_bg => [1, 1, 1, 0.5],
1509 state => 0, 1964 state => 0,
1510 can_hover => 1, 1965 can_hover => 1,
1511 @_ 1966 @_
1512 ) 1967 )
1513} 1968}
1514 1969
1515sub size_request { 1970sub size_request {
1516 my ($self) = @_; 1971 my ($self) = @_;
1517 1972
1518 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1519} 1974}
1520 1975
1521sub button_down { 1976sub button_down {
1522 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1523 1978
1524 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1525 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1526 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1527 $self->emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1528 } 1987 1
1529} 1988}
1530 1989
1531sub _draw { 1990sub _draw {
1532 my ($self) = @_; 1991 my ($self) = @_;
1533 1992
1534 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1535 1994
1536 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1537 1996
1538 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1539 2000
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 2002
1542 glEnable GL_BLEND; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
2004
1543 glEnable GL_TEXTURE_2D; 2005 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); 2006 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 2007 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 2008}
1553 2009
1554############################################################################# 2010#############################################################################
1555 2011
1556package CFClient::UI::Image; 2012package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 2055 glTranslate 0, -$self->{w}, 0;
1600 2056
1601 ($w, $h) = ($h, $w); 2057 ($w, $h) = ($h, $w);
1602 } 2058 }
1603 2059
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 2060 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 2062
1609 $tex->draw_quad (0, 0, $w, $h); 2063 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 2064
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 2065 glDisable GL_TEXTURE_2D;
1613} 2066}
1614 2067
1615############################################################################# 2068#############################################################################
1616 2069
1617package CFClient::UI::VGauge; 2070package CFClient::UI::VGauge;
1618 2071
1619our @ISA = CFClient::UI::Base::; 2072our @ISA = CFClient::UI::Base::;
2073
2074use List::Util qw(min max);
1620 2075
1621use CFClient::OpenGL; 2076use CFClient::OpenGL;
1622 2077
1623my %tex = ( 2078my %tex = (
1624 food => [ 2079 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 2082 ],
1628 grace => [ 2083 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2085 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 2086 ],
1632 hp => [ 2087 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 2090 ],
1636 mana => [ 2091 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2093 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 2094 ],
1640); 2095);
1641 2096
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 2097# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 2098sub new {
… …
1662} 2117}
1663 2118
1664sub set_max { 2119sub set_max {
1665 my ($self, $max) = @_; 2120 my ($self, $max) = @_;
1666 2121
2122 return if $self->{max_val} == $max;
2123
1667 $self->{max_val} = $max; 2124 $self->{max_val} = $max;
2125 $self->update;
1668} 2126}
1669 2127
1670sub set_value { 2128sub set_value {
1671 my ($self, $val, $max) = @_; 2129 my ($self, $val, $max) = @_;
1672 2130
1673 $self->set_max ($max) 2131 $self->set_max ($max)
1674 if defined $max; 2132 if defined $max;
1675 2133
1676 $max = $self->{max_val}; 2134 return if $self->{val} == $val;
2135
1677 $self->{val} = $val; 2136 $self->{val} = $val;
1678
1679 $self->update; 2137 $self->update;
1680} 2138}
1681 2139
1682sub _draw { 2140sub _draw {
1683 my ($self) = @_; 2141 my ($self) = @_;
1684 2142
1685 my $tex = $tex{$self->{type}}; 2143 my $tex = $tex{$self->{type}};
2144 my ($t1, $t2, $t3) = @$tex;
1686 2145
1687 my ($w, $h) = ($self->{w}, $self->{h}); 2146 my ($w, $h) = ($self->{w}, $self->{h});
1688 2147
1689 if ($self->{vertical}) { 2148 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 2149 glRotate 90, 0, 0, 1;
… …
1692 2151
1693 ($w, $h) = ($h, $w); 2152 ($w, $h) = ($h, $w);
1694 } 2153 }
1695 2154
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 2155 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 2156
1699 my $t1 = $tex->[0]; 2157 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 2158 my $ycut2 = max 0, min 1, $ycut - 1;
2159
2160 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2);
1701 2162
1702 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 2168
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 2171 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2172 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2173 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2174 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 2175 glEnd;
1717 2176
2177 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2178 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 2179 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2180 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2181 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2182 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2183 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 2184 glEnd;
2185
2186 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd;
2194 }
1725 2195
1726 glDisable GL_BLEND; 2196 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 2197 glDisable GL_TEXTURE_2D;
1728} 2198}
1729 2199
… …
1735 2205
1736sub new { 2206sub new {
1737 my ($class, %arg) = @_; 2207 my ($class, %arg) = @_;
1738 2208
1739 my $self = $class->SUPER::new ( 2209 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 2210 tooltip => $arg{type},
2211 can_hover => 1,
2212 can_events => 1,
1741 %arg, 2213 %arg,
1742 ); 2214 );
1743 2215
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2216 $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); 2217 $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); 2218 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 2219
1748 $self 2220 $self
1749} 2221}
1750 2222
1751sub set_fontsize { 2223sub set_fontsize {
… …
1753 2225
1754 $self->{value}->set_fontsize ($fsize); 2226 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 2227 $self->{max} ->set_fontsize ($fsize);
1756} 2228}
1757 2229
2230sub set_max {
2231 my ($self, $max) = @_;
2232
2233 $self->{gauge}->set_max ($max);
2234 $self->{max}->set_text ($max);
2235}
2236
1758sub set_value { 2237sub set_value {
1759 my ($self, $val, $max) = @_; 2238 my ($self, $val, $max) = @_;
1760 2239
1761 $self->set_max ($max) 2240 $self->set_max ($max)
1762 if defined $max; 2241 if defined $max;
1763 2242
1764 $self->{gauge}->set_value ($val, $max); 2243 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 2244 $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} 2245}
1774 2246
1775############################################################################# 2247#############################################################################
1776 2248
1777package CFClient::UI::Slider; 2249package CFClient::UI::Slider;
… …
1787 qw(s1_slider.png s1_slider_bg.png); 2259 qw(s1_slider.png s1_slider_bg.png);
1788 2260
1789sub new { 2261sub new {
1790 my $class = shift; 2262 my $class = shift;
1791 2263
1792 # range [value, low, high, page] 2264 # range [value, low, high, page, unit]
1793 2265
1794 # TODO: 0-width page 2266 # TODO: 0-width page
1795 # TODO: req_w/h are wrong with vertical 2267 # TODO: req_w/h are wrong with vertical
1796 # TODO: calculations are off 2268 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2269 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2272 bg => [0, 0, 0, 0.2],
2273 active_bg => [1, 1, 1, 0.5],
1800 range => [0, 0, 100, 10], 2274 range => [0, 0, 100, 10, 0],
1801 req_w => 20, 2275 min_w => $::WIDTH / 80,
1802 req_h => 20, 2276 min_h => $::WIDTH / 80,
1803 vertical => 0, 2277 vertical => 0,
1804 can_hover => 1, 2278 can_hover => 1,
1805 inner_pad => 5, 2279 inner_pad => 0.02,
1806 @_ 2280 @_
1807 ); 2281 );
1808 2282
2283 $self->set_value ($self->{range}[0]);
2284 $self->update;
2285
1809 $self 2286 $self
1810} 2287}
1811 2288
2289sub changed { }
2290
2291sub set_range {
2292 my ($self, $range) = @_;
2293
2294 ($range, $self->{range}) = ($self->{range}, $range);
2295
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}";
2298}
2299
2300sub set_value {
2301 my ($self, $value) = @_;
2302
2303 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2304
2305 $hi = $lo + 1 if $hi <= $lo;
2306
2307 $page = $hi - $lo if $page > $hi - $lo;
2308
2309 $value = $lo if $value < $lo;
2310 $value = $hi - $page if $value > $hi - $page;
2311
2312 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2313 if $unit;
2314
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316
2317 if ($value != $old_value) {
2318 $self->_emit (changed => $value);
2319 $self->update;
2320 }
2321}
2322
1812sub size_request { 2323sub size_request {
1813 my ($self) = @_; 2324 my ($self) = @_;
1814 2325
1815 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
1816 my $h = $self->{req_h};
1817
1818 $self->{vertical} ? ($h, $w) : ($w, $h)
1819} 2327}
1820 2328
1821sub button_down { 2329sub button_down {
1822 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
1823 2331
1824 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2333
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335
1825 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
1826} 2337}
1827 2338
1828sub mouse_motion { 2339sub mouse_motion {
1829 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
1830 2341
1831 if ($GRAB == $self) { 2342 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344
2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2346
2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2348
2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2354 1
2355}
2356
2357sub update {
2358 my ($self) = @_;
2359
2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2368 $self->set_value ($self->{range}[0]);
2369
1832 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2371 my $range = ($hi - $page - $lo) || 1e-100;
1833 2372
1834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2373 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1835 2374
1836 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2375 $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 2376 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1838 2377
1839 $x -= $inner_pad_px; # substract the padding 2378 $value = ($value - $lo) / $range;
1840 $x = $x * ($hi - $lo) / $inner_w + $lo; 2379 $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 2380
1845 $self->emit (changed => $x); 2381 $self->{knob_x} = $value - $knob_w * 0.5;
1846 $self->update; 2382 $self->{knob_w} = $knob_w;
1847 } 2383 }
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 2384
1861 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
1862 2386
1863 my ($w, $h) = @$self{qw(w h)}; 2387 glScale $self->{w}, $self->{h};
1864 2388
1865 if ($self->{vertical}) { 2389 if ($self->{vertical}) {
1866 # draw a vertical slider like a rotated horizontal slider 2390 # draw a vertical slider like a rotated horizontal slider
1867 2391
2392 glTranslate 1, 0, 0;
1868 glRotate 90, 0, 0, 1; 2393 glRotate 90, 0, 0, 1;
1869 glTranslate 0, -$self->{w}, 0;
1870
1871 ($w, $h) = ($h, $w);
1872 } 2394 }
1873 2395
1874 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2396 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1875 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2397 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1876 2398
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; 2399 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2401
1900 # draw background 2402 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2403 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1902 2404
1903 # draw handle 2405 # draw handle
1904 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2406 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1905 2407
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2408 glDisable GL_TEXTURE_2D;
1908} 2409}
2410
2411#############################################################################
2412
2413package CFClient::UI::ValSlider;
2414
2415our @ISA = CFClient::UI::HBox::;
2416
2417sub new {
2418 my ($class, %arg) = @_;
2419
2420 my $range = delete $arg{range};
2421
2422 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift },
2426 from_value => sub { shift },
2427 %arg,
2428 );
2429
2430 $self->{slider}->connect (changed => sub {
2431 my ($self, $value) = @_;
2432 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2433 $self->{parent}->emit (changed => $value);
2434 });
2435
2436# $self->{entry}->connect (changed => sub {
2437# my ($self, $value) = @_;
2438# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2439# $self->{parent}->emit (changed => $value);
2440# });
2441
2442 $self->add ($self->{slider}, $self->{entry});
2443
2444 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2445
2446 $self
2447}
2448
2449sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) }
1909 2451
1910############################################################################# 2452#############################################################################
1911 2453
1912package CFClient::UI::TextView; 2454package CFClient::UI::TextView;
1913 2455
… …
1917 2459
1918sub new { 2460sub new {
1919 my $class = shift; 2461 my $class = shift;
1920 2462
1921 my $self = $class->SUPER::new ( 2463 my $self = $class->SUPER::new (
1922 fontsize => 1, 2464 fontsize => 1,
2465 can_events => 0,
1923 #font => default_font 2466 #font => default_font
1924 @_, 2467 @_,
1925 2468
1926 layout => (new CFClient::Layout), 2469 layout => (new CFClient::Layout 1),
1927 par => [], 2470 par => [],
1928 height => 0, 2471 height => 0,
1929 children => [ 2472 children => [
1930 (new CFClient::UI::Empty expand => 1), 2473 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2474 (new CFClient::UI::Slider vertical => 1),
1932 ], 2475 ],
1933 ); 2476 );
1934 2477
1935 $self->{children}[1]->connect (changed => sub { 2478 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2479
1939 $self 2480 $self
1940} 2481}
1941 2482
1942sub set_fontsize { 2483sub set_fontsize {
1943 my ($self, $fontsize) = @_; 2484 my ($self, $fontsize) = @_;
1944 2485
1945 $self->{fontsize} = $fontsize; 2486 $self->{fontsize} = $fontsize;
1946 $self->reflow; 2487 $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} 2488}
1967 2489
1968sub size_allocate { 2490sub size_allocate {
1969 my ($self, $w, $h) = @_; 2491 my ($self, $w, $h) = @_;
1970 2492
… …
1975 $self->{layout}->set_width ($self->{children}[0]{w}); 2497 $self->{layout}->set_width ($self->{children}[0]{w});
1976 2498
1977 $self->reflow; 2499 $self->reflow;
1978} 2500}
1979 2501
2502sub text_size {
2503 my ($self, $text, $indent) = @_;
2504
2505 my $layout = $self->{layout};
2506
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent);
2509 $layout->set_markup ($text);
2510
2511 $layout->size
2512}
2513
2514sub reflow {
2515 my ($self) = @_;
2516
2517 $self->{need_reflow}++;
2518 $self->update;
2519}
2520
2521sub set_offset {
2522 my ($self, $offset) = @_;
2523
2524 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset);
2526}
2527
2528sub clear {
2529 my ($self) = @_;
2530
2531 $self->{par} = [];
2532 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534}
2535
1980sub add_paragraph { 2536sub add_paragraph {
1981 my ($self, $color, $text) = @_; 2537 my ($self, $color, $text, $indent) = @_;
1982 2538
1983 #TODO: intelligently "reformat" paragraph 2539 for my $line (split /\n/, $text) {
1984 2540 my ($w, $h) = $self->text_size ($line);
1985 my $height = $self->text_height ($text);
1986
1987 $self->{height} += $height; 2541 $self->{height} += $h;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2543 }
1988 2544
1989 push @{$self->{par}}, [$height, $color, $text];
1990
1991 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1992 $self->{children}[1]->update;
1993} 2546}
1994 2547
1995sub update { 2548sub update {
1996 my ($self) = @_; 2549 my ($self) = @_;
1997 2550
… …
1999 2552
2000 return unless $self->{h} > 0; 2553 return unless $self->{h} > 0;
2001 2554
2002 delete $self->{texture}; 2555 delete $self->{texture};
2003 2556
2004 $ROOT->on_refresh ($self, sub { 2557 $ROOT->on_post_alloc ($self, sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559
2005 if (delete $self->{need_reflow}) { 2560 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2561 my $height = 0;
2007 2562
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2009 for @{$self->{par}}; 2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2010 2578
2011 $self->{height} = $height; 2579 $self->{height} = $height;
2012 2580
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2014 2582
2015 delete $self->{texture}; 2583 delete $self->{texture};
2016 } 2584 }
2017 2585
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2019 glClearColor 0, 0, 0, 1; 2587 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2021 2589
2590 my $top = int $self->{children}[1]{range}[0];
2591
2592 my $y0 = $top;
2593 my $y1 = $top + $H;
2594
2595 my $y = 0;
2596
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2022 glEnable GL_BLEND; 2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2603 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 2604
2038 for my $par (@{$self->{par}}) { 2605 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2606 my $h = $par->[1];
2040 2607
2041 if ($y0 < $y + $h && $y < $y1) { 2608 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2042 $layout->set_text ($par->[2]); 2611 $layout->set_markup ($par->[4]);
2043 2612
2044 glColor @{ $par->[1] }; 2613 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2045 my ($W, $H) = $layout->size; 2614
2046 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2615 glRasterPos $par->[3], $y - $y0;
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2047 } 2617 }
2048 2618
2049 $y += $h; 2619 $y += $h;
2050 } 2620 }
2051 2621
2052 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND; 2622 glDisable GL_BLEND;
2054 }; 2623 };
2055 }); 2624 });
2056} 2625}
2057 2626
2058sub _draw { 2627sub _draw {
2059 my ($self) = @_; 2628 my ($self) = @_;
2060 2629
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2632 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2066 }
2067 2635
2068 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2069 2637
2070} 2638}
2071 2639
… …
2119 2687
2120sub new { 2688sub new {
2121 my $class = shift; 2689 my $class = shift;
2122 2690
2123 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2124 state => 0, 2692 state => 0,
2125 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2694 @_
2128 ); 2695 );
2129 2696
2130 if ($self->{state}) {
2131 $self->{state} = 0;
2132 $self->toggle_flopper;
2133 }
2134
2135 $self 2697 $self
2136} 2698}
2137 2699
2138sub toggle_flopper { 2700sub toggle_flopper {
2139 my ($self) = @_; 2701 my ($self) = @_;
2140 2702
2141 # TODO: use animation 2703 $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} 2704}
2153 2705
2154############################################################################# 2706#############################################################################
2155 2707
2156package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2166 @_, 2718 @_,
2167 can_events => 0, 2719 can_events => 0,
2168 ) 2720 )
2169} 2721}
2170 2722
2171sub set_text { 2723sub set_tooltip_from {
2172 my ($self, $text) = @_; 2724 my ($self, $widget) = @_;
2173 2725
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2726 my $tooltip = $widget->{tooltip};
2175 $self->{label}->set_text ($text); 2727
2176 $self->add ($self->{label}); 2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2735 $self->add (new CFClient::UI::Label
2736 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8,
2739 fg => [0, 0, 0, 1],
2740 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 );
2177} 2743}
2178 2744
2179sub size_request { 2745sub size_request {
2180 my ($self) = @_; 2746 my ($self) = @_;
2181 2747
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2749
2186 ($w + 4, $h + 4) 2750 ($w + 4, $h + 4)
2187} 2751}
2188 2752
2753sub size_allocate {
2754 my ($self, $w, $h) = @_;
2755
2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2775}
2776
2189sub _draw { 2777sub _draw {
2190 my ($self) = @_; 2778 my ($self) = @_;
2191 2779
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2780 glTranslate 0.375, 0.375;
2194 2781
2195 my ($w, $h) = @$self{qw(w h)}; 2782 my ($w, $h) = @$self{qw(w h)};
2196 2783
2197 glColor 1, 0.8, 0.4; 2784 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2795 glVertex 0 , $h;
2209 glVertex $w, $h; 2796 glVertex $w, $h;
2210 glVertex $w, 0; 2797 glVertex $w, 0;
2211 glEnd; 2798 glEnd;
2212 2799
2213 glPopMatrix; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2214 2801
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2217} 2803}
2218 2804
2219############################################################################# 2805#############################################################################
2220 2806
2807package CFClient::UI::Face;
2808
2809our @ISA = CFClient::UI::Base::;
2810
2811use CFClient::OpenGL;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 aspect => 1,
2818 can_events => 0,
2819 @_,
2820 );
2821
2822 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self);
2824
2825 $self->{timer} = Event->timer (
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2827 hard => 1,
2828 interval => $self->{animspeed},
2829 cb => sub {
2830 ++$widget->{frame};
2831 $widget->update;
2832 },
2833 );
2834 }
2835
2836 $self
2837}
2838
2839sub size_request {
2840 (32, 8)
2841}
2842
2843sub update {
2844 my ($self) = @_;
2845
2846 return unless $self->{visible};
2847
2848 $self->SUPER::update;
2849}
2850
2851sub _draw {
2852 my ($self) = @_;
2853
2854 return unless $::CONN;
2855
2856 my $face;
2857
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}];
2860
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864
2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2866
2867 if ($tex) {
2868 glEnable GL_TEXTURE_2D;
2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2870 glColor 0, 0, 0, 1;
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D;
2873 }
2874}
2875
2876sub DESTROY {
2877 my ($self) = @_;
2878
2879 $self->{timer}->cancel
2880 if $self->{timer};
2881
2882 $self->SUPER::DESTROY;
2883}
2884
2885#############################################################################
2886
2887package CFClient::UI::Buttonbar;
2888
2889our @ISA = CFClient::UI::HBox::;
2890
2891# TODO: should actualyl wrap buttons and other goodies.
2892
2893#############################################################################
2894
2895package CFClient::UI::Menu;
2896
2897our @ISA = CFClient::UI::FancyFrame::;
2898
2899use CFClient::OpenGL;
2900
2901sub new {
2902 my $class = shift;
2903
2904 my $self = $class->SUPER::new (
2905 items => [],
2906 z => 100,
2907 @_,
2908 );
2909
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911
2912 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item;
2914
2915 # handle various types of items, only text for now
2916 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label
2918 can_hover => 1,
2919 can_events => 1,
2920 text => $widget;
2921 }
2922
2923 $self->{item}{$widget} = $item;
2924
2925 $self->{vbox}->add ($widget);
2926 }
2927
2928 $self
2929}
2930
2931# popup given the event (must be a mouse button down event currently)
2932sub popup {
2933 my ($self, $ev) = @_;
2934
2935 $self->_emit ("popdown");
2936
2937 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self;
2939 $self->{button} = $ev->{button};
2940
2941 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943}
2944
2945sub mouse_motion {
2946 my ($self, $ev, $x, $y) = @_;
2947
2948 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2953}
2954
2955sub button_up {
2956 my ($self, $ev, $x, $y) = @_;
2957
2958 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB;
2960 $self->hide;
2961
2962 $self->_emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2968 1
2969}
2970
2971#############################################################################
2972
2973package CFClient::UI::Multiplexer;
2974
2975our @ISA = CFClient::UI::Container::;
2976
2977sub new {
2978 my $class = shift;
2979
2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
3089 fontsize => 0.8,
3090 @_,
3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
3098}
3099
3100sub reorder {
3101 my ($self) = @_;
3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
3108
3109 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 }
3112
3113 my @widgets;
3114
3115 my @items = sort {
3116 $a->{pri} <=> $b->{pri}
3117 or $b->{id} <=> $a->{id}
3118 } values %{ $self->{item} };
3119
3120 $self->{timer}->interval (1);
3121
3122 my $count = 10 + 1;
3123 for my $item (@items) {
3124 last unless --$count;
3125
3126 my $label = $item->{label} ||= do {
3127 # TODO: doesn't handle markup well (read as: at all)
3128 my $short = $item->{count} > 1
3129 ? "<b>$item->{count} ×</b> $item->{text}"
3130 : $item->{text};
3131
3132 for ($short) {
3133 s/^\s+//;
3134 s/\s+/ /g;
3135 }
3136
3137 new CFClient::UI::Label
3138 markup => $short,
3139 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize},
3143 max_w => $::WIDTH * 0.44,
3144 fg => [@{ $item->{fg} }],
3145 can_events => 1,
3146 can_hover => 1
3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
3160 }
3161
3162 $self->clear;
3163 $self->SUPER::add (reverse @widgets);
3164}
3165
3166sub add {
3167 my ($self, $text, %arg) = @_;
3168
3169 $text =~ s/^\s+//;
3170 $text =~ s/\s+$//;
3171
3172 return unless $text;
3173
3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3175
3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3177
3178 if (my $item = $self->{item}{$group}) {
3179 if ($item->{text} eq $text) {
3180 $item->{count}++;
3181 } else {
3182 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text;
3184 }
3185 $item->{id} = ++$self->{id};
3186 $item->{timeout} = $timeout;
3187 delete $item->{label};
3188 } else {
3189 $self->{item}{$group} = {
3190 id => ++$self->{id},
3191 text => $text,
3192 timeout => $timeout,
3193 tooltip => $text,
3194 fg => [0.8, 0.8, 0.8, 0.8],
3195 pri => 0,
3196 count => 1,
3197 %arg,
3198 };
3199 }
3200
3201 $self->reorder;
3202}
3203
3204sub reconfigure {
3205 my ($self) = @_;
3206
3207 delete $_->{label}
3208 for values %{ $self->{item} || {} };
3209
3210 $self->reorder;
3211 $self->SUPER::reconfigure;
3212}
3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3222#############################################################################
3223
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
2221package CFClient::UI::Root; 3519package CFClient::UI::Root;
2222 3520
2223our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
2224 3522
3523use List::Util qw(min max);
3524
2225use CFClient::OpenGL; 3525use CFClient::OpenGL;
2226 3526
2227sub check_size { 3527sub new {
2228 my ($self) = @_; 3528 my $class = shift;
2229 3529
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
2231} 3538}
2232 3539
2233sub size_request { 3540sub size_request {
2234 ($::WIDTH, $::HEIGHT) 3541 my ($self) = @_;
2235}
2236 3542
2237sub configure { 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
3558}
3559
3560sub size_allocate {
2238 my ($self, $x, $y, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2239 3562
2240 $self->SUPER::configure ($x, $y, $w, $h);
2241
2242 for my $child (@{$self->{children}}) { 3563 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 3565
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3566 $X = $child->{force_x} if exists $child->{force_x};
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3568
3569 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h};
3571
2247 $child->configure ($X, $Y, $W,$H); 3572 $child->configure ($X, $Y, $W, $H);
2248 } 3573 }
2249} 3574}
2250 3575
2251sub _topleft { 3576sub coord2local {
2252 my ($self, $x, $y) = @_; 3577 my ($self, $x, $y) = @_;
2253 3578
2254 ($x, $y) 3579 ($x, $y)
2255} 3580}
2256 3581
3582sub coord2global {
3583 my ($self, $x, $y) = @_;
3584
3585 ($x, $y)
3586}
3587
2257sub update { 3588sub update {
2258 my ($self) = @_; 3589 my ($self) = @_;
2259 3590
2260 $self->check_size; 3591 $::WANT_REFRESH++;
2261 ::refresh ();
2262} 3592}
2263 3593
2264sub add { 3594sub add {
2265 my ($self, $child) = @_; 3595 my ($self, @children) = @_;
2266 3596
2267 # integerize window positions 3597 $_->{is_toplevel} = 1
2268 $child->{x} = int $child->{x}; 3598 for @children;
2269 $child->{y} = int $child->{y};
2270 3599
2271 $self->SUPER::add ($child); 3600 $self->SUPER::add (@children);
3601}
3602
3603sub remove {
3604 my ($self, @children) = @_;
3605
3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3610
3611 while (@children) {
3612 my $w = pop @children;
3613 push @children, $w->children;
3614 $w->set_invisible;
3615 }
2272} 3616}
2273 3617
2274sub on_refresh { 3618sub on_refresh {
2275 my ($self, $id, $cb) = @_; 3619 my ($self, $id, $cb) = @_;
2276 3620
2277 $self->{refresh_hook}{$id} = $cb; 3621 $self->{refresh_hook}{$id} = $cb;
2278} 3622}
2279 3623
3624sub on_post_alloc {
3625 my ($self, $id, $cb) = @_;
3626
3627 $self->{post_alloc_hook}{$id} = $cb;
3628}
3629
2280sub draw { 3630sub draw {
2281 my ($self) = @_; 3631 my ($self) = @_;
2282 3632
2283 while (my $rcb = delete $self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 3634 $_->()
3635 for values %{delete $self->{refresh_hook}};
2285 } 3636 }
3637
3638 if ($self->{realloc}) {
3639 my %queue;
3640 my @queue;
3641 my $widget;
3642
3643 outer:
3644 while () {
3645 if (my $realloc = delete $self->{realloc}) {
3646 for $widget (values %$realloc) {
3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3653 }
3654
3655 while () {
3656 @queue or last outer;
3657
3658 $widget = pop @{ $queue[-1] || [] }
3659 and last;
3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3679 $widget->{req_w} = $w;
3680 $widget->{req_h} = $h;
3681
3682 $self->{size_alloc}{$widget+0} = $widget;
3683
3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3694 }
3695 }
3696
3697 while (my $size_alloc = delete $self->{size_alloc}) {
3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705
3706 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0;
3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3716 $widget->{w} = $w;
3717 $widget->{h} = $h;
3718
3719 $widget->emit (size_allocate => $w, $h);
3720 }
3721 }
3722 }
3723
3724 while ($self->{post_alloc_hook}) {
3725 $_->()
3726 for values %{delete $self->{post_alloc_hook}};
3727 }
3728
2286 3729
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
2290 3733
2291 glMatrixMode GL_PROJECTION; 3734 glMatrixMode GL_PROJECTION;
2292 glLoadIdentity; 3735 glLoadIdentity;
2293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2294 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
2295 glLoadIdentity; 3738 glLoadIdentity;
2296 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
2297 $self->_draw; 3747 $self->_draw;
2298} 3748}
2299 3749
2300############################################################################# 3750#############################################################################
2301 3751
2302package CFClient::UI; 3752package CFClient::UI;
2303 3753
2304$ROOT = new CFClient::UI::Root; 3754$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 3755$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2306 3756
23071 37571
2308 3758

Diff Legend

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