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

Diff Legend

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