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.185 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC

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

Diff Legend

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