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

Diff Legend

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