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.301 by elmex, Mon Jun 12 12:28:06 2006 UTC

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

Diff Legend

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