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

Diff Legend

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