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

Diff Legend

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