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

Diff Legend

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