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

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

Diff Legend

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