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.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.72 by root, Tue Apr 11 18:00:45 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless {
23} 79 x => 0,
24 80 y => 0,
25sub activate { 81 z => 0,
26 push @ACTIVE_WIDGETS, $_[0]; 82 @_
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; 83 }, $class
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 84}
36 85
37sub move { 86sub move {
38 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 88 $self->{x} = $x;
… …
44sub needs_redraw { 93sub needs_redraw {
45 0 94 0
46} 95}
47 96
48sub size_request { 97sub size_request {
98 require Carp;
49 die "size_request is abtract"; 99 Carp::confess "size_request is abtract";
100}
101
102sub size_allocate {
103 my ($self, $w, $h) = @_;
104
105 $self->{w} = $w;
106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 114}
51 115
52sub focus_in { 116sub focus_in {
53 my ($widget) = @_; 117 my ($self) = @_;
54 $FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
55} 124}
56 125
57sub focus_out { 126sub focus_out {
58 my ($widget) = @_; 127 my ($self) = @_;
59}
60 128
129 return unless $FOCUS == $self;
130
131 my $focus = $FOCUS; undef $FOCUS;
132 $focus->update if $focus; #?
133}
134
135sub mouse_motion { }
136sub button_up { }
61sub key_down { 137sub key_down { }
62 my ($widget, $sdlev) = @_;
63}
64
65sub key_up { 138sub key_up { }
66 my ($widget, $sdlev) = @_;
67}
68 139
69sub button_down { 140sub button_down {
70 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
71}
72 142
73sub button_up { 143 $self->focus_in;
74 my ($widget, $sdlev) = @_;
75} 144}
76 145
77sub w { $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
78sub h { $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 151
83sub draw { 152sub draw {
84 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
85 156
86 glPushMatrix; 157 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 159 $self->_draw;
89 glPopMatrix; 160 glPopMatrix;
161
162 if ($self == $HOVER) {
163 my ($x, $y) = @$self->{qw(x y)};
164
165 glColor 1, 1, 1, 0.1;
166 glEnable GL_BLEND;
167 glBegin GL_QUADS;
168 glVertex $x , $y;
169 glVertex $x + $self->{w}, $y;
170 glVertex $x + $self->{w}, $y + $self->{h};
171 glVertex $x , $y + $self->{h};
172 glEnd;
173 glDisable GL_BLEND;
174 }
90} 175}
91 176
92sub _draw { 177sub _draw {
93 my ($widget) = @_; 178 my ($self) = @_;
179
180 warn "no draw defined for $self\n";
94} 181}
95 182
96sub bbox { 183sub bbox {
97 my ($widget) = @_; 184 my ($self) = @_;
185 my ($w, $h) = $self->size_request;
186 (
187 $self->{x},
188 $self->{y},
189 $self->{x} = $w,
190 $self->{y} = $h
191 )
192}
193
194sub find_widget {
195 my ($self, $x, $y) = @_;
196
197 return $self
198 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
199 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
200
201 ()
202}
203
204sub del_parent { $_[0]->{parent} = undef }
205
206sub set_parent {
207 my ($self, $par) = @_;
208
209 $self->{parent} = $par;
210 Scalar::Util::weaken $self->{parent};
211}
212
213sub get_parent {
214 $_[0]->{parent}
215}
216
217sub update {
218 my ($self) = @_;
219
220 $self->{parent}->update
221 if $self->{parent};
222}
223
224sub connect {
225 my ($self, $signal, $cb) = @_;
226
227 push @{ $self->{cb}{$signal} }, $cb;
228}
229
230sub emit {
231 my ($self, $signal, @args) = @_;
232
233 $_->($self, @args)
234 for @{$self->{cb}{$signal} || []};
98} 235}
99 236
100sub DESTROY { 237sub DESTROY {
101 my ($self) = @_; 238 my ($self) = @_;
102 239
103 $self->deactivate; 240 #$self->deactivate;
104} 241}
105 242
106package Crossfire::Client::Widget::Container; 243#############################################################################
107 244
245package CFClient::Widget::DrawBG;
246
108our @ISA = Crossfire::Client::Widget::; 247our @ISA = CFClient::Widget::;
109 248
249use strict;
110use SDL::OpenGL; 250use SDL::OpenGL;
111 251
112sub add { $_[0]->{child} = $_[1] } 252sub new {
113sub get { $_[0]->{child} } 253 my $class = shift;
114 254
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 255 # range [value, low, high, page]
116 256
117sub _draw { die "Containers can't be drawn!" } 257 $class->SUPER::new (
258 bg => [0, 0, 0, 0.4],
259 active_bg => [1, 1, 1],
260 @_
261 )
262}
118 263
264sub _draw {
265 my ($self) = @_;
266
267 my ($w, $h) = @$self{qw(w h)};
268
269 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
270 glBegin GL_QUADS;
271 glVertex 0 , 0;
272 glVertex 0 , $h;
273 glVertex $w, $h;
274 glVertex $w, 0;
275 glEnd;
276}
277
278#############################################################################
279
280package CFClient::Widget::Empty;
281
282our @ISA = CFClient::Widget::;
283
284sub size_request {
285 (0, 0)
286}
287
288sub draw { }
289
290#############################################################################
291
292package CFClient::Widget::Container;
293
294our @ISA = CFClient::Widget::;
295
296sub new {
297 my ($class, %arg) = @_;
298
299 my $children = delete $arg{children} || [];
300
301 my $self = $class->SUPER::new (children => [], %arg);
302 $self->add ($_) for @$children;
303
304 $self
305}
306
307sub add {
308 my ($self, $chld, $expand) = @_;
309
310 $chld->{expand} = $expand;
311 $chld->set_parent ($self);
312
313 $self->{children} = [
314 sort { $a->{z} <=> $b->{z} }
315 @{$self->{children}}, $chld
316 ];
317
318 $self->size_allocate ($self->{w}, $self->{h})
319 if $self->{w}; #TODO: check for "realised state"
320}
321
322sub remove {
323 my ($self, $widget) = @_;
324
325 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
326
327 $self->size_allocate ($self->{w}, $self->{h});
328}
329
330sub find_widget {
331 my ($self, $x, $y) = @_;
332
333 $x -= $self->{x};
334 $y -= $self->{y};
335
336 my $res;
337
338 for (reverse @{ $self->{children} }) {
339 $res = $_->find_widget ($x, $y)
340 and return $res;
341 }
342
343 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
344}
345
346sub _draw {
347 my ($self) = @_;
348
349 $_->draw for @{$self->{children}};
350}
351
352#############################################################################
353
119package Crossfire::Client::Widget::Window; 354package CFClient::Widget::Bin;
120 355
121our @ISA = Crossfire::Client::Widget::Container::; 356our @ISA = CFClient::Widget::Container::;
357
358sub new {
359 my ($class, %arg) = @_;
360
361 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
362
363 $class->SUPER::new (children => [$child], %arg)
364}
365
366sub add {
367 my ($self, $widget) = @_;
368
369 $self->{children} = [];
370
371 $self->SUPER::add ($widget);
372}
373
374sub remove {
375 my ($self, $widget) = @_;
376
377 $self->SUPER::remove ($widget);
378
379 $self->{children} = [new CFClient::Widget::Empty]
380 unless @{$self->{children}};
381}
382
383sub child { $_[0]->{children}[0] }
384
385sub size_request {
386 $_[0]{children}[0]->size_request
387}
388
389sub size_allocate {
390 my ($self, $w, $h) = @_;
391
392 return unless $self->{w} != $w || $self->{h} != $h;
393
394 $self->SUPER::size_allocate ($w, $h);
395 $self->{children}[0]->size_allocate ($w, $h);
396}
397
398#############################################################################
399
400package CFClient::Widget::Window;
401
402our @ISA = CFClient::Widget::Bin::;
122 403
123use SDL::OpenGL; 404use SDL::OpenGL;
124 405
125sub add { 406sub new {
407 my ($class, %arg) = @_;
408
409 my $self = $class->SUPER::new (%arg);
410}
411
412sub update {
126 my ($self, $chld) = @_; 413 my ($self) = @_;
127 $self->SUPER::add ($chld); 414
128 $self->render_chld; #TODO: Move this to the size_request event propably? 415 # we want to do this delayed...
416 $self->render_chld;
417 $self->SUPER::update;
129} 418}
130 419
131sub render_chld { 420sub render_chld {
132 my ($self) = @_; 421 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 422
136 $self->{texture} = 423 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 424 CFClient::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 425 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 426 );
140 $self->{texture}->upload;
141} 427}
142 428
143sub size_request { 429sub size_allocate {
144 my ($self) = @_; 430 my ($self, $w, $h) = @_;
145 my $chld = $self->get 431
146 or return (0, 0); 432 return unless $self->{w} != $w || $self->{h} != $h;
147 $chld->size_request 433
434 $self->{w} = $w;
435 $self->{h} = $h;
436
437 $self->child->size_allocate ($w, $h);
438
439 $self->render_chld;
148} 440}
149 441
150sub _draw { 442sub _draw {
151 my ($self) = @_; 443 my ($self) = @_;
152 444
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 445 my ($w, $h) = ($self->w, $self->h);
154 446
155 my $tex = $self->{texture} 447 my $tex = $self->{texture}
156 or return; 448 or return;
157 449
158 glEnable GL_BLEND; 450 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 451 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162 453
163 glColor 1, 0, 1; 454 $tex->draw_quad (0, 0, $w, $h);
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171 455
172 glDisable GL_BLEND; 456 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 457 glDisable GL_TEXTURE_2D;
174} 458}
175 459
460#############################################################################
461
176package Crossfire::Client::Widget::Frame; 462package CFClient::Widget::Frame;
177 463
178our @ISA = Crossfire::Client::Widget::Container::; 464our @ISA = CFClient::Widget::Bin::;
179 465
180use SDL::OpenGL; 466use SDL::OpenGL;
181 467
182sub size_request { 468sub size_request {
183 my ($self) = @_; 469 my ($self) = @_;
184 my $chld = $self->get 470 my $chld = $self->child
185 or return (0, 0); 471 or return (0, 0);
186 472
187 $chld->move (2, 2); 473 $chld->move (2, 2);
188 474
189 map { $_ + 4 } $chld->size_request; 475 map { $_ + 4 } $chld->size_request;
190} 476}
191 477
478sub size_allocate {
479 my ($self, $w, $h) = @_;
480
481 return unless $self->{w} != $w || $self->{h} != $h;
482
483 $self->{w} = $w;
484 $self->{h} = $h;
485
486 $self->child->size_allocate ($w - 4, $h - 4);
487 $self->child->move (2, 2);
488}
489
192sub _draw { 490sub _draw {
193 my ($self) = @_; 491 my ($self) = @_;
194 492
195 my $chld = $self->get; 493 my $chld = $self->child;
196 494
197 my ($w, $h) = $chld->size_request; 495 my ($w, $h) = $chld->size_request;
198 496
199 glBegin GL_QUADS; 497 glBegin GL_QUADS;
200 glColor 0, 0, 0; 498 glColor 0, 0, 0;
201 glTexCoord 0, 0; glVertex 0 , 0; 499 glVertex 0 , 0;
202 glTexCoord 0, 1; glVertex 0 , $h + 4; 500 glVertex 0 , $h + 4;
203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 501 glVertex $w + 4 , $h + 4;
204 glTexCoord 1, 0; glVertex $w + 4 , 0; 502 glVertex $w + 4 , 0;
205 glEnd; 503 glEnd;
206 504
207 $chld->draw; 505 $chld->draw;
208} 506}
209 507
508#############################################################################
509
210package Crossfire::Client::Widget::FancyFrame; 510package CFClient::Widget::FancyFrame;
211 511
212our @ISA = Crossfire::Client::Widget::Frame::; 512our @ISA = CFClient::Widget::Bin::;
213 513
214use SDL::OpenGL; 514use SDL::OpenGL;
215 515
216#TODO: implement themed frame 516my @tex =
517 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
518 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
217 519
520sub size_request {
521 my ($self) = @_;
522
523 my ($w, $h) = $self->SUPER::size_request;
524
525 $h += $tex[1]->{h};
526 $h += $tex[4]->{h};
527 $w += $tex[2]->{w};
528 $w += $tex[3]->{w};
529
530 ($w, $h)
531}
532
533sub size_allocate {
534 my ($self, $w, $h) = @_;
535
536 return unless $self->{w} != $w || $self->{h} != $h;
537
538 $self->SUPER::size_allocate ($w, $h);
539
540 $h -= $tex[1]->{h};
541 $h -= $tex[4]->{h};
542 $w -= $tex[2]->{w};
543 $w -= $tex[3]->{w};
544
545 $h = $h < 0 ? 0 : $h;
546 $w = $w < 0 ? 0 : $w;
547
548 my $child = $self->child;
549
550 $child->size_allocate ($w, $h);
551 $child->move ($tex[3]->{w}, $tex[1]->{h});
552}
553
554sub _draw {
555 my ($self) = @_;
556
557 my ($w, $h) = ($self->{w}, $self->{h});
558 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
559
560 glEnable GL_BLEND;
561 glEnable GL_TEXTURE_2D;
562 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
564
565 my $top = $tex[1];
566 $top->draw_quad (0, 0, $w, $top->{h});
567
568 my $left = $tex[3];
569 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
570
571 my $right = $tex[2];
572 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
573
574 my $bottom = $tex[4];
575 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
576
577 my $bg = $tex[0];
578 glBindTexture GL_TEXTURE_2D, $bg->{name};
579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
580 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
581 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
582
583 my $rep_x = $cw / $bg->{w};
584 my $rep_y = $ch / $bg->{h};
585
586 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
587
588 glDisable GL_BLEND;
589 glDisable GL_TEXTURE_2D;
590
591 $self->child->draw;
592
593}
594
595#############################################################################
596
218package Crossfire::Client::Widget::Table; 597package CFClient::Widget::Table;
219 598
220our @ISA = Crossfire::Client::Widget::Container::; 599our @ISA = CFClient::Widget::;
221 600
222use SDL::OpenGL; 601use SDL::OpenGL;
223 602
224sub add { 603sub add {
225 my ($self, $x, $y, $chld) = @_; 604 my ($self, $x, $y, $chld) = @_;
605 my $old_chld = $self->{children}[$y][$x];
606
226 $self->{childs}[$y][$x] = $chld; 607 $self->{children}[$y][$x] = $chld;
608 $chld->set_parent ($self);
609 $self->update;
227} 610}
228 611
229sub max_row_height { 612sub max_row_height {
230 my ($self, $row) = @_; 613 my ($self, $row) = @_;
231 614
232 my $hs = 0; 615 my $hs = 0;
233 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 616 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
234 my $c = $self->{childs}->[$row]->[$xi]; 617 my $c = $self->{children}->[$row]->[$xi];
235 if ($c) { 618 if ($c) {
236 my ($w, $h) = $c->size_request; 619 my ($w, $h) = $c->size_request;
237 if ($hs < $h) { $hs = $h } 620 if ($hs < $h) { $hs = $h }
238 } 621 }
239 } 622 }
… …
242 625
243sub max_col_width { 626sub max_col_width {
244 my ($self, $col) = @_; 627 my ($self, $col) = @_;
245 628
246 my $ws = 0; 629 my $ws = 0;
247 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 630 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
248 my $c = ($self->{childs}->[$yi] || [])->[$col]; 631 my $c = ($self->{children}->[$yi] || [])->[$col];
249 if ($c) { 632 if ($c) {
250 my ($w, $h) = $c->size_request; 633 my ($w, $h) = $c->size_request;
251 if ($ws < $w) { $ws = $w } 634 if ($ws < $w) { $ws = $w }
252 } 635 }
253 } 636 }
… …
257sub size_request { 640sub size_request {
258 my ($self) = @_; 641 my ($self) = @_;
259 642
260 my ($hs, $ws) = (0, 0); 643 my ($hs, $ws) = (0, 0);
261 644
262 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 645 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
263 $hs += $self->max_row_height ($yi); 646 $hs += $self->max_row_height ($yi);
264 } 647 }
265 648
266 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 649 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
267 my $wm = 0; 650 my $wm = 0;
268 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 651 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
269 $wm += $self->max_col_width ($xi) 652 $wm += $self->max_col_width ($xi)
270 } 653 }
271 if ($ws < $wm) { $ws = $wm } 654 if ($ws < $wm) { $ws = $wm }
272 } 655 }
273 656
… …
276 659
277sub _draw { 660sub _draw {
278 my ($self) = @_; 661 my ($self) = @_;
279 662
280 my $y = 0; 663 my $y = 0;
281 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 664 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
282 my $x = 0; 665 my $x = 0;
283 666
284 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 667 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
285 668
286 my $c = $self->{childs}->[$yi]->[$xi]; 669 my $c = $self->{children}->[$yi]->[$xi];
287 if ($c) { 670 if ($c) {
288 $c->move ($x, $y, 0); #TODO: Move to size_request 671 $c->move ($x, $y, 0); #TODO: Move to size_request
289 $c->draw if $c; 672 $c->draw if $c;
290 } 673 }
291 674
… …
294 677
295 $y += $self->max_row_height ($yi); 678 $y += $self->max_row_height ($yi);
296 } 679 }
297} 680}
298 681
682#############################################################################
683
299package Crossfire::Client::Widget::VBox; 684package CFClient::Widget::VBox;
300 685
301our @ISA = Crossfire::Client::Widget::Container::; 686our @ISA = CFClient::Widget::Container::;
302 687
303use SDL::OpenGL; 688use SDL::OpenGL;
304 689
305sub add {
306 my ($self, $chld) = @_;
307 push @{$self->{childs}}, $chld;
308}
309
310sub size_request { 690sub size_request {
311 my ($self) = @_; 691 my ($self) = @_;
312 692
313 my ($hs, $ws) = (0, 0); 693 my @alloc = map [$_->size_request], @{$self->{children}};
314 for (@{$self->{childs} || []}) { 694
315 my ($w, $h) = $_->size_request;
316 $hs += $h;
317 if ($ws < $w) { $ws = $w }
318 } 695 (
319 696 (List::Util::max map $_->[0], @alloc),
320 return ($ws, $hs); 697 (List::Util::sum map $_->[1], @alloc),
698 )
321} 699}
322 700
323sub _draw { 701sub size_allocate {
324 my ($self) = @_; 702 my ($self, $w, $h) = @_;
325 703
326 my ($x, $y); 704 return unless $self->{w} != $w || $self->{h} != $h;
327 for (@{$self->{childs} || []}) { 705
328 $_->move (0, $y, 0); #TODO: move to size_request 706 $self->{w} = $w;
329 $_->draw; 707 $self->{h} = $h;
330 my ($w, $h) = $_->size_request; 708
709 return unless $self->{h};
710
711 my $children = $self->{children};
712
713 my @h = map +($_->size_request)[1], @$children;
714
715 my $req_h = List::Util::sum @h;
716
717 if ($req_h > $h) {
718 # ah well, not enough space
719 $_ = $h[$_] * $h / $req_h for @h;
720 } else {
721 my @exp = grep $_->{expand}, @$children;
722 @exp = @$children unless @exp;
723
724 my %exp = map +($_ => 1), @exp;
725
726 for (0 .. $#$children) {
727 my $child = $children->[$_];
728
729 my $alloc_h = $h[$_];
730 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
731 $h[$_] = $alloc_h;
732 }
733 }
734
735 my $y = 0;
736 for (0 .. $#$children) {
737 my $child = $children->[$_];
738 my $h = $h[$_];
739 $child->move (0, $y);
740 $child->size_allocate ($w, $h);
741
331 $y += $h; 742 $y += $h;
332 } 743 }
333} 744}
334 745
746#############################################################################
747
335package Crossfire::Client::Widget::Label; 748package CFClient::Widget::Label;
336 749
337our @ISA = Crossfire::Client::Widget::; 750our @ISA = CFClient::Widget::;
338 751
339use SDL::OpenGL; 752use SDL::OpenGL;
340 753
341sub new { 754sub new {
342 my ($class, $x, $y, $z, $height, $text) = @_; 755 my ($class, %arg) = @_;
343 756
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 757 my $self = $class->SUPER::new (
758 fg => [1, 1, 1],
759 height => $::FONTSIZE,
760 text => "",
761 align => -1,
762 layout => new CFClient::Layout,
763 %arg
764 );
345 765
346 $self->set_text ($text); 766 $self->set_text ($self->{text});
347 767
348 $self 768 $self
769}
770
771sub escape_text {
772 local $_ = $_[1];
773
774 s/&/&amp;/g;
775 s/>/&gt;/g;
776 s/</&lt;/g;
777
778 $_[1]
349} 779}
350 780
351sub set_text { 781sub set_text {
352 my ($self, $text) = @_; 782 my ($self, $text) = @_;
353 783
354 $self->{text} = $text; 784 $self->{text} = $text;
785 $self->{layout}->set_markup ($text);
355 786
356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 787 delete $self->{texture};
788 $self->update;
357} 789}
358 790
359sub get_text { 791sub get_text {
360 my ($self, $text) = @_; 792 my ($self, $text) = @_;
361 793
… …
363} 795}
364 796
365sub size_request { 797sub size_request {
366 my ($self) = @_; 798 my ($self) = @_;
367 799
368 ( 800 $self->{layout}->set_width;
801 $self->{layout}->set_height ($self->{height});
802 $self->{layout}->size
803# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack
804# (
369 $self->{texture}{width}, 805# $self->{texture}{w},
370 $self->{texture}{height}, 806# $self->{texture}{h},
371 ) 807# )
808# } else {
809# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
810#
811# ($w, $h)
812# }
813}
814
815sub size_allocate {
816 my ($self, $w, $h) = @_;
817
818 return unless $self->{w} != $w || $self->{h} != $h;
819
820 $self->SUPER::size_allocate ($w, $h);
821 delete $self->{texture};
822}
823
824sub update {
825 my ($self) = @_;
826
827 delete $self->{texture};
828 $self->SUPER::update;
372} 829}
373 830
374sub _draw { 831sub _draw {
375 my ($self) = @_; 832 my ($self) = @_;
376 833
377 my $tex = $self->{texture}; 834 my $tex = $self->{texture} ||= do {
835 $self->{layout}->set_width ($self->{w});
836 new_from_layout CFClient::Texture $self->{layout};
837 };
378 838
379 glEnable GL_BLEND; 839 glEnable GL_BLEND;
380 glEnable GL_TEXTURE_2D; 840 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
383 glBindTexture GL_TEXTURE_2D, $tex->{name};
384 843
385 glColor 1, 1, 1, 0.8; 844 glColor @{$self->{fg}};
386 845
387 glBegin GL_QUADS; 846 my $x =
388 glTexCoord 0, 0; glVertex 0 , 0; 847 $self->{align} < 0 ? 0
389 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 848 : $self->{align} > 0 ? $self->{w} - $self->{texture}{w}
390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 849 : ($self->{w} + $self->{texture}{w}) * 0.5;
391 glTexCoord 1, 0; glVertex $tex->{width}, 0; 850
392 glEnd; 851 $tex->draw_quad ($x, 0);
393 852
394 glDisable GL_BLEND; 853 glDisable GL_BLEND;
395 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
396} 855}
397 856
857#############################################################################
858
398package Crossfire::Client::Widget::TextEntry; 859package CFClient::Widget::Entry;
399 860
400our @ISA = Crossfire::Client::Widget::Label::; 861our @ISA = CFClient::Widget::Label::;
401 862
402use SDL; 863use SDL;
403use SDL::OpenGL; 864use SDL::OpenGL;
404 865
866sub new {
867 my $class = shift;
868
869 $class->SUPER::new (
870 fg => [1, 1, 1],
871 bg => [0, 0, 0, 0.4],
872 active_bg => [1, 1, 1],
873 active_fg => [0, 0, 0],
874 @_
875 )
876}
877
878sub _set_text {
879 my ($self, $text) = @_;
880
881 $self->{last_activity} = $::NOW;
882
883 $self->{text} = $text;
884 $self->{layout}->set_width ($self->{w});
885
886 $text =~ s/./*/g if $self->{hidden};
887
888
889 $self->{layout}->set_markup ($self->escape_text ($text));
890
891 $text = substr $text, 0, $self->{cursor};
892 utf8::encode $text;
893
894 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
895}
896
897sub size_request {
898 my ($self) = @_;
899
900 my ($w, $h) = $self->SUPER::size_request;
901
902 ($w + 1, $h) # add 1 for cursor
903}
904
905sub size_allocate {
906 my ($self, $w, $h) = @_;
907
908 return unless $self->{w} != $w || $self->{h} != $h;
909
910 $self->SUPER::size_allocate ($w, $h);
911
912 $self->_set_text ($self->{text});
913}
914
915sub set_text {
916 my ($self, $text) = @_;
917
918 $self->{cursor} = length $text;
919 $self->_set_text ($text);
920 $self->update;
921}
922
405sub key_down { 923sub key_down {
406 my ($self, $ev) = @_; 924 my ($self, $ev) = @_;
407 925
408 my $mod = $ev->key_mod; 926 my $mod = $ev->key_mod;
409 my $sym = $ev->key_sym; 927 my $sym = $ev->key_sym;
410 928
411 $ev->set_unicode (1);
412 my $uni = $ev->key_unicode; 929 my $uni = $ev->key_unicode;
413 930
414 my $text = $self->get_text; 931 my $text = $self->get_text;
415 932
416 if ($sym == SDLK_BACKSPACE) { 933 if ($sym == SDLK_BACKSPACE) {
417 substr $text, -1, 1, ''; 934 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
418 935 } elsif ($sym == SDLK_DELETE) {
936 substr $text, $self->{cursor}, 1, "";
937 } elsif ($sym == SDLK_LEFT) {
938 --$self->{cursor} if $self->{cursor};
939 } elsif ($sym == SDLK_RIGHT) {
940 ++$self->{cursor} if $self->{cursor} < length $self->{text};
419 } elsif ($uni) { 941 } elsif ($uni) {
420 $text .= chr $uni; 942 substr $text, $self->{cursor}++, 0, chr $uni;
421 } 943 }
944
422 $self->set_text ($text); 945 $self->_set_text ($text);
946 $self->update;
423} 947}
424 948
949sub focus_in {
950 my ($self) = @_;
425 951
426# XXX: TextView isn't neccessary with pango multiline text rendering 952 $self->{last_activity} = $::NOW;
427package Crossfire::Client::Widget::TextView; 953
954 $self->SUPER::focus_in;
955}
956
957sub button_down {
958 my ($self, $ev, $x, $y) = @_;
959
960 $self->SUPER::button_down ($ev, $x, $y);
961
962 my $idx = $self->{layout}->xy_to_index ($x, $y);
963
964 # byte-index to char-index
965 my $text = $self->{layout};
966 utf8::encode $text;
967 $self->{cursor} = length substr $text, 0, $idx;
968
969 $self->_set_text ($self->{text});
970 $self->update;
971}
972
973sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_;
975# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
976}
977
978sub _draw {
979 my ($self) = @_;
980
981 local $self->{fg} = $self->{fg};
982
983 if ($FOCUS == $self) {
984 glColor @{$self->{active_bg}};
985 $self->{fg} = $self->{active_fg};
986 } else {
987 glColor @{$self->{bg}};
988 }
989
990 glBegin GL_QUADS;
991 glVertex 0 , 0;
992 glVertex 0 , $self->{h};
993 glVertex $self->{w}, $self->{h};
994 glVertex $self->{w}, 0;
995 glEnd;
996
997 $self->SUPER::_draw;
998
999 #TODO: force update every cursor change :(
1000 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1001 glColor @{$self->{fg}};
1002 glBegin GL_LINES;
1003 glVertex $self->{cur_x}, $self->{cur_y};
1004 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1005 glEnd;
1006 }
1007}
1008
1009#############################################################################
1010
1011package CFClient::Widget::Slider;
428 1012
429use strict; 1013use strict;
430
431our @ISA = qw/Crossfire::Client::Widget/;
432 1014
433use SDL::OpenGL; 1015use SDL::OpenGL;
434use SDL::OpenGL::Constants; 1016use SDL::OpenGL::Constants;
435 1017
1018our @ISA = CFClient::Widget::DrawBG::;
1019
1020sub size_request {
1021 my ($self) = @_;
1022
1023 my $w = 50;
1024 my $h = 10;
1025
1026 $self->{vertical} ? ($h, $w) : ($w, $h)
1027}
1028
436sub new { 1029sub new {
437 my ($class, $text, $h) = @_; 1030 my $class = shift;
1031
1032 # range [value, low, high, page]
1033
438 my $self = $class->SUPER::new (); 1034 $class->SUPER::new (
439 1035 fg => [1, 1, 1],
440 $self->{txt_height} = $h; 1036 active_fg => [0, 0, 0],
441 @{$self->{lines}} = split /\r?\n/, $text; 1037 range => [0, 0, 100, 10],
442 1038 vertical => 1,
443 for (split /\r?\n/, $text) { 1039 @_
444 $self->add_line ($_);
445 } 1040 )
446 $self
447} 1041}
448 1042
449#sub render_lines { 1043sub button_down {
1044 my ($self, $ev, $x, $y) = @_;
1045
1046 $self->SUPER::button_down ($ev, $x, $y);
1047 $self->mouse_motion ($ev, $x, $y);
1048}
1049
1050sub mouse_motion {
1051 my ($self, $ev, $x, $y) = @_;
1052
1053 if ($GRAB == $self) {
1054 my ($value, $lo, $hi, $page) = @{$self->{range}};
1055
1056 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1057
1058 $x = $x * ($hi - $lo) / $w + $lo;
1059 $x = $lo if $x < $lo;
1060 $x = $hi - $page if $x > $hi - $page;
1061 $self->{range}[0] = $x;
1062
1063 $self->emit (changed => $x);
1064 $self->update;
1065 }
1066}
1067
1068sub _draw {
450# my ($self) = @_; 1069 my ($self) = @_;
451# 1070
452# $self->{txt_lines} = []; 1071 $self->SUPER::_draw ();
453# 1072
454# for (@{$self->{lines}}) { 1073 my ($w, $h) = @$self{qw(w h)};
455# push @{$self->{txt_lines}}, 1074
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_; 1075 if ($self->{vertical}) {
1076 # draw a vertical slider like a rotated horizontal slider
1077
1078 glRotate 90, 0, 0, 1;
1079 glTranslate 0, -$self->{w}, 0;
1080
1081 ($w, $h) = ($h, $w);
457# } 1082 }
458#}
459 1083
460sub add_line { 1084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
461 my ($self, $line) = @_; 1085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
462 push @{$self->{lines}}, $line;
463 1086
464 push @{$self->{txt_lines}}, 1087 my ($value, $lo, $hi, $page) = @{$self->{range}};
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467 1088
468sub size_request { 1089 $page = int $page * $w / ($hi - $lo);
469 my ($self) = @_; 1090 $value = int +($value - $lo) * $w / ($hi - $lo);
470 1091
471 my $w = 0; 1092 $w -= $page;
472 my $h = 0; 1093 $page &= ~1;
1094 glTranslate $page * 0.5, 0, 0;
473 1095
474 for (@{$self->{txt_lines}}) { 1096 glColor @$fg;
475 if ($w < $_->{width}) { $w = $_->{width} } 1097 glBegin GL_LINES;
476 $h += $_->{height}; 1098 glVertex 0, 0; glVertex 0, $h;
477 } 1099 glVertex $w - 1, 0; glVertex $w - 1, $h;
1100 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1101 glEnd;
478 1102
479 return ($w, $h); 1103 my $knob_a = $value - $page * 0.5;
480} 1104 my $knob_b = $value + $page * 0.5;
481
482sub draw_line {
483 my ($self, $tex, $y) = @_;
484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488 1105
489 glBegin GL_QUADS; 1106 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y; 1107 glColor @$fg;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; 1108 glVertex $knob_a, 0;
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; 1109 glVertex $knob_a, $h;
493 glTexCoord 1, 0; glVertex $tex->{width}, $y; 1110 glVertex $knob_b, $h;
1111 glVertex $knob_b, 0;
1112
1113 if ($knob_a < $knob_b - 2) {
1114 glColor @$bg;
1115 glVertex $knob_a + 1, 1;
1116 glVertex $knob_a + 1, $h - 1;
1117 glVertex $knob_b - 1, $h - 1;
1118 glVertex $knob_b - 1, 1;
1119 }
494 glEnd; 1120 glEnd;
495} 1121}
496 1122
497sub _draw { 1123#############################################################################
498 my ($self) = @_;
499 1124
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
512}
513
514package Crossfire::Client::Widget::MapWidget; 1125package CFClient::Widget::MapWidget;
515 1126
516use strict; 1127use strict;
517 1128
518use List::Util qw(min max); 1129use List::Util qw(min max);
519 1130
520use SDL; 1131use SDL;
521use SDL::OpenGL; 1132use SDL::OpenGL;
522use SDL::OpenGL::Constants; 1133use SDL::OpenGL::Constants;
523 1134
524our @ISA = Crossfire::Client::Widget::; 1135our @ISA = CFClient::Widget::;
1136
1137sub new {
1138 my $class = shift;
1139
1140 $class->SUPER::new (
1141 z => -1,
1142 list => (glGenLists 1),
1143 @_
1144 )
1145}
525 1146
526sub key_down { 1147sub key_down {
527 print "MAPKEYDOWN\n"; 1148 print "MAPKEYDOWN\n";
528} 1149}
529 1150
530sub key_up { 1151sub key_up {
531} 1152}
532 1153
1154sub size_request {
1155 (
1156 1 + int $::WIDTH / 32,
1157 1 + int $::HEIGHT / 32,
1158 )
1159}
1160
1161sub update {
1162 my ($self) = @_;
1163
1164 $self->{need_update} = 1;
1165}
1166
533sub _draw { 1167sub _draw {
534 my ($self) = @_; 1168 my ($self) = @_;
535 1169
1170 if (delete $self->{need_update}) {
1171 glNewList $self->{list}, GL_COMPILE;
1172
536 my $mx = $::CONN->{mapx}; 1173 my $mx = $::CONN->{mapx};
537 my $my = $::CONN->{mapy}; 1174 my $my = $::CONN->{mapy};
538 1175
539 my $map = $::CONN->{map}; 1176 my $map = $::CONN->{map};
540 1177
541 my ($xofs, $yofs); 1178 my ($xofs, $yofs);
542 1179
543 my $sw = 1 + int $::WIDTH / 32; 1180 my $sw = 1 + int $::WIDTH / 32;
544 my $sh = 1 + int $::HEIGHT / 32; 1181 my $sh = 1 + int $::HEIGHT / 32;
545 1182
546 if ($::CONN->{mapw} > $sw) { 1183 if ($::CONN->{mapw} > $sw) {
547 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1184 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
548 } else { 1185 } else {
549 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1186 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
550 } 1187 }
551 1188
552 if ($::CONN->{maph} > $sh) { 1189 if ($::CONN->{maph} > $sh) {
553 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1190 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
554 } else { 1191 } else {
555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1192 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556 } 1193 }
557 1194
558 glEnable GL_TEXTURE_2D; 1195 glEnable GL_TEXTURE_2D;
559 glEnable GL_BLEND; 1196 glEnable GL_BLEND;
560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1197 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
561 1198
1199 my $sw4 = ($sw + 3) & ~3;
1200 my $darkness = "\x00" x ($sw4 * $sh);
1201
562 for my $x (0 .. $sw - 1) { 1202 for my $x (0 .. $sw - 1) {
1203 my $row = $map->[$x + $xofs];
563 for my $y (0 .. $sh - 1) { 1204 for my $y (0 .. $sh - 1) {
564 1205
565 my $cell = $map->[$x + $xofs][$y + $yofs] 1206 my $cell = $row->[$y + $yofs]
566 or next; 1207 or next;
567 1208
568 my $darkness = $cell->[0] * (1 / 255); 1209 my $dark = $cell->[0];
569 if ($darkness < 0) { 1210 if ($dark < 0) {
570 glColor 0.3, 0.3, 0.3; 1211 substr $darkness, $y * $sw4 + $x, 1, chr 224;
571 } else { 1212 } else {
572 glColor $darkness, $darkness, $darkness; 1213 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
573 } 1214 }
574 1215
575 for my $num (grep $_, @$cell[1,2,3]) { 1216 for my $num (grep $_, @$cell[1,2,3]) {
576 my $tex = $::CONN->{face}[$num]{texture} || next; 1217 my $tex = $::CONN->{face}[$num]{texture} || next;
1218
1219 my ($w, $h) = @$tex{qw(w h)};
577 1220
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1221 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
579
580 my $w = $tex->{width};
581 my $h = $tex->{height};
582
583 my $px = ($x + 1) * 32 - $w;
584 my $py = ($y + 1) * 32 - $h;
585
586 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex $px , $py;
588 glTexCoord 0, 1; glVertex $px , $py + $h;
589 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
590 glTexCoord 1, 0; glVertex $px + $w, $py;
591 glEnd; 1222 }
592 } 1223 }
593 } 1224 }
1225
1226# if (1) { # higher quality darkness
1227# $lighting =~ s/(.)/$1$1$1/gs;
1228# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1229#
1230# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1231#
1232# $lighting = $pb->get_pixels;
1233# $lighting =~ s/(.)../$1/gs;
594 } 1234# }
595 1235
1236 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1238
1239 $darkness = new CFClient::Texture
1240 width => $sw4,
1241 height => $sh,
1242 data => $darkness,
1243 internalformat => GL_ALPHA,
1244 format => GL_ALPHA;
1245
1246 glColor 0.45, 0.45, 0.45, 1;
1247 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1248
596 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
597 glDisable GL_BLEND; 1250 glDisable GL_BLEND;
1251
1252 glEndList;
1253 }
1254
1255 glCallList $self->{list};
598} 1256}
599 1257
600my %DIR = ( 1258my %DIR = (
601 SDLK_KP8, [1, "north"], 1259 SDLK_KP8, [1, "north"],
602 SDLK_KP9, [2, "northeast"], 1260 SDLK_KP9, [2, "northeast"],
… …
646 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1304 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
647 $::CONN->send ("command run_stop"); 1305 $::CONN->send ("command run_stop");
648 } 1306 }
649} 1307}
650 1308
6511; 1309#############################################################################
652 1310
1311package CFClient::Widget::Animator;
1312
1313use SDL::OpenGL;
1314
1315our @ISA = CFClient::Widget::Bin::;
1316
1317sub moveto {
1318 my ($self, $x, $y) = @_;
1319
1320 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
1321 $self->{speed} = 0.001;
1322 $self->{time} = 1;
1323
1324 ::animation_start $self;
1325}
1326
1327sub animate {
1328 my ($self, $interval) = @_;
1329
1330 $self->{time} -= $interval * $self->{speed};
1331 if ($self->{time} <= 0) {
1332 $self->{time} = 0;
1333 ::animation_stop $self;
1334 }
1335
1336 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
1337
1338 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
1339 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
1340}
1341
1342sub _draw {
1343 my ($self) = @_;
1344
1345 glPushMatrix;
1346 glRotate $self->{time} * 1000, 0, 1, 0;
1347 $self->{children}[0]->draw;
1348 glPopMatrix;
1349}
1350
1351#############################################################################
1352
1353package CFClient::Widget::Toplevel;
1354
1355our @ISA = CFClient::Widget::Container::;
1356
1357sub size_request {
1358 ($::WIDTH, $::HEIGHT)
1359}
1360
1361sub size_allocate {
1362 my ($self, $w, $h) = @_;
1363
1364 $self->SUPER::size_allocate ($w, $h);
1365
1366 $_->size_allocate ($_->size_request)
1367 for @{$self->{children}};
1368}
1369
1370sub translate {
1371 my ($self, $x, $y) = @_;
1372
1373 ($x, $y)
1374}
1375
1376sub update {
1377 my ($self) = @_;
1378
1379 $self->size_allocate ($self->size_request);
1380 ::refresh ();
1381}
1382
1383sub add {
1384 my ($self, $widget) = @_;
1385
1386 $self->SUPER::add ($widget);
1387
1388 $widget->size_allocate ($widget->size_request);
1389}
1390
1391sub draw {
1392 my ($self) = @_;
1393
1394 $self->_draw;
1395}
1396
1397#############################################################################
1398
1399package CFClient::Widget;
1400
1401$TOPLEVEL = new CFClient::Widget::Toplevel;
1402
14031
1404

Diff Legend

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