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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 37 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 38 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 } 39 }
41 40
42 return; 41 return;
43 } 42 }
44 } 43 }
45 } 44 }
46 45
47 $TOOLTIP->hide; 46 $TOOLTIP->hide;
48 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;
49} 71}
50 72
51# class methods for events 73# class methods for events
52sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 76 if $FOCUS;
55} 77}
56 78
57sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 81 if $FOCUS;
60} 82}
61 83
62sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
63 my ($ev) = @_; 85 my ($ev) = @_;
… …
67 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
68 90
69 $GRAB = $widget; 91 $GRAB = $widget;
70 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
71 93
72 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
73 } 95 }
74 96
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 98
77 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 101}
82 102
83sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
84 my ($ev) = @_; 104 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
86 106
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 108
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 110
91 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 113
96 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 116 $grab->update if $grab;
99 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
100 118
101 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
102 } 120 }
103} 121}
104 122
105sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
106 my ($ev) = @_; 124 my ($ev) = @_;
… …
112 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
113 131
114 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 134
117 check_tooltip; 135 $TOOLTIP_WATCHER->start;
118 } 136 }
119 137
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 139 if $HOVER;
124} 140}
125 141
126# convert position array to integers 142# convert position array to integers
127sub harmonize { 143sub harmonize {
128 my ($vals) = @_; 144 my ($vals) = @_;
… …
134 $rem += $_ - $i; 150 $rem += $_ - $i;
135 $_ = $i; 151 $_ = $i;
136 } 152 }
137} 153}
138 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
139############################################################################# 196#############################################################################
140 197
141package CFClient::UI::Base; 198package CFClient::UI::Base;
142 199
143use strict; 200use strict;
… …
146 203
147sub new { 204sub new {
148 my $class = shift; 205 my $class = shift;
149 206
150 my $self = bless { 207 my $self = bless {
151 x => 0, 208 x => "center",
152 y => 0, 209 y => "center",
153 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
154 can_events => 1, 213 can_events => 1,
155 @_ 214 @_
156 }, $class; 215 }, $class;
157 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
158 for (keys %$self) { 219 for (keys %$self) {
159 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
161 } 222 }
162 } 223 }
163 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
164 $self 237 $self
165} 238}
166 239
167sub destroy { 240sub destroy {
168 my ($self) = @_; 241 my ($self) = @_;
… …
177 return if $self->{parent}; 250 return if $self->{parent};
178 251
179 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
180} 253}
181 254
182sub hide { 255sub set_visible {
183 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};
184 279
185 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
187 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
188 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
189 if $self->{parent}; 313 if $self->{parent};
190} 314}
191 315
192sub move { 316sub move_abs {
193 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
194 318
195 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
196 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
197 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
198 322
199 $self->update; 323 $self->update;
200} 324}
201 325
202sub set_size { 326sub set_size {
203 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
204 328
205 $self->{user_w} = $w; 329 $self->{force_w} = $w;
206 $self->{user_h} = $h; 330 $self->{force_h} = $h;
207 331
208 $self->check_size; 332 $self->realloc;
209} 333}
210 334
211sub size_request { 335sub size_request {
212 require Carp; 336 require Carp;
213 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
215 339
216sub configure { 340sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
218 342
219 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
222 348
223 # use alignment to adjust x, y 349 # use alignment to adjust x, y
224 350
225 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 353 }
230 354
231 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 356 $self->{x} = $x;
233 $self->{y} = $y; 357 $self->{y} = $y;
234 $self->update; 358 $self->update;
235 } 359 }
236 360
237 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
239 }
240}
241 363
242sub size_allocate { 364 $self->{alloc_w} = $w;
243 # nothing to be done 365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
368 }
244} 369}
245 370
246sub children { 371sub children {
372 # nop
247} 373}
248 374
249# call when resolution changes etc. 375sub visible_children {
250sub reconfigure { 376 $_[0]->children
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 377}
260 378
261sub set_max_size { 379sub set_max_size {
262 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
263 381
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
386}
387
388sub set_tooltip {
389 my ($self, $tooltip) = @_;
390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
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 }
266} 402}
267 403
268# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
269sub coord2local { 405sub coord2local {
270 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
278 414
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 416}
281 417
282sub focus_in { 418sub invoke_focus_in {
283 my ($self) = @_; 419 my ($self) = @_;
284 420
285 return if $FOCUS == $self; 421 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
287 423
288 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
289 425
290 $self->emit (focus_in => $focus);
291
292 $focus->update if $focus; 426 $focus->update if $focus;
293 $FOCUS->update; 427 $FOCUS->update;
294}
295 428
429 0
430}
431
296sub focus_out { 432sub invoke_focus_out {
297 my ($self) = @_; 433 my ($self) = @_;
298 434
299 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
300 436
301 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
302 438
303 $self->emit (focus_out => $focus);
304
305 $focus->update if $focus; #? 439 $focus->update if $focus; #?
306}
307 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
308sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
309sub button_up { } 454sub invoke_button_up { 1 }
310sub key_down { } 455sub invoke_key_down { 1 }
311sub key_up { } 456sub invoke_key_up { 1 }
312 457
313sub button_down { 458sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
315 460
316 $self->focus_in; 461 $self->grab_focus;
317}
318 462
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
323sub 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
324 530
325sub draw { 531sub draw {
326 my ($self) = @_; 532 my ($self) = @_;
327 533
328 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);
329 545
330 glPushMatrix; 546 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 548
335 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 551 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 553 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 554 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 555 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 556 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 557 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 572 glPopMatrix;
361 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;
362 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
363} 578}
364 579
365sub _draw { 580sub _draw {
366 my ($self) = @_; 581 my ($self) = @_;
367 582
368 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
369} 584}
370 585
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
390}
391
392sub check_size {
393 my ($self) = @_;
394
395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396}
397
398sub update {
399 my ($self) = @_;
400
401 $self->{parent}->update
402 if $self->{parent};
403}
404
405sub connect {
406 my ($self, $signal, $cb) = @_;
407
408 push @{ $self->{signal_cb}{$signal} }, $cb;
409}
410
411sub emit {
412 my ($self, $signal, @args) = @_;
413
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
415}
416
417sub DESTROY { 586sub DESTROY {
418 my ($self) = @_; 587 my ($self) = @_;
419 588
420 #$self->deactivate; 589 delete $WIDGET{$self+0};
590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
421} 593}
422 594
423############################################################################# 595#############################################################################
424 596
425package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
433 my $class = shift; 605 my $class = shift;
434 606
435 # range [value, low, high, page] 607 # range [value, low, high, page]
436 608
437 $class->SUPER::new ( 609 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 610 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 611 #active_bg => [1, 1, 1, 0.5],
440 @_ 612 @_
441 ) 613 )
442} 614}
443 615
444sub _draw { 616sub _draw {
445 my ($self) = @_; 617 my ($self) = @_;
446 618
619 my $color = $FOCUS == $self && $self->{active_bg}
620 ? $self->{active_bg}
621 : $self->{bg};
622
623 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
448 625
449 glEnable GL_BLEND; 626 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 628 glColor_premultiply @$color;
452 629
453 glBegin GL_QUADS; 630 glBegin GL_QUADS;
454 glVertex 0 , 0; 631 glVertex 0 , 0;
455 glVertex 0 , $h; 632 glVertex 0 , $h;
456 glVertex $w, $h; 633 glVertex $w, $h;
457 glVertex $w, 0; 634 glVertex $w, 0;
458 glEnd; 635 glEnd;
459 636
460 glDisable GL_BLEND; 637 glDisable GL_BLEND;
638 }
461} 639}
462 640
463############################################################################# 641#############################################################################
464 642
465package CFClient::UI::Empty; 643package CFClient::UI::Empty;
… …
470 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
472} 650}
473 651
474sub size_request { 652sub size_request {
475 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
476} 656}
477 657
478sub draw { } 658sub draw { }
479 659
480############################################################################# 660#############################################################################
… …
484our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
485 665
486sub new { 666sub new {
487 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
488 668
489 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
490 670
491 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
492 children => [], 672 children => [],
493 can_events => 0, 673 can_events => 0,
494 %arg, 674 %arg,
495 ); 675 );
676
496 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
497 679
498 $self 680 $self
499} 681}
500 682
501sub add { 683sub add {
… …
509 $self->{children} = [ 691 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
512 ]; 694 ];
513 695
514 $self->check_size; 696 $self->realloc;
515 $self->update;
516} 697}
517 698
518sub children { 699sub children {
519 @{ $_[0]{children} } 700 @{ $_[0]{children} }
520} 701}
… …
525 delete $child->{parent}; 706 delete $child->{parent};
526 $child->hide; 707 $child->hide;
527 708
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 710
530 $self->check_size; 711 $self->realloc;
531 $self->update;
532} 712}
533 713
534sub clear { 714sub clear {
535 my ($self) = @_; 715 my ($self) = @_;
536 716
… …
540 for (@$children) { 720 for (@$children) {
541 delete $_->{parent}; 721 delete $_->{parent};
542 $_->hide; 722 $_->hide;
543 } 723 }
544 724
545 $self->check_size; 725 $self->realloc;
546 $self->update;
547} 726}
548 727
549sub find_widget { 728sub find_widget {
550 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
551 730
552 $x -= $self->{x}; 731 $x -= $self->{x};
553 $y -= $self->{y}; 732 $y -= $self->{y};
554 733
555 my $res; 734 my $res;
556 735
557 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
558 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
559 and return $res; 738 and return $res;
560 } 739 }
561 740
562 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
583} 762}
584 763
585sub add { 764sub add {
586 my ($self, $child) = @_; 765 my ($self, $child) = @_;
587 766
588 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
589
590 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
591} 769}
592 770
593sub remove { 771sub remove {
594 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
603 781
604sub size_request { 782sub size_request {
605 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
606} 784}
607 785
608sub size_allocate { 786sub invoke_size_allocate {
609 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
610 788
611 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
612} 792}
613 793
614############################################################################# 794#############################################################################
795
796# back-buffered drawing area
615 797
616package CFClient::UI::Window; 798package CFClient::UI::Window;
617 799
618our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
619 801
… …
626} 808}
627 809
628sub update { 810sub update {
629 my ($self) = @_; 811 my ($self) = @_;
630 812
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 814 $self->SUPER::update;
633} 815}
634 816
635sub size_allocate { 817sub invoke_size_allocate {
636 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
637 819
638 $self->SUPER::size_allocate ($w, $h);
639 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
640} 823}
641 824
642sub _render { 825sub _render {
826 my ($self) = @_;
827
643 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
644} 829}
645 830
646sub render_child { 831sub render_child {
647 my ($self) = @_; 832 my ($self) = @_;
648 833
649 $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 {
650 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
652 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
653 $self->_render; 845 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 846 };
662} 847}
663 848
664sub _draw { 849sub _draw {
665 my ($self) = @_; 850 my ($self) = @_;
666 851
667 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
668 853
669 my $tex = $self->{texture} 854 my $tex = $self->{texture}
670 or return; 855 or return;
671 856
672 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
682 867
683package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
684 869
685our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
686 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
687sub size_request { 882sub size_request {
688 my ($self) = @_; 883 my ($self) = @_;
689 884
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 886
693 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
694} 888 $h = 10 if $self->{scroll_y};
695 889
890 ($w, $h)
891}
892
696sub size_allocate { 893sub invoke_size_allocate {
697 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
698 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);
699 $self->update; 902 $self->update;
903
904 1
700} 905}
701 906
702sub set_offset { 907sub set_offset {
703 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
704 909
… …
737} 942}
738 943
739sub _render { 944sub _render {
740 my ($self) = @_; 945 my ($self) = @_;
741 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
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743 951
744 $self->SUPER::_render; 952 $self->SUPER::_render;
745} 953}
746 954
747############################################################################# 955#############################################################################
748 956
749package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
750 958
751our @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;
752 1023
753sub new { 1024sub new {
754 my $class = shift; 1025 my $class = shift;
755 1026
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new ( 1027 $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 1028 bg => undef,
768 slider => $slider,
769 @_, 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,
770 ); 1083 );
771 1084
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
781
782#############################################################################
783
784package CFClient::UI::Frame;
785
786our @ISA = CFClient::UI::Bin::;
787
788use CFClient::OpenGL;
789
790sub new {
791 my $class = shift;
792
793 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_
798 );
799
800 $self
801}
802
803sub _draw {
804 my ($self) = @_;
805
806 my ($w, $h) = ($self->{w}, $self->{h});
807
808 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812
813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
820
821
822 $self->child->draw;
823 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D;
825}
826
827#############################################################################
828
829package CFClient::UI::FancyFrame;
830
831our @ISA = CFClient::UI::Bin::;
832
833use CFClient::OpenGL;
834
835my @tex =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838
839sub new {
840 my $class = shift;
841
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1],
847 border => 0.6,
848 can_events => 1,
849 @_
850 );
851
852 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
853 align => 0, 1086 align => 0,
854 valign => 1, 1087 valign => 1,
855 text => $self->{title}, 1088 text => $self->{title},
856 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 }
857 1100
858 $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};
859} 1110}
860 1111
861sub border { 1112sub border {
862 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
863} 1114}
864 1115
865sub size_request { 1116sub size_request {
866 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};
867 1124
868 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
869 1126
870 ( 1127 (
871 $w + $self->border * 2, 1128 $w + $self->border * 2,
872 $h + $self->border * 2, 1129 $h + $self->border * 2,
873 ) 1130 )
874} 1131}
875 1132
876sub size_allocate { 1133sub invoke_size_allocate {
877 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
878 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
879 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
881 1146
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
883 if $self->{title};
884
885 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
886}
887 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
888sub button_down { 1155sub invoke_button_down {
889 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
890 1157
891 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
892 my $border = $self->border; 1159 my $border = $self->border;
893 1160
… …
906 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
907 1174
908 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
910 1177
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
914 $self->check_size; 1182 $self->realloc;
915 }; 1183 };
916 1184
917 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1189 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
923 1191
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
925 1193
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
927 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
928 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
929 } 1202 1
930} 1203}
931 1204
932sub button_up { 1205sub invoke_button_up {
933 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
934 1207
935 delete $self->{motion}; 1208 ! ! delete $self->{motion}
936} 1209}
937 1210
938sub mouse_motion { 1211sub invoke_mouse_motion {
939 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
940 1213
941 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
942} 1217}
943 1218
944sub _draw { 1219sub _draw {
945 my ($self) = @_; 1220 my ($self) = @_;
946 1221
1222 my $child = $self->{children}[0];
1223
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
949 1226
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1229
955 my $border = $self->border; 1230 my $border = $self->border;
956 1231
957 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1237
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
965 1240
966 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1246 }
976 1247
977 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1249
981 $self->{title}->draw if $self->{title};
982
983 $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};
984} 1261}
985 1262
986############################################################################# 1263#############################################################################
987 1264
988package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
996sub new { 1273sub new {
997 my $class = shift; 1274 my $class = shift;
998 1275
999 $class->SUPER::new ( 1276 $class->SUPER::new (
1000 col_expand => [], 1277 col_expand => [],
1001 @_ 1278 @_,
1002 ) 1279 )
1280}
1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1284}
1004 1285
1005sub add { 1286sub add {
1006 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1007 1288
1008 $child->set_parent ($self); 1289 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1010 1291
1011 $child->check_size; 1292 $self->realloc;
1012} 1293}
1013 1294
1014sub children { 1295sub remove {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
1016}
1017 1297
1298 # TODO: not yet implemented
1299}
1300
1018# 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?
1019sub clear { 1302sub clear {
1020 my ($self) = @_; 1303 my ($self) = @_;
1021 1304
1022 my @children = $self->children; 1305 my @children = $self->children;
1023 delete $self->{children}; 1306 delete $self->{children};
… …
1025 for (@children) { 1308 for (@children) {
1026 delete $_->{parent}; 1309 delete $_->{parent};
1027 $_->hide; 1310 $_->hide;
1028 } 1311 }
1029 1312
1030 $self->update; 1313 $self->realloc;
1031} 1314}
1032 1315
1033sub get_wh { 1316sub get_wh {
1034 my ($self) = @_; 1317 my ($self) = @_;
1035 1318
… …
1061 (sum @$ws), 1344 (sum @$ws),
1062 (sum @$hs), 1345 (sum @$hs),
1063 ) 1346 )
1064} 1347}
1065 1348
1066sub size_allocate { 1349sub invoke_size_allocate {
1067 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1068 1351
1069 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1070 1353
1071 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1073 1356
1074 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1103 } 1386 }
1104 1387
1105 $y += $row_h; 1388 $y += $row_h;
1106 } 1389 }
1107 1390
1391 1
1108} 1392}
1109 1393
1110sub find_widget { 1394sub find_widget {
1111 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1112 1396
… …
1131 } 1415 }
1132} 1416}
1133 1417
1134############################################################################# 1418#############################################################################
1135 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
1136package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1137 1481
1138# TODO: wrap into common Box base class
1139
1140our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1141 1483
1142sub size_request { 1484sub new {
1143 my ($self) = @_; 1485 my $class = shift;
1144 1486
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1146 1488 vertical => 0,
1147 ( 1489 @_,
1148 (List::Util::sum map $_->[0], @alloc),
1149 (List::Util::max map $_->[1], @alloc),
1150 ) 1490 )
1151} 1491}
1152 1492
1153sub size_allocate {
1154 my ($self, $w, $h) = @_;
1155
1156 ($h, $w) = ($w, $h);
1157
1158 my $children = $self->{children};
1159
1160 my @h = map $_->{req_w}, @$children;
1161
1162 my $req_h = List::Util::sum @h;
1163
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children;
1169 $exp ||= 1;
1170
1171 for (0 .. $#$children) {
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 }
1178 }
1179
1180 CFClient::UI::harmonize \@h;
1181
1182 my $y = 0;
1183 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_];
1186 $child->configure ($y, 0, $h, $w);
1187
1188 $y += $h;
1189 }
1190
1191 1
1192}
1193
1194############################################################################# 1493#############################################################################
1195 1494
1196package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1197 1496
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1201 1498
1202sub size_request { 1499sub new {
1203 my ($self) = @_; 1500 my $class = shift;
1204 1501
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1206 1503 vertical => 1,
1207 ( 1504 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1505 )
1211} 1506}
1212 1507
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1508#############################################################################
1253 1509
1254package CFClient::UI::Label; 1510package CFClient::UI::Label;
1255 1511
1256our @ISA = CFClient::UI::Base::; 1512our @ISA = CFClient::UI::DrawBG::;
1257 1513
1258use CFClient::OpenGL; 1514use CFClient::OpenGL;
1259 1515
1260sub new { 1516sub new {
1261 my ($class, %arg) = @_; 1517 my ($class, %arg) = @_;
1262 1518
1263 my $self = $class->SUPER::new ( 1519 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1521 #bg => none
1522 #active_bg => none
1265 #font => default_font 1523 #font => default_font
1266 #text => initial text 1524 #text => initial text
1267 #markup => initial narkup 1525 #markup => initial narkup
1526 #max_w => maximum pixel width
1527 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1269 fontsize => 1, 1529 fontsize => 1,
1270 align => -1, 1530 align => -1,
1271 valign => -1, 1531 valign => -1,
1272 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1273 can_events => 0, 1534 can_events => 0,
1274 %arg 1535 %arg
1275 ); 1536 );
1276 1537
1277 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1287 } 1548 }
1288 1549
1289 $self 1550 $self
1290} 1551}
1291 1552
1292sub escape { 1553sub escape($) {
1293 local $_ = $_[1]; 1554 local $_ = $_[0];
1294 1555
1295 s/&/&amp;/g; 1556 s/&/&amp;/g;
1296 s/>/&gt;/g; 1557 s/>/&gt;/g;
1297 s/</&lt;/g; 1558 s/</&lt;/g;
1298 1559
1299 $_[1] 1560 $_
1300} 1561}
1301 1562
1302sub update { 1563sub update {
1303 my ($self) = @_; 1564 my ($self) = @_;
1304 1565
1305 delete $self->{texture}; 1566 delete $self->{texture};
1306 $self->SUPER::update; 1567 $self->SUPER::update;
1307} 1568}
1308 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1309sub set_text { 1577sub set_text {
1310 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1311 1579
1312 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1314 1582
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1317 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1318 $self->update; 1588 $self->update;
1319 $self->check_size;
1320} 1589}
1321 1590
1322sub set_markup { 1591sub set_markup {
1323 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1324 1593
… …
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1598
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1332 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1333 $self->update; 1604 $self->update;
1334 $self->check_size;
1335} 1605}
1336 1606
1337sub size_request { 1607sub size_request {
1338 my ($self) = @_; 1608 my ($self) = @_;
1339 1609
1610 $self->{size_req} ||= do {
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $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});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1616
1344 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1345 1618
1346 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1347 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1622
1350 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1351 1624
1352 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1354 } 1630 };
1355 1631
1356 ( 1632 @{ $self->{size_req} }
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1633}
1361 1634
1362sub size_allocate { 1635sub invoke_size_allocate {
1363 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1364 1637
1638 delete $self->{ox};
1639
1365 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1366} 1644}
1367 1645
1368sub set_fontsize { 1646sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1370 1648
1371 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1372 delete $self->{texture}; 1650 delete $self->{texture};
1373 1651
1374 $self->update; 1652 $self->realloc;
1375 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1376} 1661}
1377 1662
1378sub _draw { 1663sub _draw {
1379 my ($self) = @_; 1664 my ($self) = @_;
1665
1666 $self->SUPER::_draw; # draw background, if applicable
1380 1667
1381 my $tex = $self->{texture} ||= do { 1668 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1669 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1670 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $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});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1675
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1398 }; 1677 };
1399 1678
1679 unless (exists $self->{ox}) {
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
1400 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1402 1693
1403 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1404 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1406 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1408 } 1701 }
1409 1702
1410 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1411} 1704}
1412 1705
… …
1428 active_fg => [0, 0, 0], 1721 active_fg => [0, 0, 0],
1429 can_hover => 1, 1722 can_hover => 1,
1430 can_focus => 1, 1723 can_focus => 1,
1431 valign => 0, 1724 valign => 0,
1432 can_events => 1, 1725 can_events => 1,
1726 #text => ...
1727 #hidden => "*",
1433 @_ 1728 @_
1434 ) 1729 )
1435} 1730}
1436 1731
1437sub _set_text { 1732sub _set_text {
… …
1439 1734
1440 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1441 1736
1442 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1443 1738
1444 delete $self->{texture};
1445
1446 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1447 $self->{text} = $text; 1740 $self->{text} = $text;
1448 1741
1449 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1451 1745
1452 $self->emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1453} 1750}
1454 1751
1455sub set_text { 1752sub set_text {
1456 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1457 1754
1458 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1756 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462} 1757}
1463 1758
1464sub get_text { 1759sub get_text {
1465 $_[0]{text} 1760 $_[0]{text}
1466} 1761}
… …
1471 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1472 1767
1473 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1474} 1769}
1475 1770
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480}
1481
1482sub key_down { 1771sub invoke_key_down {
1483 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1484 1773
1485 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1486 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
1488 1777
1489 my $text = $self->get_text; 1778 my $text = $self->get_text;
1490 1779
1491 if ($sym == 8) { 1780 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1782 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1783 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1784 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1785 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1786 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1787 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1792 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1793 $self->emit ('escape');
1505 } elsif ($uni) { 1794 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1507 } 1798 }
1508 1799
1509 $self->_set_text ($text); 1800 $self->_set_text ($text);
1510 $self->update;
1511}
1512 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1513sub focus_in { 1807sub invoke_focus_in {
1514 my ($self) = @_; 1808 my ($self) = @_;
1515 1809
1516 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1517 1811
1518 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1519} 1813}
1520 1814
1521sub button_down { 1815sub invoke_button_down {
1522 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1523 1817
1524 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1525 1819
1526 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1527 1821
1528 # byte-index to char-index 1822 # byte-index to char-index
1529 my $text = $self->{text}; 1823 my $text = $self->{text};
1530 utf8::encode $text; 1824 utf8::encode $text;
1531 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1532 1826
1533 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1534 $self->update; 1828 $self->update;
1829
1830 1
1535} 1831}
1536 1832
1537sub mouse_motion { 1833sub invoke_mouse_motion {
1538 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1539# 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
1540} 1838}
1541 1839
1542sub _draw { 1840sub _draw {
1543 my ($self) = @_; 1841 my ($self) = @_;
1544 1842
1545 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1546 1844
1547 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1548 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1549 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1550 } else { 1848 } else {
1551 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1552 } 1850 }
1553 1851
1554 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1555 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1556 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1557 glVertex 0 , 0; 1855 glVertex 0 , 0;
1558 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1559 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1560 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1585 1883
1586our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1587 1885
1588use CFClient::OpenGL; 1886use CFClient::OpenGL;
1589 1887
1590sub key_down { 1888sub invoke_key_down {
1591 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1592 1890
1593 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1594 1892
1595 if ($sym == 13) { 1893 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1598 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1899 $self->emit (activate => $txt);
1601 $self->update; 1900 $self->update;
1602 1901
… …
1621 } else { 1920 } else {
1622 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1623 } 1922 }
1624 1923
1625 } else { 1924 } else {
1626 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1627 } 1928 1
1628
1629} 1929}
1630 1930
1631############################################################################# 1931#############################################################################
1632 1932
1633package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1642 1942
1643sub new { 1943sub new {
1644 my $class = shift; 1944 my $class = shift;
1645 1945
1646 $class->SUPER::new ( 1946 $class->SUPER::new (
1647 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1648 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1651 can_hover => 1, 1951 can_hover => 1,
1652 align => 0, 1952 align => 0,
1653 valign => 0, 1953 valign => 0,
1654 can_events => 1, 1954 can_events => 1,
1655 @_ 1955 @_
1656 ) 1956 )
1657} 1957}
1658 1958
1659sub button_up { 1959sub invoke_button_up {
1660 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1661 1961
1962 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1964 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate"); 1965
1665 } 1966 1
1666} 1967}
1667 1968
1668sub _draw { 1969sub _draw {
1669 my ($self) = @_; 1970 my ($self) = @_;
1670 1971
1671 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1672
1673 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg};
1675 }
1676 1973
1677 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1679 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1680 1977
… …
1685 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1686} 1983}
1687 1984
1688############################################################################# 1985#############################################################################
1689 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
2019}
2020
2021#############################################################################
2022
1690package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1691 2024
1692our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1693 2026
1694my @tex = 2027my @tex =
… …
1699 2032
1700sub new { 2033sub new {
1701 my $class = shift; 2034 my $class = shift;
1702 2035
1703 $class->SUPER::new ( 2036 $class->SUPER::new (
1704 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1705 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1706 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],
1707 state => 0, 2043 state => 0,
1708 can_hover => 1, 2044 can_hover => 1,
1709 @_ 2045 @_
1710 ) 2046 )
1711} 2047}
1712 2048
1713sub size_request { 2049sub size_request {
1714 my ($self) = @_; 2050 my ($self) = @_;
1715 2051
1716 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1717} 2053}
1718 2054
1719sub button_down { 2055sub invoke_button_down {
1720 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1721 2057
1722 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1723 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1724 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1725 $self->emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1726 } 2066 1
1727} 2067}
1728 2068
1729sub _draw { 2069sub _draw {
1730 my ($self) = @_; 2070 my ($self) = @_;
1731 2071
1732 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1733 2073
1734 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1735 2075
1736 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;
1737 2079
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 2081
2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
1740 glEnable GL_TEXTURE_2D; 2084 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 2085 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 2086 glDisable GL_TEXTURE_2D;
1747} 2087}
1748 2088
1749############################################################################# 2089#############################################################################
1750 2090
… …
1898 2238
1899 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
1901 2241
1902 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
1903 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;
1904 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1906 2247
1907 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
1908 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2338 qw(s1_slider.png s1_slider_bg.png);
1998 2339
1999sub new { 2340sub new {
2000 my $class = shift; 2341 my $class = shift;
2001 2342
2002 # range [value, low, high, page] 2343 # range [value, low, high, page, unit]
2003 2344
2004 # TODO: 0-width page 2345 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2346 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2347 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2348 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2009 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],
2010 range => [0, 0, 100, 10], 2353 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2013 vertical => 0, 2356 vertical => 0,
2014 can_hover => 1, 2357 can_hover => 1,
2015 inner_pad => 5, 2358 inner_pad => 0.02,
2016 @_ 2359 @_
2017 ); 2360 );
2018 2361
2362 $self->set_value ($self->{range}[0]);
2363 $self->update;
2364
2019 $self 2365 $self
2020} 2366}
2021 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
2022sub size_request { 2402sub size_request {
2023 my ($self) = @_; 2403 my ($self) = @_;
2024 2404
2025 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2406}
2030 2407
2031sub button_down { 2408sub invoke_button_down {
2032 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2033 2410
2034 $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
2035 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2036} 2416}
2037 2417
2038sub mouse_motion { 2418sub invoke_mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2040 2420
2041 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
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2450 my $range = ($hi - $page - $lo) || 1e-100;
2043 2451
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2453
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2454 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2455 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2456
2049 $x -= $inner_pad_px; # substract the padding 2457 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2458 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2459
2055 $self->emit (changed => $x); 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2461 $self->{knob_w} = $knob_w;
2057 } 2462 }
2058}
2059
2060# the inner_* stuff is for generating a padding for the slider handle,
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066}
2067
2068sub _draw {
2069 my ($self) = @_;
2070 2463
2071 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2072 2465
2073 my ($w, $h) = @$self{qw(w h)}; 2466 glScale $self->{w}, $self->{h};
2074 2467
2075 if ($self->{vertical}) { 2468 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2469 # draw a vertical slider like a rotated horizontal slider
2077 2470
2471 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2472 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2473 }
2083 2474
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2475 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2476 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2477
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2478 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2480
2108 # draw background 2481 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2482 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2483
2111 # draw handle 2484 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2485 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2486
2114 glDisable GL_TEXTURE_2D; 2487 glDisable GL_TEXTURE_2D;
2115} 2488}
2116 2489
2117############################################################################# 2490#############################################################################
2118 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
2119package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2120 2534
2121our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2122 2536
2123use CFClient::OpenGL; 2537use CFClient::OpenGL;
2124 2538
… …
2126 my $class = shift; 2540 my $class = shift;
2127 2541
2128 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2129 fontsize => 1, 2543 fontsize => 1,
2130 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2131 #font => default_font 2546 #font => default_font
2132 @_, 2547 @_,
2133 2548
2134 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2135 par => [], 2550 par => [],
… …
2150 2565
2151 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2567 $self->reflow;
2153} 2568}
2154 2569
2155sub text_height {
2156 my ($self, $text) = @_;
2157
2158 my $layout = $self->{layout};
2159
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w});
2162 $layout->set_markup ($text);
2163
2164 ($layout->size)[1]
2165}
2166
2167sub reflow {
2168 my ($self) = @_;
2169
2170 $self->{need_reflow}++;
2171 $self->update;
2172}
2173
2174sub size_allocate { 2570sub invoke_size_allocate {
2175 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2176
2177 $self->SUPER::size_allocate ($w, $h);
2178 2572
2179 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2180 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2181 $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});
2182 2577
2183 $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]);
2184} 2616}
2185 2617
2186sub add_paragraph { 2618sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2619 my ($self, $color, $text, $indent) = @_;
2188 2620
2189 #TODO: intelligently "reformat" paragraph 2621 for my $line (split /\n/, $text) {
2190 2622 my ($w, $h) = $self->text_size ($line);
2191 my $height = $self->text_height ($text);
2192
2193 $self->{height} += $height; 2623 $self->{height} += $h;
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2625 }
2194 2626
2195 push @{$self->{par}}, [$height, $color, $text];
2196
2197 $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]);
2198 $self->{children}[1]->update;
2199} 2628}
2200 2629
2201sub update { 2630sub update {
2202 my ($self) = @_; 2631 my ($self) = @_;
2203 2632
… …
2205 2634
2206 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2207 2636
2208 delete $self->{texture}; 2637 delete $self->{texture};
2209 2638
2210 $ROOT->on_refresh ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641
2211 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2643 my $height = 0;
2213 2644
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2215 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 }
2216 2661
2217 $self->{height} = $height; 2662 $self->{height} = $height;
2218 2663
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220 2665
2221 delete $self->{texture}; 2666 delete $self->{texture};
2222 } 2667 }
2223 2668
2224 $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 {
2225 glClearColor 0, 0, 0, 0; 2670 glClearColor 0, 0, 0, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2227 2672
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2232 2674
2233 my $y0 = $top; 2675 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2676 my $y1 = $top + $H;
2235 2677
2236 my $y = 0; 2678 my $y = 0;
2237 2679
2238 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2239 2681
2240 $layout->set_font ($self->{font}) if $self->{font}; 2682 $layout->set_font ($self->{font}) if $self->{font};
2241 2683
2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2242 for my $par (@{$self->{par}}) { 2688 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2689 my $h = $par->[1];
2244 2690
2245 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2692 $layout->set_foreground (@{ $par->[2] });
2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2247 $layout->set_markup ($par->[2]); 2695 $layout->set_markup ($par->[4]);
2248 2696
2249 my ($W, $H) = $layout->size; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2698
2699 glRasterPos $par->[3], $y - $y0;
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2701 }
2252 2702
2253 $y += $h; 2703 $y += $h;
2254 } 2704 }
2255 2705
2256 glDisable GL_TEXTURE_2D; 2706 glDisable GL_BLEND;
2257 }; 2707 };
2258 }); 2708 });
2259} 2709}
2260 2710
2261sub _draw { 2711sub _draw {
2262 my ($self) = @_; 2712 my ($self) = @_;
2263 2713
2264 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (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});
2268 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2269 2719
2270 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2271 2721
… …
2321 2771
2322sub new { 2772sub new {
2323 my $class = shift; 2773 my $class = shift;
2324 2774
2325 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2326 state => 0, 2776 state => 0,
2327 connect_activate => \&toggle_flopper, 2777 on_activate => \&toggle_flopper,
2328 @_ 2778 @_
2329 ); 2779 );
2330 2780
2331 if ($self->{state}) {
2332 $self->{state} = 0;
2333 $self->toggle_flopper;
2334 }
2335
2336 $self 2781 $self
2337} 2782}
2338 2783
2339sub toggle_flopper { 2784sub toggle_flopper {
2340 my ($self) = @_; 2785 my ($self) = @_;
2341 2786
2342 # TODO: use animation 2787 $self->{other}->toggle_visibility;
2343 if ($self->{state} = !$self->{state}) {
2344 $CFClient::UI::ROOT->add ($self->{other});
2345 $self->{other}->move ($self->coord2global (0, $self->{h}));
2346 $self->emit ("open");
2347 } else {
2348 $CFClient::UI::ROOT->remove ($self->{other});
2349 $self->emit ("close");
2350 }
2351
2352 $self->emit (changed => $self->{state});
2353} 2788}
2354 2789
2355############################################################################# 2790#############################################################################
2356 2791
2357package CFClient::UI::Tooltip; 2792package CFClient::UI::Tooltip;
… …
2367 @_, 2802 @_,
2368 can_events => 0, 2803 can_events => 0,
2369 ) 2804 )
2370} 2805}
2371 2806
2372sub set_markup { 2807sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2808 my ($self, $widget) = @_;
2374 2809
2810 my $tooltip = $widget->{tooltip};
2811
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
2375 $self->{label} = new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2823 markup => $tooltip,
2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2825 fontsize => 0.8,
2377 fg => [0, 0, 0], 2826 fg => [0, 0, 0, 1],
2827 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2829 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2830}
2384 2831
2385sub size_request { 2832sub size_request {
2386 my ($self) = @_; 2833 my ($self) = @_;
2387 2834
2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2389 2836
2390 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2391} 2838}
2392 2839
2393sub size_allocate { 2840sub invoke_size_allocate {
2394 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2395 2842
2396 $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 });
2397} 2862}
2398 2863
2399sub _draw { 2864sub _draw {
2400 my ($self) = @_; 2865 my ($self) = @_;
2401 2866
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2867 glTranslate 0.375, 0.375;
2404 2868
2405 my ($w, $h) = @$self{qw(w h)}; 2869 my ($w, $h) = @$self{qw(w h)};
2406 2870
2407 glColor 1, 0.8, 0.4; 2871 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2882 glVertex 0 , $h;
2419 glVertex $w, $h; 2883 glVertex $w, $h;
2420 glVertex $w, 0; 2884 glVertex $w, 0;
2421 glEnd; 2885 glEnd;
2422 2886
2423 glPopMatrix; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2424 2888
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2427} 2890}
2428 2891
2429############################################################################# 2892#############################################################################
2430 2893
… …
2435use CFClient::OpenGL; 2898use CFClient::OpenGL;
2436 2899
2437sub new { 2900sub new {
2438 my $class = shift; 2901 my $class = shift;
2439 2902
2440 $class->SUPER::new ( 2903 my $self = $class->SUPER::new (
2441 aspect => 1, 2904 aspect => 1,
2905 can_events => 0,
2442 @_, 2906 @_,
2443 ) 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
2444} 2924}
2445 2925
2446sub size_request { 2926sub size_request {
2447 (32, 8) 2927 (32, 8)
2448} 2928}
2449 2929
2930sub update {
2931 my ($self) = @_;
2932
2933 return unless $self->{visible};
2934
2935 $self->SUPER::update;
2936}
2937
2450sub _draw { 2938sub _draw {
2451 my ($self) = @_; 2939 my ($self) = @_;
2452 2940
2453 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
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2953
2456 # TODO animation
2457 if ($tex) { 2954 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2463 } 2960 }
2464} 2961}
2465 2962
2963sub destroy {
2964 my ($self) = @_;
2965
2966 $self->{timer}->cancel
2967 if $self->{timer};
2968
2969 $self->SUPER::destroy;
2970}
2971
2466############################################################################# 2972#############################################################################
2467 2973
2468package CFClient::UI::InventoryItem; 2974package CFClient::UI::Buttonbar;
2469 2975
2470our @ISA = CFClient::UI::HBox::; 2976our @ISA = CFClient::UI::HBox::;
2471 2977
2472sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574 2979
2575############################################################################# 2980#############################################################################
2576 2981
2577package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2578 2983
… …
2590 ); 2995 );
2591 2996
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593 2998
2594 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2596 3001
2597 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2598 if (!ref $widget) { 3003 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2600 can_hover => 1, 3005 can_hover => 1,
2601 can_events => 1, 3006 can_events => 1,
2602 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2603 } 3009 }
2604 3010
2605 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2606 3012
2607 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2619 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self; 3026 $GRAB = $self;
2621 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2622 3028
2623 $self->show; 3029 $self->show;
2624 $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);
2625} 3031}
2626 3032
2627sub mouse_motion { 3033sub invoke_mouse_motion {
2628 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2629 3035
2630 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2633}
2634 3039
3040 0
3041}
3042
2635sub button_up { 3043sub invoke_button_up {
2636 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2637 3045
2638 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB; 3047 undef $GRAB;
2640 $self->hide; 3048 $self->hide;
2641 3049
2642 $self->emit ("popdown"); 3050 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2644 } 3056 1
2645} 3057}
2646 3058
2647############################################################################# 3059#############################################################################
2648 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
2649package CFClient::UI::Statusbox; 3227package CFClient::UI::Statusbox;
2650 3228
2651our @ISA = CFClient::UI::VBox::; 3229our @ISA = CFClient::UI::VBox::;
2652 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
2653sub reorder { 3246sub reorder {
2654 my ($self) = @_; 3247 my ($self) = @_;
2655 my $NOW = time; 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} };
2656 3254
2657 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 3257 }
2660 3258
2661 my @widgets; 3259 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 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
2663 my $count = 10 + 1; 3268 my $count = 10 + 1;
2664 for my $item (@items) { 3269 for my $item (@items) {
2665 last unless --$count; 3270 last unless --$count;
2666 3271
2667 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 3274 my $short = $item->{count} > 1
3275 ? "<b>$item->{count} ×</b> $item->{text}"
3276 : $item->{text};
3277
2670 for ($short) { 3278 for ($short) {
2671 s/^\s+//; 3279 s/^\s+//;
2672 s/\012.*//s; 3280 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 3281 }
2676 3282
2677 new CFClient::UI::Label 3283 new CFClient::UI::Label
2678 markup => $short, 3284 markup => $short,
2679 tooltip => delete $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 3286 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 3287 tooltip_width => 0.67,
3288 fontsize => $item->{fontsize} || $self->{fontsize},
3289 max_w => $::WIDTH * 0.44,
3290 fg => [@{ $item->{fg} }],
2682 can_events => 1, 3291 can_events => 1,
2683 can_hover => 1, 3292 can_hover => 1
2684 }; 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;
2685 } 3306 }
2686 3307
2687 $self->clear; 3308 $self->clear;
2688 $self->SUPER::add (@widgets); 3309 $self->SUPER::add (reverse @widgets);
2689} 3310}
2690 3311
2691sub add { 3312sub add {
2692 my ($self, $text, %arg) = @_; 3313 my ($self, $text, %arg) = @_;
2693 3314
2694 my $item = { 3315 $text =~ s/^\s+//;
2695 time => time, 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},
2696 text => $text, 3337 text => $text,
2697 timeout => 60, 3338 timeout => $timeout,
2698 tooltip => $text, 3339 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 3340 fg => [0.8, 0.8, 0.8, 0.8],
3341 pri => 0,
3342 count => 1,
2701 %arg, 3343 %arg,
3344 };
2702 }; 3345 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 3346
2709 $self->reorder; 3347 $self->reorder;
2710} 3348}
2711 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
2712############################################################################# 3368#############################################################################
2713 3369
2714package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
2715 3371
2716our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
2717
2718use CFClient::OpenGL;
2719 3373
2720sub new { 3374sub new {
2721 my $class = shift; 3375 my $class = shift;
2722 3376
2723 $class->SUPER::new ( 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 => [],
2724 @_, 3620 @_,
2725 ) 3621 )
2726} 3622}
2727 3623
2728sub configure { 3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2729 my ($self, $x, $y, $w, $h) = @_;
2730 3625
2731 $self->{w} = $w; 3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2732 $self->{h} = $h; 3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2733} 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");
2734 3636
2735sub check_size { 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 {
2736 my ($self) = @_; 3710 my ($self, $spell) = @_;
2737 3711
2738 $self->size_allocate ($self->{w}, $self->{h}) 3712 $self->{spell}->{$spell->{name}} = $spell;
2739 if $self->{w}; 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
3732package CFClient::UI::Root;
3733
3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3737
3738use CFClient::OpenGL;
3739
3740sub new {
3741 my $class = shift;
3742
3743 my $self = $class->SUPER::new (
3744 visible => 1,
3745 @_,
3746 );
3747
3748 Scalar::Util::weaken ($self->{root} = $self);
3749
3750 $self
2740} 3751}
2741 3752
2742sub size_request { 3753sub size_request {
2743 my ($self) = @_; 3754 my ($self) = @_;
2744 3755
2745 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
2746} 3757}
2747 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
2748sub size_allocate { 3773sub invoke_size_allocate {
2749 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766 3775
2767 for my $child ($self->children) { 3776 for my $child ($self->children) {
2768 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)};
2769 3778
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3779 $X = $child->{force_x} if exists $child->{force_x};
2771 $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
2772 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
2773 } 3786 }
2774 3787
2775 $self->{old_w} = $w; 3788 1
2776 $self->{old_h} = $h;
2777} 3789}
2778 3790
2779sub coord2local { 3791sub coord2local {
2780 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
2781 3793
… …
2789} 3801}
2790 3802
2791sub update { 3803sub update {
2792 my ($self) = @_; 3804 my ($self) = @_;
2793 3805
2794 $self->check_size;
2795 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
2796} 3807}
2797 3808
2798sub add { 3809sub add {
2799 my ($self, $child) = @_; 3810 my ($self, @children) = @_;
2800 3811
2801 # integerise window positions 3812 $_->{is_toplevel} = 1
2802 $child->{x} = int $child->{x}; 3813 for @children;
2803 $child->{y} = int $child->{y};
2804 3814
2805 $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 }
2806} 3831}
2807 3832
2808sub on_refresh { 3833sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3834 my ($self, $id, $cb) = @_;
2810 3835
2811 $self->{refresh_hook}{$id} = $cb; 3836 $self->{refresh_hook}{$id} = $cb;
2812} 3837}
2813 3838
3839sub on_post_alloc {
3840 my ($self, $id, $cb) = @_;
3841
3842 $self->{post_alloc_hook}{$id} = $cb;
3843}
3844
2814sub draw { 3845sub draw {
2815 my ($self) = @_; 3846 my ($self) = @_;
2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860 3847
2861 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
2862 $_->() 3849 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
2864 } 3851 }
2865 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
3944
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
2869 3948
2870 glMatrixMode GL_PROJECTION; 3949 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3950 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3953 glLoadIdentity;
2875 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
2876 $self->_draw; 3962 $self->_draw;
2877} 3963}
2878 3964
2879############################################################################# 3965#############################################################################
2880 3966
2881package CFClient::UI; 3967package CFClient::UI;
2882 3968
2883$ROOT = new CFClient::UI::Root; 3969$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3970$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3971
28861 39721
2887 3973

Diff Legend

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