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

Diff Legend

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