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

Diff Legend

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