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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.485 by root, Wed Nov 21 10:59:18 2012 UTC

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

Diff Legend

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