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.276 by root, Sun Jun 4 00:16:01 2006 UTC

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

Diff Legend

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