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

Diff Legend

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