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.154 by root, Sun Apr 23 02:20:57 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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