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.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

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