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

Diff Legend

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