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

Diff Legend

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