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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 2006 UTC

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

Diff Legend

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