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

Diff Legend

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