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

Diff Legend

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