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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC

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

Diff Legend

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