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

Diff Legend

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