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

Diff Legend

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