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

Diff Legend

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