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.150 by elmex, Sun Apr 23 00:08:29 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;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
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
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
14 71
15# class methods for events 72# class methods for events
16sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
18} 76}
19 77
20sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
22} 81}
23 82
24sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
25 my ($ev) = @_; 84 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 88 my $widget = $ROOT->find_widget ($x, $y);
30 89
31 $GRAB = $widget; 90 $GRAB = $widget;
32 $GRAB->update if $GRAB; 91 $GRAB->update if $GRAB;
92
93 check_tooltip;
33 } 94 }
34 95
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 97
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
38} 100}
39 101
40sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
41 my ($ev) = @_; 103 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
43 105
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 107
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 109
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
49 112
50 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 115 $grab->update if $grab;
53 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
117
118 check_tooltip;
54 } 119 }
55} 120}
56 121
57sub feed_sdl_motion_event { 122sub feed_sdl_motion_event {
58 my ($ev) = @_; 123 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 128 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 129 my $hover = $HOVER; $HOVER = $widget;
65 130
66 $hover->update if $hover && $hover->{can_hover}; 131 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 133
134 check_tooltip;
135 }
136
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
71} 139}
72 140
73# convert position array to integers 141# convert position array to integers
74sub harmonize { 142sub harmonize {
75 my ($vals) = @_; 143 my ($vals) = @_;
… …
81 $rem += $_ - $i; 149 $rem += $_ - $i;
82 $_ = $i; 150 $_ = $i;
83 } 151 }
84} 152}
85 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
86############################################################################# 195#############################################################################
87 196
88package CFClient::UI::Base; 197package CFClient::UI::Base;
89 198
90use strict; 199use strict;
… …
93 202
94sub new { 203sub new {
95 my $class = shift; 204 my $class = shift;
96 205
97 my $self = bless { 206 my $self = bless {
98 x => 0, 207 x => "center",
99 y => 0, 208 y => "center",
100 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
101 can_events => 1, 212 can_events => 1,
102 @_ 213 @_
103 }, $class; 214 }, $class;
104 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
105 for (keys %$self) { 218 for (keys %$self) {
106 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
107 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
108 } 221 }
109 } 222 }
110 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
111 $self 236 $self
112} 237}
113 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
114sub show { 246sub show {
115 my ($self) = @_; 247 my ($self) = @_;
116 248
117 return if $self->{parent}; 249 return if $self->{parent};
118 250
119 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
120} 252}
121 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
122sub hide { 307sub hide {
123 my ($self) = @_; 308 my ($self) = @_;
124 309
125 return unless $self->{parent}; 310 $self->set_invisible;
126 311
127 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
128} 314}
129 315
130sub move { 316sub move_abs {
131 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
132 318
133 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
134 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
135 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
136 322
137 $self->update; 323 $self->update;
138} 324}
139 325
140sub needs_redraw { 326sub set_size {
141 0 327 my ($self, $w, $h) = @_;
328
329 $self->{force_w} = $w;
330 $self->{force_h} = $h;
331
332 $self->realloc;
142} 333}
143 334
144sub size_request { 335sub size_request {
145 require Carp; 336 require Carp;
146 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
148 339
149sub configure { 340sub configure {
150 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
151 342
152 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
153 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
154 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
155 348
156 # use alignment to adjust x, y 349 # use alignment to adjust x, y
157 350
158 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
159 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
160
161 ($w, $h) = ($w2, $h2);
162 } 353 }
163 354
164 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
165 $self->{x} = $x; 356 $self->{x} = $x;
166 $self->{y} = $y; 357 $self->{y} = $y;
167 $self->update; 358 $self->update;
168 } 359 }
169 360
170 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
171 $self->{w} = $w; 364 $self->{alloc_w} = $w;
172 $self->{h} = $h; 365 $self->{alloc_h} = $h;
173 366
174 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
175 $self->update;
176 } 368 }
177} 369}
178 370
179sub size_allocate { 371sub size_allocate {
180 # nothing to be done 372 # nothing to be done
181} 373}
182 374
183# return top left coordinates 375sub children {
184sub _topleft { 376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
383sub set_max_size {
185 my ($self, $x, $y) = @_; 384 my ($self, $w, $h) = @_;
186 385
187 $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 }
188} 404}
189 405
190# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
191sub coord2local { 407sub coord2local {
192 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
193 409
194 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
195 ($x - $X, $y - $Y)
196} 411}
197 412
198# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
199sub coord2global { 414sub coord2global {
200 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
201 416
202 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
203 ($x + $X, $y + $Y)
204} 418}
205 419
206sub focus_in { 420sub focus_in {
207 my ($self) = @_; 421 my ($self) = @_;
208 422
209 return if $FOCUS == $self; 423 return if $FOCUS == $self;
210 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
211 425
212 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
213 427
214 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
215 429
216 $focus->update if $focus; 430 $focus->update if $focus;
217 $FOCUS->update; 431 $FOCUS->update;
218} 432}
219 433
… …
222 436
223 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
224 438
225 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
226 440
227 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
228 442
229 $focus->update if $focus; #? 443 $focus->update if $focus; #?
230}
231 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
232sub mouse_motion { } 449sub mouse_motion { 0 }
233sub button_up { } 450sub button_up { 0 }
234sub key_down { } 451sub key_down { 0 }
235sub key_up { } 452sub key_up { 0 }
236 453
237sub button_down { 454sub button_down {
238 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
239 456
240 $self->focus_in; 457 $self->focus_in;
241}
242 458
243sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
244sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
245sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
246sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
247sub 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
248 535
249sub draw { 536sub draw {
250 my ($self) = @_; 537 my ($self) = @_;
251 538
252 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);
253 550
254 glPushMatrix; 551 glPushMatrix;
255 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
256 $self->_draw; 553 $self->_draw;
257 glPopMatrix; 554 glPopMatrix;
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 565 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
270 glEnd; 567 glEnd;
271 glDisable GL_BLEND; 568 glDisable GL_BLEND;
272 } 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 }
273} 584}
274 585
275sub _draw { 586sub _draw {
276 my ($self) = @_; 587 my ($self) = @_;
277 588
278 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
279} 590}
280 591
281sub find_widget {
282 my ($self, $x, $y) = @_;
283
284 return () unless $self->{can_events};
285
286 return $self
287 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
288 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
289
290 ()
291}
292
293sub set_parent {
294 my ($self, $parent) = @_;
295
296 Scalar::Util::weaken ($self->{parent} = $parent);
297}
298
299sub check_size {
300 my ($self) = @_;
301
302 return unless $self->{parent};
303
304 my ($w, $h) = $self->size_request;
305
306 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w;
308 $self->{req_h} = $h;
309
310 $self->{parent}->check_size;
311 }
312}
313
314sub update {
315 my ($self) = @_;
316
317 $self->{parent}->update
318 if $self->{parent};
319}
320
321sub connect {
322 my ($self, $signal, $cb) = @_;
323
324 push @{ $self->{signal_cb}{$signal} }, $cb;
325}
326
327sub emit {
328 my ($self, $signal, @args) = @_;
329
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
331 $cb->($self, @args);
332 }
333}
334
335sub DESTROY { 592sub DESTROY {
336 my ($self) = @_; 593 my ($self) = @_;
337 594
595 delete $WIDGET{$self+0};
338 #$self->deactivate; 596 #$self->deactivate;
339} 597}
340 598
341############################################################################# 599#############################################################################
342 600
… …
351 my $class = shift; 609 my $class = shift;
352 610
353 # range [value, low, high, page] 611 # range [value, low, high, page]
354 612
355 $class->SUPER::new ( 613 $class->SUPER::new (
356 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
357 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
358 @_ 616 @_
359 ) 617 )
360} 618}
361 619
362sub _draw { 620sub _draw {
363 my ($self) = @_; 621 my ($self) = @_;
364 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
365 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
366 629
367 glEnable GL_BLEND; 630 glEnable GL_BLEND;
368 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
369 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
370 633
371 glBegin GL_QUADS; 634 glBegin GL_QUADS;
372 glVertex 0 , 0; 635 glVertex 0 , 0;
373 glVertex 0 , $h; 636 glVertex 0 , $h;
374 glVertex $w, $h; 637 glVertex $w, $h;
375 glVertex $w, 0; 638 glVertex $w, 0;
376 glEnd; 639 glEnd;
377 640
378 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
379} 643}
380 644
381############################################################################# 645#############################################################################
382 646
383package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
388 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
389 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
390} 654}
391 655
392sub size_request { 656sub size_request {
393 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
394} 660}
395 661
396sub draw { } 662sub draw { }
397 663
398############################################################################# 664#############################################################################
… …
402our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
403 669
404sub new { 670sub new {
405 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
406 672
407 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
408 674
409 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
410 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
411 683
412 $self 684 $self
413} 685}
414 686
415sub add { 687sub add {
416 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
417 689
418 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
419 692
420 use sort 'stable'; 693 use sort 'stable';
421 694
422 $self->{children} = [ 695 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
425 ]; 698 ];
426 699
427 $child->check_size; 700 $self->realloc;
701}
702
703sub children {
704 @{ $_[0]{children} }
428} 705}
429 706
430sub remove { 707sub remove {
431 my ($self, $child) = @_; 708 my ($self, $child) = @_;
432 709
433 delete $child->{parent}; 710 delete $child->{parent};
711 $child->hide;
434 712
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 714
437 $self->check_size; 715 $self->realloc;
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;
438} 730}
439 731
440sub find_widget { 732sub find_widget {
441 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
442 734
443 $x -= $self->{x}; 735 $x -= $self->{x};
444 $y -= $self->{y}; 736 $y -= $self->{y};
445 737
446 my $res; 738 my $res;
447 739
448 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
449 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
450 and return $res; 742 and return $res;
451 } 743 }
452 744
453 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
502 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
503} 795}
504 796
505############################################################################# 797#############################################################################
506 798
799# back-buffered drawing area
800
507package CFClient::UI::Window; 801package CFClient::UI::Window;
508 802
509our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
510 804
511use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
517} 811}
518 812
519sub update { 813sub update {
520 my ($self) = @_; 814 my ($self) = @_;
521 815
522 # we want to do this delayed... 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 817 $self->SUPER::update;
525}
526
527sub render_chld {
528 my ($self) = @_;
529
530 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
531 glClearColor 0, 0, 0, 1;
532 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw;
534 };
535} 818}
536 819
537sub size_allocate { 820sub size_allocate {
538 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
539 822
540 $self->child->configure (0, 0, $w, $h); 823 $self->SUPER::size_allocate ($w, $h);
824 $self->update;
825}
541 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
542 $self->render_chld; 847 $self->_render;
848 };
543} 849}
544 850
545sub _draw { 851sub _draw {
546 my ($self) = @_; 852 my ($self) = @_;
547 853
548 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
549 855
550 my $tex = $self->{texture} 856 my $tex = $self->{texture}
551 or return; 857 or return;
552 858
553 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
556 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;
557 862
558 $tex->draw_quad (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
559 864
560 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
562} 866}
563 867
564############################################################################# 868#############################################################################
565 869
566package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
567 871
568our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
569
570sub new { die }
571
572sub size_request {
573 my ($self) = @_;
574
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
577
578 @$self{qw(child_w child_h)}
579}
580
581sub _draw {
582 my ($self) = @_;
583
584 $self->{children}[1]->draw;
585}
586
587
588#############################################################################
589
590package CFClient::UI::Frame;
591
592our @ISA = CFClient::UI::Bin::;
593
594use CFClient::OpenGL;
595 873
596sub new { 874sub new {
597 my $class = shift; 875 my $class = shift;
598 876
599 my $self = $class->SUPER::new ( 877 $class->SUPER::new (
600 bg => [1, 1, 1, 1], 878 scroll_x => 0,
601 border_bg => [1, 1, 1, 1], 879 scroll_y => 1,
602 border => 0.8,
603 @_ 880 @_,
604 ); 881 )
605
606 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614} 882}
615 883
616sub size_request { 884sub size_request {
617 my ($self) = @_; 885 my ($self) = @_;
618 ($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)
619} 893}
620 894
621sub size_allocate { 895sub size_allocate {
622 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
623 $self->{w} = $w; 897
624 $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
625 $self->child->configure (0, 0, $w, $h); 903 $self->child->configure (0, 0, $w, $h);
904 $self->update;
626} 905}
627 906
628sub _draw { 907sub set_offset {
629 my ($self) = @_; 908 my ($self, $x, $y) = @_;
630 909
631 my ($w, $h) = ($self->{w}, $self->{h}); 910 $self->{view_x} = int $x;
911 $self->{view_y} = int $y;
632 912
633 glEnable GL_BLEND; 913 $self->update;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914}
635 glEnable GL_TEXTURE_2D;
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637 915
638# glBegin GL_QUADS; 916# hmm, this does not work for topleft of $self... but we should not ask for that
639# glColor 0, 0, 0, 0; 917sub coord2local {
640# glVertex 0 , 0; 918 my ($self, $x, $y) = @_;
641# glVertex 0 , $h;
642# glVertex $w, $h;
643# glVertex $w, 0;
644# glEnd;
645 919
920 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
921}
646 922
647 $self->child->draw; 923sub coord2global {
648 glDisable GL_BLEND; 924 my ($self, $x, $y) = @_;
649 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;
650} 953}
651 954
652############################################################################# 955#############################################################################
653 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
654package CFClient::UI::FancyFrame; 1018package CFClient::UI::Frame;
655 1019
656our @ISA = CFClient::UI::Bin::; 1020our @ISA = CFClient::UI::Bin::;
657 1021
658use CFClient::OpenGL; 1022use CFClient::OpenGL;
659
660my @tex =
661 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
662 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
663 1023
664sub new { 1024sub new {
665 my $class = shift; 1025 my $class = shift;
666 1026
667 # 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};
668 1076
669 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
672 border => 0.8, 1080 border => 0.6,
673 can_events => 1, 1081 can_events => 1,
674 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
675 ); 1085 );
676 1086
677 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
678 align => 0, 1088 align => 0,
679 valign => 1, 1089 valign => 1,
680 text => $self->{title}, 1090 text => $title,
681 fontsize => 1; 1091 fontsize => $self->{border}
1092 if defined $title;
682 1093
683 $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};
684} 1102}
685 1103
686sub border { 1104sub border {
687 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
688} 1106}
689 1107
690sub size_request { 1108sub size_request {
691 my ($self) = @_; 1109 my ($self) = @_;
692 1110
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1111 $self->{title}->size_request
1112 if $self->{title};
694 1113
695 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
696 1115
697 ( 1116 (
698 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
701} 1120}
702 1121
703sub size_allocate { 1122sub size_allocate {
704 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
705 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
706 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
707 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
708 1135
709 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
710 if $self->{title};
711
712 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
713} 1137}
714 1138
715sub button_down { 1139sub button_down {
716 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
717 1141
1142 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 1143 my $border = $self->border;
719 1144
720 if ($x < $self->{w} && $x >= $self->{w} - $border 1145 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 1146 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 1147
1148 if ($lr & $td) {
1149 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1150 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 1151 my ($bw, $bh) = ($self->{w}, $self->{h});
725 1152
1153 my $mx = $x < $border;
1154 my $my = $y < $border;
1155
726 $self->{motion} = sub { 1156 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
728 1158
729 ($x, $y) = ($ev->{x}, $ev->{y}); 1159 my $dx = $ev->{x} - $ox;
1160 my $dy = $ev->{y} - $oy;
730 1161
731 $self->{user_w} = $bw + $x - $ox; 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
733 $self->check_size; 1164
1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1166 $self->realloc;
734 }; 1167 };
735 1168
736 } elsif ($x >= 0 && $x < $self->{w} 1169 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
741 1172
742 $self->{motion} = sub { 1173 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
744 1175
745 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
746 1177
747 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
748 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
749 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
750 } 1186 1
751} 1187}
752 1188
753sub button_up { 1189sub button_up {
754 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
755 1191
756 delete $self->{motion}; 1192 !!delete $self->{motion}
757} 1193}
758 1194
759sub mouse_motion { 1195sub mouse_motion {
760 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
761 1197
762 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
763} 1201}
764 1202
765sub _draw { 1203sub _draw {
766 my ($self) = @_; 1204 my ($self) = @_;
767 1205
1206 my $child = $self->{children}[0];
1207
768 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
769 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
770 1210
771 glEnable GL_BLEND;
772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
773 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
775 1213
776 my $border = $self->border; 1214 my $border = $self->border;
777 1215
778 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
779 $tex[1]->draw_quad (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
783 1221
784 my $bg = $tex[0]; 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1223 glColor @{ $self->{bg} };
785 1224
786 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 1226 # solve this better(?)
788 my $rep_y = $ch / $bg->{h}; 1227 $bg->{s} = $cw / $bg->{w};
789 1228 $bg->{t} = $ch / $bg->{h};
790 glColor @{ $self->{bg} };
791
792 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1230 }
796 1231
797 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND;
799 1233
800 $self->{title}->draw if $self->{title};
801 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
802} 1240}
803 1241
804############################################################################# 1242#############################################################################
805 1243
806package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
814sub new { 1252sub new {
815 my $class = shift; 1253 my $class = shift;
816 1254
817 $class->SUPER::new ( 1255 $class->SUPER::new (
818 col_expand => [], 1256 col_expand => [],
819 @_ 1257 @_,
820 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
821} 1263}
822 1264
823sub add { 1265sub add {
824 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
825 1267
826 $child->set_parent ($self); 1268 $child->set_parent ($self);
827 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
828 1270
829 $child->check_size; 1271 $self->realloc;
830} 1272}
831 1273
832# 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?
833sub clear { 1275sub clear {
834 my ($self) = @_; 1276 my ($self) = @_;
835 1277
1278 my @children = $self->children;
836 delete $self->{children}; 1279 delete $self->{children};
837 $self->update; 1280
1281 for (@children) {
1282 delete $_->{parent};
1283 $_->hide;
1284 }
1285
1286 $self->realloc;
838} 1287}
839 1288
840sub get_wh { 1289sub get_wh {
841 my ($self) = @_; 1290 my ($self) = @_;
842 1291
… …
873sub size_allocate { 1322sub size_allocate {
874 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
875 1324
876 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
877 1326
878 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
879 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
880 1329
881 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
882 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
883 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
884 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
938 } 1387 }
939} 1388}
940 1389
941############################################################################# 1390#############################################################################
942 1391
943package CFClient::UI::HBox; 1392package CFClient::UI::Box;
944
945# TODO: wrap into common Box base class
946 1393
947our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
948 1395
949sub size_request { 1396sub size_request {
950 my ($self) = @_; 1397 my ($self) = @_;
951 1398
952 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
953 1400 ? (
954 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
955 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
956 (List::Util::max map $_->[1], @alloc), 1403 )
957 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
958} 1408}
959 1409
960sub size_allocate { 1410sub size_allocate {
961 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
962 1412
963 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
964
965 my $children = $self->{children}; 1414 my $children = $self->{children};
966 1415
967 my @h = map $_->{req_w}, @$children; 1416 my @req;
968 1417
969 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
970 1419 @req = ($space / (@$children || 1)) x @$children;
971 if ($req_h > $h) {
972 # ah well, not enough space
973 $_ *= $h / $req_h for @h;
974 } 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 {
975 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
976 $exp ||= 1;
977 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
978 for (0 .. $#$children) { 1433 for 0 .. $#$children;
979 my $child = $children->[$_];
980
981 my $alloc_h = $h[$_];
982 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
983 $h[$_] = $alloc_h;
984 } 1434 }
985 } 1435 }
986 1436
987 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
988 1438
989 my $y = 0; 1439 my $pos = 0;
990 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
991 my $child = $children->[$_];
992 my $h = $h[$_]; 1441 my $alloc = $req[$_];
993 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
994 1443
995 $y += $h; 1444 $pos += $alloc;
996 } 1445 }
997 1446
998 1 1447 1
999} 1448}
1000 1449
1001############################################################################# 1450#############################################################################
1002 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
1003package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1004 1468
1005# TODO: wrap into common Box base class
1006
1007our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1008 1470
1009sub size_request { 1471sub new {
1010 my ($self) = @_; 1472 my $class = shift;
1011 1473
1012 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1013 1475 vertical => 1,
1014 ( 1476 @_,
1015 (List::Util::max map $_->[0], @alloc),
1016 (List::Util::sum map $_->[1], @alloc),
1017 ) 1477 )
1018} 1478}
1019 1479
1020sub size_allocate {
1021 my ($self, $w, $h) = @_;
1022
1023 my $children = $self->{children};
1024
1025 my @h = map $_->{req_h}, @$children;
1026
1027 my $req_h = List::Util::sum @h;
1028
1029 if ($req_h > $h) {
1030 # ah well, not enough space
1031 $_ *= $h / $req_h for @h;
1032 } else {
1033 my $exp = List::Util::sum map $_->{expand}, @$children;
1034 $exp ||= 1;
1035
1036 for (0 .. $#$children) {
1037 my $child = $children->[$_];
1038
1039 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1040 }
1041 }
1042
1043 CFClient::UI::harmonize \@h;
1044
1045 my $y = 0;
1046 for (0 .. $#$children) {
1047 my $child = $children->[$_];
1048 my $h = $h[$_];
1049 $child->configure (0, $y, $w, $h);
1050
1051 $y += $h;
1052 }
1053
1054 1
1055}
1056
1057############################################################################# 1480#############################################################################
1058 1481
1059package CFClient::UI::Label; 1482package CFClient::UI::Label;
1060 1483
1061our @ISA = CFClient::UI::Base::; 1484our @ISA = CFClient::UI::DrawBG::;
1062 1485
1063use CFClient::OpenGL; 1486use CFClient::OpenGL;
1064 1487
1065sub new { 1488sub new {
1066 my ($class, %arg) = @_; 1489 my ($class, %arg) = @_;
1067 1490
1068 my $self = $class->SUPER::new ( 1491 my $self = $class->SUPER::new (
1069 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),
1070 fontsize => 1, 1501 fontsize => 1,
1071 text => "",
1072 align => -1, 1502 align => -1,
1073 valign => -1, 1503 valign => -1,
1074 padding => 2, 1504 padding_x => 2,
1075 layout => new CFClient::Layout, 1505 padding_y => 2,
1076 can_events => 0, 1506 can_events => 0,
1077 %arg 1507 %arg
1078 ); 1508 );
1079 1509
1080 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout; 1511 my $layout = new CFClient::Layout;
1082 $layout->set_text (delete $self->{template}); 1512 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout; 1513 $self->{template} = $layout;
1084 } 1514 }
1085 1515
1086 $self->set_text (delete $self->{text}) if exists $self->{text}; 1516 if (exists $self->{markup}) {
1087 $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 }
1088 1521
1089 $self 1522 $self
1090} 1523}
1091 1524
1092sub escape_text { 1525sub escape($) {
1093 local $_ = $_[1]; 1526 local $_ = $_[0];
1094 1527
1095 s/&/&amp;/g; 1528 s/&/&amp;/g;
1096 s/>/&gt;/g; 1529 s/>/&gt;/g;
1097 s/</&lt;/g; 1530 s/</&lt;/g;
1098 1531
1099 $_[1] 1532 $_
1533}
1534
1535sub update {
1536 my ($self) = @_;
1537
1538 delete $self->{texture};
1539 $self->SUPER::update;
1100} 1540}
1101 1541
1102sub set_text { 1542sub set_text {
1103 my ($self, $text) = @_; 1543 my ($self, $text) = @_;
1104 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;
1105 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1106 1550
1107 delete $self->{texture}; 1551 $self->realloc;
1108 $self->check_size;
1109 $self->update; 1552 $self->update;
1110} 1553}
1111 1554
1112sub set_markup { 1555sub set_markup {
1113 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1114 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;
1115 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1116 1565
1117 delete $self->{texture}; 1566 $self->realloc;
1118 $self->check_size;
1119 $self->update; 1567 $self->update;
1120} 1568}
1121 1569
1122sub size_request { 1570sub size_request {
1123 my ($self) = @_; 1571 my ($self) = @_;
1124 1572
1125 $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});
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1578
1128 my ($w, $h) = $self->{layout}->size; 1579 my ($w, $h) = $self->{layout}->size;
1129 1580
1130 if (exists $self->{template}) { 1581 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1584
1133 my ($w2, $h2) = $self->{template}->size; 1585 my ($w2, $h2) = $self->{template}->size;
1134 1586
1135 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1136 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1137 } 1589 }
1138 1590
1139 ( 1591 ($w, $h)
1140 $w + $self->{padding} * 2,
1141 $h + $self->{padding} * 2,
1142 )
1143} 1592}
1144 1593
1145sub size_allocate { 1594sub size_allocate {
1146 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1147 1596
1597 delete $self->{ox};
1598
1148 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1149} 1601}
1150 1602
1151sub set_fontsize { 1603sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1153 1605
1154 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1155 $self->check_size; 1607 delete $self->{texture};
1608
1609 $self->realloc;
1156} 1610}
1157 1611
1158sub _draw { 1612sub _draw {
1159 my ($self) = @_; 1613 my ($self) = @_;
1160 1614
1615 $self->SUPER::_draw; # draw background, if applicable
1616
1161 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};
1162 $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});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624
1164 new_from_layout CFClient::Texture $self->{layout} 1625 new_from_layout CFClient::Texture $self->{layout}
1165 }; 1626 };
1166 1627
1167 glEnable GL_BLEND; 1628 unless (exists $self->{ox}) {
1168 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
1169 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1171 1640
1641 if ($tex->{format} == GL_ALPHA) {
1172 glColor @{$self->{fg}}; 1642 glColor @{$self->{fg}};
1173
1174 $self->{ox} = int (
1175 $self->{align} < 0 ? $self->{padding}
1176 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1177 : ($self->{w} - $tex->{w}) * 0.5
1178 );
1179
1180 $self->{oy} = int (
1181 $self->{valign} < 0 ? $self->{padding}
1182 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1183 : ($self->{h} - $tex->{h}) * 0.5
1184 );
1185
1186 $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 }
1187 1647
1188 glDisable GL_TEXTURE_2D; 1648 glDisable GL_TEXTURE_2D;
1189 glDisable GL_BLEND;
1190} 1649}
1191 1650
1192############################################################################# 1651#############################################################################
1193 1652
1194package CFClient::UI::EntryBase; 1653package CFClient::UI::EntryBase;
… …
1199 1658
1200sub new { 1659sub new {
1201 my $class = shift; 1660 my $class = shift;
1202 1661
1203 $class->SUPER::new ( 1662 $class->SUPER::new (
1204 fg => [1, 1, 1], 1663 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1664 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1665 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1208 can_hover => 1, 1667 can_hover => 1,
1209 can_focus => 1, 1668 can_focus => 1,
1210 valign => 0, 1669 valign => 0,
1211 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1212 @_ 1672 @_
1213 ) 1673 )
1214} 1674}
1215 1675
1216sub _set_text { 1676sub _set_text {
… …
1218 1678
1219 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1220 1680
1221 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1222 1682
1223 delete $self->{texture};
1224
1225 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1226 $self->{text} = $text; 1684 $self->{text} = $text;
1227 1685
1228 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1229 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1230 1688
1231 $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;
1232} 1700}
1233 1701
1234sub get_text { 1702sub get_text {
1235 $_[0]{text} 1703 $_[0]{text}
1236} 1704}
… …
1239 my ($self) = @_; 1707 my ($self) = @_;
1240 1708
1241 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1242 1710
1243 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1244}
1245
1246sub size_allocate {
1247 my ($self, $w, $h) = @_;
1248
1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1250}
1251
1252sub set_text {
1253 my ($self, $text) = @_;
1254
1255 $self->{cursor} = length $text;
1256 $self->_set_text ($text);
1257 $self->update;
1258} 1712}
1259 1713
1260sub key_down { 1714sub key_down {
1261 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1262 1716
… …
1264 my $sym = $ev->{sym}; 1718 my $sym = $ev->{sym};
1265 my $uni = $ev->{unicode}; 1719 my $uni = $ev->{unicode};
1266 1720
1267 my $text = $self->get_text; 1721 my $text = $self->get_text;
1268 1722
1269 if ($sym == 8) { 1723 if ($uni == 8) {
1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1724 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1271 } elsif ($sym == 127) { 1725 } elsif ($uni == 127) {
1272 substr $text, $self->{cursor}, 1, ""; 1726 substr $text, $self->{cursor}, 1, "";
1273 } elsif ($sym == CFClient::SDLK_LEFT) { 1727 } elsif ($sym == CFClient::SDLK_LEFT) {
1274 --$self->{cursor} if $self->{cursor}; 1728 --$self->{cursor} if $self->{cursor};
1275 } elsif ($sym == CFClient::SDLK_RIGHT) { 1729 } elsif ($sym == CFClient::SDLK_RIGHT) {
1276 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1730 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1277 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1278 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1279 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1280 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1281 } elsif ($sym == 27) { 1735 } elsif ($uni == 27) {
1282 $self->emit ('escape'); 1736 $self->_emit ('escape');
1283 } elsif ($uni) { 1737 } elsif ($uni) {
1284 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1285 } 1741 }
1286 1742
1287 $self->_set_text ($text); 1743 $self->_set_text ($text);
1288 $self->update; 1744
1745 $self->realloc;
1746
1747 1
1289} 1748}
1290 1749
1291sub focus_in { 1750sub focus_in {
1292 my ($self) = @_; 1751 my ($self) = @_;
1293 1752
… …
1308 utf8::encode $text; 1767 utf8::encode $text;
1309 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1310 1769
1311 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1312 $self->update; 1771 $self->update;
1772
1773 1
1313} 1774}
1314 1775
1315sub mouse_motion { 1776sub mouse_motion {
1316 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1317# 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
1318} 1781}
1319 1782
1320sub _draw { 1783sub _draw {
1321 my ($self) = @_; 1784 my ($self) = @_;
1322 1785
… …
1369 my ($self, $ev) = @_; 1832 my ($self, $ev) = @_;
1370 1833
1371 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1372 1835
1373 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} = '';
1374 $self->emit (activate => $self->get_text); 1841 $self->_emit (activate => $txt);
1375 $self->update; 1842 $self->update;
1376 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
1377 } else { 1866 } else {
1378 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1379 } 1870 1
1380
1381} 1871}
1382 1872
1383############################################################################# 1873#############################################################################
1384 1874
1385package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1394 1884
1395sub new { 1885sub new {
1396 my $class = shift; 1886 my $class = shift;
1397 1887
1398 $class->SUPER::new ( 1888 $class->SUPER::new (
1399 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1400 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1403 can_hover => 1, 1893 can_hover => 1,
1404 align => 0, 1894 align => 0,
1405 valign => 0, 1895 valign => 0,
1406 can_events => 1, 1896 can_events => 1,
1407 @_ 1897 @_
1408 ) 1898 )
1409} 1899}
1410 1900
1901sub activate { }
1902
1411sub button_up { 1903sub button_up {
1412 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1413 1905
1906 $self->emit ("activate")
1414 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1415 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1416 $self->emit ("activate"); 1909
1417 } 1910 1
1418} 1911}
1419 1912
1420sub _draw { 1913sub _draw {
1421 my ($self) = @_; 1914 my ($self) = @_;
1422 1915
… …
1424 1917
1425 if ($GRAB == $self) { 1918 if ($GRAB == $self) {
1426 $self->{fg} = $self->{active_fg}; 1919 $self->{fg} = $self->{active_fg};
1427 } 1920 }
1428 1921
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glEnable GL_TEXTURE_2D; 1922 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1433 glColor 0, 0, 0, 1; 1924 glColor 0, 0, 0, 1;
1434 1925
1435 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1436 1927
1437 glDisable GL_TEXTURE_2D; 1928 glDisable GL_TEXTURE_2D;
1438 glDisable GL_BLEND;
1439 1929
1440 $self->SUPER::_draw; 1930 $self->SUPER::_draw;
1441} 1931}
1442 1932
1443############################################################################# 1933#############################################################################
… …
1454 1944
1455sub new { 1945sub new {
1456 my $class = shift; 1946 my $class = shift;
1457 1947
1458 $class->SUPER::new ( 1948 $class->SUPER::new (
1459 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1460 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1461 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],
1462 state => 0, 1955 state => 0,
1463 can_hover => 1, 1956 can_hover => 1,
1464 @_ 1957 @_
1465 ) 1958 )
1466} 1959}
1467 1960
1468sub size_request { 1961sub size_request {
1469 my ($self) = @_; 1962 my ($self) = @_;
1470 1963
1471 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1472} 1965}
1473 1966
1474sub button_down { 1967sub button_down {
1475 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1476 1969
1477 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1478 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1479 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1480 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1481 } 1978 1
1482} 1979}
1483 1980
1484sub _draw { 1981sub _draw {
1485 my ($self) = @_; 1982 my ($self) = @_;
1486 1983
1487 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1488 1985
1489 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1490 1987
1491 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;
1492 1991
1493 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1494 1993
1495 glEnable GL_BLEND; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1995
1496 glEnable GL_TEXTURE_2D; 1996 glEnable GL_TEXTURE_2D;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1498
1499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1500
1501 $tex->draw_quad (0, 0, $s, $s); 1997 $tex->draw_quad_alpha (0, 0, $s, $s);
1502
1503 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1504 glDisable GL_BLEND;
1505} 1999}
1506 2000
1507############################################################################# 2001#############################################################################
1508 2002
1509package CFClient::UI::Image; 2003package CFClient::UI::Image;
… …
1552 glTranslate 0, -$self->{w}, 0; 2046 glTranslate 0, -$self->{w}, 0;
1553 2047
1554 ($w, $h) = ($h, $w); 2048 ($w, $h) = ($h, $w);
1555 } 2049 }
1556 2050
1557 glEnable GL_BLEND;
1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1559 glEnable GL_TEXTURE_2D; 2051 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2052 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 2053
1562 $tex->draw_quad (0, 0, $w, $h); 2054 $tex->draw_quad_alpha (0, 0, $w, $h);
1563 2055
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D; 2056 glDisable GL_TEXTURE_2D;
1566} 2057}
1567 2058
1568############################################################################# 2059#############################################################################
1569 2060
1570package CFClient::UI::VGauge; 2061package CFClient::UI::VGauge;
1571 2062
1572our @ISA = CFClient::UI::Base::; 2063our @ISA = CFClient::UI::Base::;
2064
2065use List::Util qw(min max);
1573 2066
1574use CFClient::OpenGL; 2067use CFClient::OpenGL;
1575 2068
1576my %tex = ( 2069my %tex = (
1577 food => [ 2070 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2072 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 2073 ],
1581 grace => [ 2074 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 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/
1584 ], 2077 ],
1585 hp => [ 2078 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2079 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2080 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 2081 ],
1589 mana => [ 2082 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 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/
1592 ], 2085 ],
1593); 2086);
1594 2087
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 2088# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 2089sub new {
… …
1615} 2108}
1616 2109
1617sub set_max { 2110sub set_max {
1618 my ($self, $max) = @_; 2111 my ($self, $max) = @_;
1619 2112
2113 return if $self->{max_val} == $max;
2114
1620 $self->{max_val} = $max; 2115 $self->{max_val} = $max;
2116 $self->update;
1621} 2117}
1622 2118
1623sub set_value { 2119sub set_value {
1624 my ($self, $val, $max) = @_; 2120 my ($self, $val, $max) = @_;
1625 2121
1626 $self->set_max ($max) 2122 $self->set_max ($max)
1627 if defined $max; 2123 if defined $max;
1628 2124
1629 $max = $self->{max_val}; 2125 return if $self->{val} == $val;
2126
1630 $self->{val} = $val; 2127 $self->{val} = $val;
1631
1632 $self->update; 2128 $self->update;
1633} 2129}
1634 2130
1635sub _draw { 2131sub _draw {
1636 my ($self) = @_; 2132 my ($self) = @_;
1637 2133
1638 my $tex = $tex{$self->{type}}; 2134 my $tex = $tex{$self->{type}};
2135 my ($t1, $t2, $t3) = @$tex;
1639 2136
1640 my ($w, $h) = ($self->{w}, $self->{h}); 2137 my ($w, $h) = ($self->{w}, $self->{h});
1641 2138
1642 if ($self->{vertical}) { 2139 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 2140 glRotate 90, 0, 0, 1;
… …
1645 2142
1646 ($w, $h) = ($h, $w); 2143 ($w, $h) = ($h, $w);
1647 } 2144 }
1648 2145
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 2146 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 2147
1652 my $t1 = $tex->[0]; 2148 my $ycut1 = max 0, min 1, $ycut;
1653 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);
1654 2153
1655 glEnable GL_BLEND; 2154 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 2156 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 2158
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2159 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 2160 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 2161 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2162 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2163 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2164 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 2165 glEnd;
1670 2166
2167 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2168 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 2169 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2170 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2171 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2172 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2173 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 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 }
1678 2185
1679 glDisable GL_BLEND; 2186 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 2187 glDisable GL_TEXTURE_2D;
1681} 2188}
1682 2189
… …
1685package CFClient::UI::Gauge; 2192package CFClient::UI::Gauge;
1686 2193
1687our @ISA = CFClient::UI::VBox::; 2194our @ISA = CFClient::UI::VBox::;
1688 2195
1689sub new { 2196sub new {
1690 my ($class, %arg) = shift; 2197 my ($class, %arg) = @_;
1691 2198
1692 my $self = $class->SUPER::new ( 2199 my $self = $class->SUPER::new (
1693 @_, 2200 tooltip => $arg{type},
2201 can_hover => 1,
2202 can_events => 1,
2203 %arg,
1694 ); 2204 );
1695 2205
1696 $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");
2207 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $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");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 2209
1702 $self 2210 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 2211}
1709 2212
1710sub set_fontsize { 2213sub set_fontsize {
1711 my ($self, $fsize) = @_; 2214 my ($self, $fsize) = @_;
1712 2215
1713 $self->{value}->set_fontsize ($fsize); 2216 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 2217 $self->{max} ->set_fontsize ($fsize);
1715} 2218}
1716 2219
2220sub set_max {
2221 my ($self, $max) = @_;
2222
2223 $self->{gauge}->set_max ($max);
2224 $self->{max}->set_text ($max);
2225}
2226
1717sub set_value { 2227sub set_value {
1718 my ($self, $val, $max) = @_; 2228 my ($self, $val, $max) = @_;
1719 2229
1720 $self->set_max ($max) 2230 $self->set_max ($max)
1721 if defined $max; 2231 if defined $max;
1722 2232
1723 $self->{gauge}->set_value ($val, $max); 2233 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 2234 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 2235}
1733 2236
1734############################################################################# 2237#############################################################################
1735 2238
1736package CFClient::UI::Slider; 2239package CFClient::UI::Slider;
… …
1746 qw(s1_slider.png s1_slider_bg.png); 2249 qw(s1_slider.png s1_slider_bg.png);
1747 2250
1748sub new { 2251sub new {
1749 my $class = shift; 2252 my $class = shift;
1750 2253
1751 # range [value, low, high, page] 2254 # range [value, low, high, page, unit]
1752 2255
1753 # TODO: 0-width page 2256 # TODO: 0-width page
1754 # TODO: req_w/h are wrong with vertical 2257 # TODO: req_w/h are wrong with vertical
1755 # TODO: calculations are off 2258 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
1758 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],
1759 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
1760 req_w => 20, 2265 min_w => $::WIDTH / 80,
1761 req_h => 20, 2266 min_h => $::WIDTH / 80,
1762 vertical => 0, 2267 vertical => 0,
1763 can_hover => 1, 2268 can_hover => 1,
1764 inner_pad => 5, 2269 inner_pad => 0.02,
1765 @_ 2270 @_
1766 ); 2271 );
1767 2272
2273 $self->set_value ($self->{range}[0]);
2274 $self->update;
2275
1768 $self 2276 $self
1769} 2277}
1770 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
1771sub size_request { 2313sub size_request {
1772 my ($self) = @_; 2314 my ($self) = @_;
1773 2315
1774 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
1775 my $h = $self->{req_h};
1776
1777 $self->{vertical} ? ($h, $w) : ($w, $h)
1778} 2317}
1779 2318
1780sub button_down { 2319sub button_down {
1781 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
1782 2321
1783 $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
1784 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
1785} 2327}
1786 2328
1787sub mouse_motion { 2329sub mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
1789 2331
1790 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
1791 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
1792 2362
1793 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1794 2364
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2365 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1797 2367
1798 $x -= $inner_pad_px; # substract the padding 2368 $value = ($value - $lo) / $range;
1799 $x = $x * ($hi - $lo) / $inner_w + $lo; 2369 $value = $value * $self->{scale} + $self->{offset};
1800 $x = $lo if $x < $lo;
1801 $x = $hi - $page if $x > $hi - $page;
1802 $self->{range}[0] = $x;
1803 2370
1804 $self->emit (changed => $x); 2371 $self->{knob_x} = $value - $knob_w * 0.5;
1805 $self->update; 2372 $self->{knob_w} = $knob_w;
1806 } 2373 }
1807}
1808
1809# the inner_* stuff is for generating a padding for the slider handle,
1810# so that the handle doesn't leave the texture. This calculation isn't 100%
1811# correct propably, but it does the job for now
1812sub _calc_inner_pad_px {
1813 my ($self, $w) = @_;
1814 ($w / 100) * $self->{inner_pad} # % to pixels
1815}
1816
1817sub _draw {
1818 my ($self) = @_;
1819 2374
1820 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
1821 2376
1822 my ($w, $h) = @$self{qw(w h)}; 2377 glScale $self->{w}, $self->{h};
1823 2378
1824 if ($self->{vertical}) { 2379 if ($self->{vertical}) {
1825 # draw a vertical slider like a rotated horizontal slider 2380 # draw a vertical slider like a rotated horizontal slider
1826 2381
2382 glTranslate 1, 0, 0;
1827 glRotate 90, 0, 0, 1; 2383 glRotate 90, 0, 0, 1;
1828 glTranslate 0, -$self->{w}, 0;
1829
1830 ($w, $h) = ($h, $w);
1831 } 2384 }
1832 2385
1833 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2386 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1834 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2387 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1835 2388
1836 my ($value, $lo, $hi, $page) = @{$self->{range}};
1837
1838 $hi = $value + 1 if $lo == $hi;
1839
1840 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1841 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1842
1843 $page = int $page * $inner_w / ($hi - $lo);
1844 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1845
1846 $w -= $page;
1847 $page &= ~1;
1848 glTranslate $page * 0.5, 0, 0;
1849 $page ||= 2;
1850
1851 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1852 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1853
1854 glEnable GL_BLEND;
1855 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1856 glEnable GL_TEXTURE_2D; 2389 glEnable GL_TEXTURE_2D;
1857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1858 2391
1859 # draw background 2392 # draw background
1860 $tex[1]->draw_quad (0, 0, $w, $h); 2393 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1861 2394
1862 # draw handle 2395 # draw handle
1863 $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);
1864 2397
1865 glDisable GL_BLEND;
1866 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
1867} 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 (@_) }
1868 2441
1869############################################################################# 2442#############################################################################
1870 2443
1871package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
1872 2445
… …
1876 2449
1877sub new { 2450sub new {
1878 my $class = shift; 2451 my $class = shift;
1879 2452
1880 my $self = $class->SUPER::new ( 2453 my $self = $class->SUPER::new (
1881 fontsize => 1, 2454 fontsize => 1,
2455 can_events => 0,
2456 #font => default_font
1882 @_, 2457 @_,
1883 2458
1884 layout => (new CFClient::Layout), 2459 layout => (new CFClient::Layout 1),
1885 par => [], 2460 par => [],
1886 height => 0, 2461 height => 0,
1887 children => [ 2462 children => [
1888 (new CFClient::UI::Empty expand => 1), 2463 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2464 (new CFClient::UI::Slider vertical => 1),
1890 ], 2465 ],
1891 ); 2466 );
1892 2467
1893 $self->{children}[1]->connect (changed => sub { 2468 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2469
1897 $self 2470 $self
1898} 2471}
1899 2472
1900sub set_fontsize { 2473sub set_fontsize {
… …
1902 2475
1903 $self->{fontsize} = $fontsize; 2476 $self->{fontsize} = $fontsize;
1904 $self->reflow; 2477 $self->reflow;
1905} 2478}
1906 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
1907sub text_height { 2492sub text_size {
1908 my ($self, $text) = @_; 2493 my ($self, $text, $indent) = @_;
1909 2494
1910 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
1911 2496
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2498 $layout->set_width ($self->{children}[0]{w} - $indent);
1914 $layout->set_text ($text); 2499 $layout->set_markup ($text);
1915 2500
1916 ($layout->size)[1] 2501 $layout->size
1917} 2502}
1918 2503
1919sub reflow { 2504sub reflow {
1920 my ($self) = @_; 2505 my ($self) = @_;
1921 2506
1922 $self->{need_reflow}++; 2507 $self->{need_reflow}++;
1923 $self->update; 2508 $self->update;
1924} 2509}
1925 2510
1926sub 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 {
1927 my ($self, $w, $h) = @_; 2519 my ($self) = @_;
1928 2520
1929 $self->SUPER::size_allocate ($w, $h); 2521 $self->{par} = [];
1930 2522 $self->{height} = 0;
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1932 $self->{layout}->set_width ($self->{children}[0]{w});
1933
1934 $self->reflow;
1935} 2524}
1936 2525
1937sub add_paragraph { 2526sub add_paragraph {
1938 my ($self, $color, $text) = @_; 2527 my ($self, $color, $text, $indent) = @_;
1939 2528
1940 #TODO: intelligently "reformat" paragraph 2529 for my $line (split /\n/, $text) {
1941 2530 my ($w, $h) = $self->text_size ($line);
1942 my $height = $self->text_height ($text);
1943
1944 $self->{height} += $height; 2531 $self->{height} += $h;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2533 }
1945 2534
1946 push @{$self->{par}}, [$height, $color, $text];
1947
1948 $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]);
1949 $self->{children}[1]->update;
1950} 2536}
1951 2537
1952sub update { 2538sub update {
1953 my ($self) = @_; 2539 my ($self) = @_;
1954 2540
… …
1956 2542
1957 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
1958 2544
1959 delete $self->{texture}; 2545 delete $self->{texture};
1960 2546
1961 $ROOT->on_refresh ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
1962 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
1963 my $height = 0; 2551 my $height = 0;
1964 2552
1965 $height += $_->[0] = $self->text_height ($_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
1966 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 }
1967 2568
1968 $self->{height} = $height; 2569 $self->{height} = $height;
1969 2570
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1971 2572
1972 delete $self->{texture}; 2573 delete $self->{texture};
1973 } 2574 }
1974 2575
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1976 glClearColor 0, 0, 0, 1; 2577 glClearColor 0.5, 0.5, 0.5, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
1978 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
1979 glEnable GL_BLEND; 2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983
1984 my $top = int $self->{children}[1]{range}[0];
1985
1986 my $y0 = $top;
1987 my $y1 = $top + $self->{h};
1988
1989 my $y = 0;
1990
1991 my $layout = $self->{layout};
1992 2594
1993 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2596 my $h = $par->[1];
1995 2597
1996 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]);
1997 $layout->set_text ($par->[2]); 2601 $layout->set_markup ($par->[4]);
1998 2602
1999 glColor @{ $par->[1] }; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2000 my ($W, $H) = $layout->size; 2604
2001 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;
2002 } 2607 }
2003 2608
2004 $y += $h; 2609 $y += $h;
2005 } 2610 }
2006 2611
2007 glDisable GL_TEXTURE_2D;
2008 glDisable GL_BLEND; 2612 glDisable GL_BLEND;
2009 }; 2613 };
2010 }); 2614 });
2011} 2615}
2012 2616
2013sub _draw { 2617sub _draw {
2014 my ($self) = @_; 2618 my ($self) = @_;
2015 2619
2016 if ($self->{texture}) {
2017 glEnable GL_TEXTURE_2D; 2620 glEnable GL_TEXTURE_2D;
2018 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;
2019 $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});
2020 glDisable GL_TEXTURE_2D; 2624 glDisable GL_TEXTURE_2D;
2021 }
2022 2625
2023 $self->{children}[1]->draw; 2626 $self->{children}[1]->draw;
2024 2627
2025} 2628}
2026 2629
… …
2074 2677
2075sub new { 2678sub new {
2076 my $class = shift; 2679 my $class = shift;
2077 2680
2078 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2079 state => 0, 2682 state => 0,
2080 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2684 @_
2083 ); 2685 );
2084 2686
2085 if ($self->{state}) {
2086 $self->{state} = 0;
2087 $self->toggle_flopper;
2088 }
2089
2090 $self 2687 $self
2091} 2688}
2092 2689
2093sub toggle_flopper { 2690sub toggle_flopper {
2094 my ($self) = @_; 2691 my ($self) = @_;
2095 2692
2096 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2097 if ($self->{state} = !$self->{state}) { 2694}
2098 $CFClient::UI::ROOT->add ($self->{other}); 2695
2099 $self->{other}->move ($self->coord2global (0, $self->{h})); 2696#############################################################################
2697
2698package CFClient::UI::Tooltip;
2699
2700our @ISA = CFClient::UI::Bin::;
2701
2702use CFClient::OpenGL;
2703
2704sub new {
2705 my $class = shift;
2706
2707 $class->SUPER::new (
2708 @_,
2709 can_events => 0,
2710 )
2711}
2712
2713sub set_tooltip_from {
2714 my ($self, $widget) = @_;
2715
2716 my $tooltip = $widget->{tooltip};
2717
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 );
2733}
2734
2735sub size_request {
2736 my ($self) = @_;
2737
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739
2740 ($w + 4, $h + 4)
2741}
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
2767sub _draw {
2768 my ($self) = @_;
2769
2770 glTranslate 0.375, 0.375;
2771
2772 my ($w, $h) = @$self{qw(w h)};
2773
2774 glColor 1, 0.8, 0.4;
2775 glBegin GL_QUADS;
2776 glVertex 0 , 0;
2777 glVertex 0 , $h;
2778 glVertex $w, $h;
2779 glVertex $w, 0;
2780 glEnd;
2781
2782 glColor 0, 0, 0;
2783 glBegin GL_LINE_LOOP;
2784 glVertex 0 , 0;
2785 glVertex 0 , $h;
2786 glVertex $w, $h;
2787 glVertex $w, 0;
2788 glEnd;
2789
2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2792 $self->SUPER::_draw;
2793}
2794
2795#############################################################################
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
2100 $self->emit ("open"); 2952 $self->_emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover};
2101 } else { 2954 } else {
2102 $CFClient::UI::ROOT->remove ($self->{other}); 2955 return 0
2103 $self->emit ("close"); 2956 }
2957
2104 } 2958 1
2105
2106 $self->emit (changed => $self->{state});
2107} 2959}
2108 2960
2109############################################################################# 2961#############################################################################
2110 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
2111package CFClient::UI::Root; 3476package CFClient::UI::Root;
2112 3477
2113our @ISA = CFClient::UI::Container::; 3478our @ISA = CFClient::UI::Container::;
2114 3479
2115use CFClient::OpenGL; 3480use CFClient::OpenGL;
2116 3481
2117sub check_size { 3482sub new {
2118 my ($self) = @_; 3483 my $class = shift;
2119 3484
2120 $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
2121} 3493}
2122 3494
2123sub size_request { 3495sub size_request {
2124 ($::WIDTH, $::HEIGHT) 3496 my ($self) = @_;
2125}
2126 3497
2127sub 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 {
2128 my ($self, $x, $y, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2129 3517
2130 $self->SUPER::configure ($x, $y, $w, $h);
2131
2132 for my $child (@{$self->{children}}) { 3518 for my $child ($self->children) {
2133 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)};
2134 3520
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3521 $X = $child->{force_x} if exists $child->{force_x};
2136 $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
2137 $child->configure ($X, $Y, $W,$H); 3527 $child->configure ($X, $Y, $W, $H);
2138 } 3528 }
2139} 3529}
2140 3530
2141sub _topleft { 3531sub coord2local {
2142 my ($self, $x, $y) = @_; 3532 my ($self, $x, $y) = @_;
2143 3533
2144 ($x, $y) 3534 ($x, $y)
2145} 3535}
2146 3536
3537sub coord2global {
3538 my ($self, $x, $y) = @_;
3539
3540 ($x, $y)
3541}
3542
2147sub update { 3543sub update {
2148 my ($self) = @_; 3544 my ($self) = @_;
2149 3545
2150 $self->check_size; 3546 $::WANT_REFRESH++;
2151 ::refresh ();
2152} 3547}
2153 3548
2154sub add { 3549sub add {
2155 my ($self, $child) = @_; 3550 my ($self, @children) = @_;
2156 3551
2157 # integerize window positions 3552 $_->{is_toplevel} = 1
2158 $child->{x} = int $child->{x}; 3553 for @children;
2159 $child->{y} = int $child->{y};
2160 3554
2161 $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 }
2162} 3571}
2163 3572
2164sub on_refresh { 3573sub on_refresh {
2165 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
2166 3575
2167 $self->{refresh_hook}{$id} = $cb; 3576 $self->{refresh_hook}{$id} = $cb;
2168} 3577}
2169 3578
3579sub on_post_alloc {
3580 my ($self, $id, $cb) = @_;
3581
3582 $self->{post_alloc_hook}{$id} = $cb;
3583}
3584
2170sub draw { 3585sub draw {
2171 my ($self) = @_; 3586 my ($self) = @_;
2172 3587
2173 while (my $rcb = delete $self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
2174 $_->() for values %$rcb; 3589 $_->()
3590 for values %{delete $self->{refresh_hook}};
2175 } 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
2176 3681
2177 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2178 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2179 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
2180 3685
2181 glMatrixMode GL_PROJECTION; 3686 glMatrixMode GL_PROJECTION;
2182 glLoadIdentity; 3687 glLoadIdentity;
2183 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2184 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
2185 glLoadIdentity; 3690 glLoadIdentity;
2186 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
2187 $self->_draw; 3699 $self->_draw;
2188} 3700}
2189 3701
2190############################################################################# 3702#############################################################################
2191 3703
2192package CFClient::UI; 3704package CFClient::UI;
2193 3705
2194$ROOT = new CFClient::UI::Root; 3706$ROOT = new CFClient::UI::Root;
3707$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2195 3708
21961 37091
2197 3710

Diff Legend

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