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.211 by elmex, Wed May 17 10:33:03 2006 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

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

Diff Legend

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