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.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 2006 UTC

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

Diff Legend

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