ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 2006 UTC

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

Diff Legend

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