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.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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