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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.346 by root, Mon Aug 14 01:21:02 2006 UTC

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

Diff Legend

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