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

Diff Legend

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