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.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

… …
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client;
11
10our $FOCUS; # the widget with current focus 12our $FOCUS; # the widget with current focus
11#our @ACTIVE_WIDGETS;
12 13
13# class methods for events 14# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { } 17sub feed_sdl_button_down_event { }
… …
20 my $class = shift; 21 my $class = shift;
21 22
22 bless { @_ }, $class 23 bless { @_ }, $class
23} 24}
24 25
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36
37sub move { 26sub move {
38 my ($self, $x, $y, $z) = @_; 27 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 28 $self->{x} = $x;
40 $self->{y} = $y; 29 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 30 $self->{z} = $z if defined $z;
… …
44sub needs_redraw { 33sub needs_redraw {
45 0 34 0
46} 35}
47 36
48sub size_request { 37sub size_request {
38 require Carp;
49 die "size_request is abtract"; 39 Carp::confess "size_request is abtract";
40}
41
42sub size_allocate {
43 my ($self, $w, $h) = @_;
44
45 $self->{w} = $w;
46 $self->{h} = $h;
50} 47}
51 48
52sub focus_in { 49sub focus_in {
53 my ($widget) = @_; 50 my ($widget) = @_;
54 $FOCUS = $widget; 51 $FOCUS = $widget;
… …
72 69
73sub button_up { 70sub button_up {
74 my ($widget, $sdlev) = @_; 71 my ($widget, $sdlev) = @_;
75} 72}
76 73
77sub w { $_[0]->{w} } 74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 79
83sub draw { 80sub draw {
… …
88 $self->_draw; 85 $self->_draw;
89 glPopMatrix; 86 glPopMatrix;
90} 87}
91 88
92sub _draw { 89sub _draw {
93 my ($widget) = @_; 90 my ($self) = @_;
91
92 warn "no draw defined for $self\n";
94} 93}
95 94
96sub bbox { 95sub bbox {
97 my ($self) = @_; 96 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 97 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 101 $self->{x} = $w,
103 $self->{y} = $h 102 $self->{y} = $h
104 ) 103 )
105} 104}
106 105
106sub find_widget {
107 my ($self, $x, $y) = @_;
108
109 return $self
110 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112
113 ()
114}
115
107sub del_parent { $_[0]->{parent} = undef } 116sub del_parent { $_[0]->{parent} = undef }
108 117
109sub set_parent { 118sub set_parent {
110 my ($self, $par) = @_; 119 my ($self, $par) = @_;
111 120
… …
128 my ($self) = @_; 137 my ($self) = @_;
129 138
130 #$self->deactivate; 139 #$self->deactivate;
131} 140}
132 141
142#############################################################################
143
133package Crossfire::Client::Widget::Container; 144package Crossfire::Client::Widget::Container;
134 145
135our @ISA = Crossfire::Client::Widget::; 146our @ISA = Crossfire::Client::Widget::;
136 147
148sub new {
149 my ($class, @widgets) = @_;
150
151 my $self = $class->SUPER::new (children => []);
152 $self->add ($_) for @widgets;
153
154 $self
155}
156
157sub add {
158 my ($self, $chld, $expand) = @_;
159
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self);
162
163 @{$self->{children}} =
164 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld;
166
167 $self->size_allocate ($self->{w}, $self->{h})
168 if $self->{w}; #TODO: check for "realised state"
169}
170
171sub remove {
172 my ($self, $widget) = @_;
173
174 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
175
176 $self->size_allocate ($self->{w}, $self->{h});
177}
178
179sub find_widget {
180 my ($self, $x, $y) = @_;
181
182 my $res;
183
184 for (@{ $self->{children} }) {
185 $res = $_->find_widget ($x, $y)
186 and return $res;
187 }
188
189 ()
190}
191
192sub _draw {
193 my ($self) = @_;
194
195 $_->draw for @{$self->{children}};
196}
197
198#############################################################################
199
200package Crossfire::Client::Widget::Bin;
201
202our @ISA = Crossfire::Client::Widget::Container::;
203
204sub child { $_[0]->{children}[0] }
205
206sub size_request {
207 $_[0]{children}[0]->size_request if $_[0]{children}[0];
208}
209
210sub size_allocate {
211 my ($self, $w, $h) = @_;
212
213 $self->SUPER::size_allocate ($w, $h);
214 $self->{children}[0]->size_allocate ($w, $h)
215 if $self->{children}[0]
216}
217
218#############################################################################
219
220package Crossfire::Client::Widget::Toplevel;
221
222our @ISA = Crossfire::Client::Widget::Container::;
223
224sub update {
225 my ($self) = @_;
226
227 ::refresh ();
228}
229
230sub add {
231 my ($self, $widget) = @_;
232
233 $self->SUPER::add ($widget);
234
235 $widget->size_allocate ($widget->size_request);
236}
237
238#############################################################################
239
240package Crossfire::Client::Widget::Window;
241
242our @ISA = Crossfire::Client::Widget::Bin::;
243
137use SDL::OpenGL; 244use SDL::OpenGL;
138 245
139sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 246sub new {
140sub get { $_[0]->{child} } 247 my ($class, $x, $y, $z, $w, $h) = @_;
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 248
147sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 249 my $self = $class->SUPER::new;
148 250
149sub _draw { die "Containers can't be drawn!" } 251 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
150
151package Crossfire::Client::Widget::Toplevel;
152
153our @ISA = Crossfire::Client::Widget::;
154
155use SDL::OpenGL;
156
157sub add {
158 my ($self, $chld) = @_;
159
160 push @{$self->{childs}}, $chld;
161 @{$self->{childs}} =
162 sort { $a->{z} <=> $b->{z} }
163 @{$self->{childs}};
164
165 $chld->set_parent ($self);
166}
167
168sub remove {
169 my ($self, $chld) = @_;
170 @{$self->{childs}} =
171 sort { $a->{z} <=> $b->{z} }
172 grep { $_ && $_ != $_[0] }
173 @{$self->{childs}}
174} 252}
175 253
176sub update { 254sub update {
177 my ($self) = @_; 255 my ($self) = @_;
178 ::refresh ();
179}
180 256
181sub _draw {
182 my ($self) = @_;
183
184 $_->draw for @{$self->{childs}};
185}
186
187package Crossfire::Client::Widget::Window;
188
189our @ISA = Crossfire::Client::Widget::Container::;
190
191use SDL::OpenGL;
192
193sub add {
194 my ($self, $chld) = @_;
195 $self->SUPER::add ($chld);
196 $chld->set_parent ($self);
197 $self->update; #TODO: Move this to the size_request event propably?
198}
199
200sub remove {
201 my ($self) = @_;
202 # TODO FIXME: removing a child from a window will crash, see render_chld
203 $self->update;
204}
205
206sub update {
207 my ($self) = @_;
208 $self->render_chld; 257 $self->render_chld;
258 $self->SUPER::update;
209} 259}
210 260
211sub render_chld { 261sub render_chld {
212 my ($self) = @_; 262 my ($self) = @_;
213 my $chld = $self->get;
214 my ($w, $h) = $self->size_request;
215 263
216 $self->{texture} = 264 $self->{texture} =
217 Crossfire::Client::Texture->new_from_opengl ( 265 Crossfire::Client::Texture->new_from_opengl (
218 $w, $h, sub { $chld->draw } 266 $self->{w}, $self->{h}, sub { $self->child->draw }
219 ); 267 );
220 $self->{texture}->upload;
221} 268}
222 269
223sub size_request { 270sub size_allocate {
224 my ($self) = @_; 271 my ($self, $w, $h) = @_;
225 my $chld = $self->get 272
226 or return (0, 0); 273 $self->{w} = $w;
227 $chld->size_request 274 $self->{h} = $h;
275
276 $self->child->size_allocate ($w, $h);
277
278 $self->render_chld;
228} 279}
229 280
230sub _draw { 281sub _draw {
231 my ($self) = @_; 282 my ($self) = @_;
232 283
233 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 284 my ($w, $h) = ($self->w, $self->h);
234 285
235 my $tex = $self->{texture} 286 my $tex = $self->{texture}
236 or return; 287 or return;
237 288
238 glEnable GL_BLEND; 289 glEnable GL_BLEND;
239 glEnable GL_TEXTURE_2D; 290 glEnable GL_TEXTURE_2D;
240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241 glBindTexture GL_TEXTURE_2D, $tex->{name}; 292 glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243 glColor 1, 0, 1;
244 293
245 glBegin GL_QUADS; 294 glBegin GL_QUADS;
246 glTexCoord 0, 0; glVertex 0, 0; 295 glTexCoord 0, 0; glVertex 0, 0;
247 glTexCoord 0, 1; glVertex 0, $h; 296 glTexCoord 0, 1; glVertex 0, $h;
248 glTexCoord 1, 1; glVertex $w, $h; 297 glTexCoord 1, 1; glVertex $w, $h;
… …
251 300
252 glDisable GL_BLEND; 301 glDisable GL_BLEND;
253 glDisable GL_TEXTURE_2D; 302 glDisable GL_TEXTURE_2D;
254} 303}
255 304
305#############################################################################
306
256package Crossfire::Client::Widget::Frame; 307package Crossfire::Client::Widget::Frame;
257 308
258our @ISA = Crossfire::Client::Widget::Container::; 309our @ISA = Crossfire::Client::Widget::Bin::;
259 310
260use SDL::OpenGL; 311use SDL::OpenGL;
261 312
262sub size_request { 313sub size_request {
263 my ($self) = @_; 314 my ($self) = @_;
264 my $chld = $self->get 315 my $chld = $self->child
265 or return (0, 0); 316 or return (0, 0);
266 317
267 $chld->move (2, 2); 318 $chld->move (2, 2);
268 319
269 map { $_ + 4 } $chld->size_request; 320 map { $_ + 4 } $chld->size_request;
270} 321}
271 322
323sub size_allocate {
324 my ($self, $w, $h) = @_;
325
326 $self->{w} = $w;
327 $self->{h} = $h;
328
329 $self->child->size_allocate ($w - 4, $h - 4);
330 $self->child->move (2, 2);
331}
332
272sub _draw { 333sub _draw {
273 my ($self) = @_; 334 my ($self) = @_;
274 335
275 my $chld = $self->get; 336 my $chld = $self->child;
276 337
277 my ($w, $h) = $chld->size_request; 338 my ($w, $h) = $chld->size_request;
278 339
279 glBegin GL_QUADS; 340 glBegin GL_QUADS;
280 glColor 0, 0, 0; 341 glColor 0, 0, 0;
… …
285 glEnd; 346 glEnd;
286 347
287 $chld->draw; 348 $chld->draw;
288} 349}
289 350
351#############################################################################
352
290package Crossfire::Client::Widget::FancyFrame; 353package Crossfire::Client::Widget::FancyFrame;
291 354
292our @ISA = Crossfire::Client::Widget::Frame::; 355our @ISA = Crossfire::Client::Widget::Bin::;
293 356
294use SDL::OpenGL; 357use SDL::OpenGL;
295 358
296sub new { 359my @tex =
297 my ($self, $theme) = @_;
298 $self = $self->SUPER::new;
299
300 $self->{txts} = [
301 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 360 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
302 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 361 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
303 ];
304 $self
305
306}
307 362
308sub size_request { 363sub size_request {
309 my ($self) = @_; 364 my ($self) = @_;
365
310 my ($w, $h) = $self->get->size_request; 366 my ($w, $h) = $self->SUPER::size_request;
311 367
312 $h += $self->{txts}->[1]->{height}; 368 $h += $tex[1]->{height};
313 $h += $self->{txts}->[4]->{height}; 369 $h += $tex[4]->{height};
314 $w += $self->{txts}->[2]->{width}; 370 $w += $tex[2]->{width};
315 $w += $self->{txts}->[3]->{width}; 371 $w += $tex[3]->{width};
316
317 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
318 372
319 ($w, $h) 373 ($w, $h)
320} 374}
321 375
376sub size_allocate {
377 my ($self, $w, $h) = @_;
378
379 $self->SUPER::size_allocate ($w, $h);
380
381 $h -= $tex[1]->{height};
382 $h -= $tex[4]->{height};
383 $w -= $tex[2]->{width};
384 $w -= $tex[3]->{width};
385
386 $h = $h < 0 ? 0 : $h;
387 $w = $w < 0 ? 0 : $w;
388
389 $self->child->size_allocate ($w, $h);
390 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
391}
392
322sub _draw { 393sub _draw {
323 my ($self) = @_; 394 my ($self) = @_;
324 395
325 my ($w, $h) = $self->size_request; 396 my ($w, $h) = ($self->{w}, $self->{h});
326 my ($cw, $ch) = $self->get->size_request; 397 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
327 398
328 glEnable GL_BLEND; 399 glEnable GL_BLEND;
329 glEnable GL_TEXTURE_2D; 400 glEnable GL_TEXTURE_2D;
330 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 402 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
332 403
333
334 my $top = $self->{txts}->[1]; 404 my $top = $tex[1];
335 glBindTexture GL_TEXTURE_2D, $top->{name}; 405 glBindTexture GL_TEXTURE_2D, $top->{name};
336 406
337 glColor 1, 1, 1, 0.8;
338
339 glBegin GL_QUADS; 407 glBegin GL_QUADS;
340 glTexCoord 0, 0; glVertex 0 , 0; 408 glTexCoord 0, 0; glVertex 0 , 0;
341 glTexCoord 0, 1; glVertex 0 , $top->{height}; 409 glTexCoord 0, 1; glVertex 0 , $top->{height};
342 glTexCoord 1, 1; glVertex $w , $top->{height}; 410 glTexCoord 1, 1; glVertex $w , $top->{height};
343 glTexCoord 1, 0; glVertex $w , 0; 411 glTexCoord 1, 0; glVertex $w , 0;
344 glEnd; 412 glEnd;
345 413
346 my $left = $self->{txts}->[3]; 414 my $left = $tex[3];
347 glBindTexture GL_TEXTURE_2D, $left->{name}; 415 glBindTexture GL_TEXTURE_2D, $left->{name};
348 416
349 glColor 1, 1, 1, 0.8;
350
351 glBegin GL_QUADS; 417 glBegin GL_QUADS;
352 glTexCoord 0, 0; glVertex 0 , $top->{height}; 418 glTexCoord 0, 0; glVertex 0 , $top->{height};
353 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 419 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
354 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 420 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
355 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 421 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
356 glEnd; 422 glEnd;
357 423
358 my $right = $self->{txts}->[2]; 424 my $right = $tex[2];
359 glBindTexture GL_TEXTURE_2D, $right->{name}; 425 glBindTexture GL_TEXTURE_2D, $right->{name};
360 426
361 glColor 1, 1, 1, 0.8;
362
363 glBegin GL_QUADS; 427 glBegin GL_QUADS;
364 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 428 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
365 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 429 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
366 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 430 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
367 glTexCoord 1, 0; glVertex $w , $top->{height}; 431 glTexCoord 1, 0; glVertex $w , $top->{height};
368 glEnd; 432 glEnd;
369 433
370 my $bottom = $self->{txts}->[4]; 434 my $bottom = $tex[4];
371 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 435 glBindTexture GL_TEXTURE_2D, $bottom->{name};
372 436
373 glColor 1, 1, 1, 0.8;
374
375 glBegin GL_QUADS; 437 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 438 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
377 glTexCoord 0, 1; glVertex 0 , $h; 439 glTexCoord 0, 1; glVertex 0 , $h;
378 glTexCoord 1, 1; glVertex $w , $h; 440 glTexCoord 1, 1; glVertex $w , $h;
379 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 441 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
380 glEnd; 442 glEnd;
381 443
382 my $bg = $self->{txts}->[0]; 444 my $bg = $tex[0];
383 glBindTexture GL_TEXTURE_2D, $bg->{name}; 445 glBindTexture GL_TEXTURE_2D, $bg->{name};
446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
384 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 447 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
385 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 448 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
386 449
387 glColor 1, 1, 1, 0.8;
388
389 my $rep_x = $cw / $bg->{width}; 450 my $rep_x = $cw / $bg->{width};
390 my $rep_y = $ch / $bg->{height}; 451 my $rep_y = $ch / $bg->{height};
391 452
392 glBegin GL_QUADS; 453 glBegin GL_QUADS;
393 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 454 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
394 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 455 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
395 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 456 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
396 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 457 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
397 glEnd; 458 glEnd;
398
399 $self->get->draw;
400 459
401 glDisable GL_BLEND; 460 glDisable GL_BLEND;
402 glDisable GL_TEXTURE_2D; 461 glDisable GL_TEXTURE_2D;
462
463 $self->child->draw;
464
403} 465}
466
467#############################################################################
404 468
405package Crossfire::Client::Widget::Table; 469package Crossfire::Client::Widget::Table;
406 470
407our @ISA = Crossfire::Client::Widget::Container::; 471our @ISA = Crossfire::Client::Widget::Bin::;
408 472
409use SDL::OpenGL; 473use SDL::OpenGL;
410 474
411sub add { 475sub add {
412 my ($self, $x, $y, $chld) = @_; 476 my ($self, $x, $y, $chld) = @_;
413 my $old_chld = $self->{childs}[$y][$x]; 477 my $old_chld = $self->{children}[$y][$x];
414 478
415 $self->{childs}[$y][$x] = $chld; 479 $self->{children}[$y][$x] = $chld;
416 $chld->set_parent ($self); 480 $chld->set_parent ($self);
417 $self->update; 481 $self->update;
418} 482}
419 483
420sub max_row_height { 484sub max_row_height {
421 my ($self, $row) = @_; 485 my ($self, $row) = @_;
422 486
423 my $hs = 0; 487 my $hs = 0;
424 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 488 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
425 my $c = $self->{childs}->[$row]->[$xi]; 489 my $c = $self->{children}->[$row]->[$xi];
426 if ($c) { 490 if ($c) {
427 my ($w, $h) = $c->size_request; 491 my ($w, $h) = $c->size_request;
428 if ($hs < $h) { $hs = $h } 492 if ($hs < $h) { $hs = $h }
429 } 493 }
430 } 494 }
… …
433 497
434sub max_col_width { 498sub max_col_width {
435 my ($self, $col) = @_; 499 my ($self, $col) = @_;
436 500
437 my $ws = 0; 501 my $ws = 0;
438 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 502 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
439 my $c = ($self->{childs}->[$yi] || [])->[$col]; 503 my $c = ($self->{children}->[$yi] || [])->[$col];
440 if ($c) { 504 if ($c) {
441 my ($w, $h) = $c->size_request; 505 my ($w, $h) = $c->size_request;
442 if ($ws < $w) { $ws = $w } 506 if ($ws < $w) { $ws = $w }
443 } 507 }
444 } 508 }
… …
448sub size_request { 512sub size_request {
449 my ($self) = @_; 513 my ($self) = @_;
450 514
451 my ($hs, $ws) = (0, 0); 515 my ($hs, $ws) = (0, 0);
452 516
453 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 517 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
454 $hs += $self->max_row_height ($yi); 518 $hs += $self->max_row_height ($yi);
455 } 519 }
456 520
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 521 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 my $wm = 0; 522 my $wm = 0;
459 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 523 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
460 $wm += $self->max_col_width ($xi) 524 $wm += $self->max_col_width ($xi)
461 } 525 }
462 if ($ws < $wm) { $ws = $wm } 526 if ($ws < $wm) { $ws = $wm }
463 } 527 }
464 528
… …
467 531
468sub _draw { 532sub _draw {
469 my ($self) = @_; 533 my ($self) = @_;
470 534
471 my $y = 0; 535 my $y = 0;
472 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
473 my $x = 0; 537 my $x = 0;
474 538
475 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
476 540
477 my $c = $self->{childs}->[$yi]->[$xi]; 541 my $c = $self->{children}->[$yi]->[$xi];
478 if ($c) { 542 if ($c) {
479 $c->move ($x, $y, 0); #TODO: Move to size_request 543 $c->move ($x, $y, 0); #TODO: Move to size_request
480 $c->draw if $c; 544 $c->draw if $c;
481 } 545 }
482 546
… …
485 549
486 $y += $self->max_row_height ($yi); 550 $y += $self->max_row_height ($yi);
487 } 551 }
488} 552}
489 553
554#############################################################################
555
490package Crossfire::Client::Widget::VBox; 556package Crossfire::Client::Widget::VBox;
491 557
492our @ISA = Crossfire::Client::Widget::Container::; 558our @ISA = Crossfire::Client::Widget::Container::;
493 559
494use SDL::OpenGL; 560use SDL::OpenGL;
495 561
496sub add {
497 my ($self, $chld) = @_;
498 push @{$self->{childs}}, $chld;
499 $chld->set_parent ($self);
500 $self->update;
501}
502
503sub size_request { 562sub size_request {
504 my ($self) = @_; 563 my ($self) = @_;
505 564
506 my ($hs, $ws) = (0, 0); 565 my @alloc = map [$_->size_request], @{$self->{children}};
566
567 (
568 (List::Util::max map $_->[0], @alloc),
569 (List::Util::sum map $_->[1], @alloc),
570 )
571}
572
573sub size_allocate {
574 my ($self, $w, $h) = @_;
575
576 $self->w ($w);
577 $self->h ($h);
578
579 my $exp;
580 my @oth;
581 # find expand widget
507 for (@{$self->{childs} || []}) { 582 for (@{$self->{children}}) {
583 if ($_->{expand}) {
584 $exp = $_;
585 last;
586 }
587 push @oth, $_;
588 }
589
590 my ($ow, $oh);
591
592 # get sizes of other widgets
593 for (@oth) {
508 my ($w, $h) = $_->size_request; 594 my ($w, $h) = $_->size_request;
509 $hs += $h; 595 $oh += $h;
510 if ($ws < $w) { $ws = $w } 596 if ($ow < $w) { $ow = $w }
511 } 597 }
512 598
513 return ($ws, $hs); 599 my $y = 0;
514}
515
516sub _draw {
517 my ($self) = @_;
518
519 my ($x, $y);
520 for (@{$self->{childs} || []}) { 600 for (@{$self->{children}}) {
521 $_->move (0, $y, 0); #TODO: move to size_request 601 $_->move (0, $y);
522 $_->draw; 602
603 if ($_ == $exp) {
604 $_->size_allocate ($w, $h - $oh);
605 $y += $h - $oh;
606 } else {
523 my ($w, $h) = $_->size_request; 607 my ($cw, $h) = $_->size_request;
608 $_->size_allocate ($w, $h);
524 $y += $h; 609 $y += $h;
610 }
525 } 611 }
526} 612}
613
614#############################################################################
527 615
528package Crossfire::Client::Widget::Label; 616package Crossfire::Client::Widget::Label;
529 617
530our @ISA = Crossfire::Client::Widget::; 618our @ISA = Crossfire::Client::Widget::;
531 619
… …
575 glEnable GL_TEXTURE_2D; 663 glEnable GL_TEXTURE_2D;
576 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 666 glBindTexture GL_TEXTURE_2D, $tex->{name};
579 667
580 glColor 1, 1, 1, 0.6; # TODO color 668 glColor 1, 0, 0, 1; # TODO color
581 669
582 glBegin GL_QUADS; 670 glBegin GL_QUADS;
583 glTexCoord 0, 0; glVertex 0 , 0; 671 glTexCoord 0, 0; glVertex 0 , 0;
584 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
585 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
588 676
589 glDisable GL_BLEND; 677 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
591} 679}
592 680
681#############################################################################
682
593package Crossfire::Client::Widget::TextEntry; 683package Crossfire::Client::Widget::TextEntry;
594 684
595our @ISA = Crossfire::Client::Widget::Label::; 685our @ISA = Crossfire::Client::Widget::Label::;
596 686
597use SDL; 687use SDL;
… …
615 $text .= chr $uni; 705 $text .= chr $uni;
616 } 706 }
617 $self->set_text ($text); 707 $self->set_text ($text);
618} 708}
619 709
620 710#############################################################################
621# XXX: TextView isn't neccessary with pango multiline text rendering
622package Crossfire::Client::Widget::TextView;
623
624use strict;
625
626our @ISA = qw/Crossfire::Client::Widget/;
627
628use SDL::OpenGL;
629use SDL::OpenGL::Constants;
630
631sub new {
632 my ($class, $text, $h) = @_;
633 my $self = $class->SUPER::new ();
634
635 $self->{txt_height} = $h;
636 @{$self->{lines}} = split /\r?\n/, $text;
637
638 for (split /\r?\n/, $text) {
639 $self->add_line ($_);
640 }
641 $self
642}
643
644#sub render_lines {
645# my ($self) = @_;
646#
647# $self->{txt_lines} = [];
648#
649# for (@{$self->{lines}}) {
650# push @{$self->{txt_lines}},
651# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
652# }
653#}
654
655sub add_line {
656 my ($self, $line) = @_;
657 push @{$self->{lines}}, $line;
658
659 push @{$self->{txt_lines}},
660 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
661}
662
663sub size_request {
664 my ($self) = @_;
665
666 my $w = 0;
667 my $h = 0;
668
669 for (@{$self->{txt_lines}}) {
670 if ($w < $_->{width}) { $w = $_->{width} }
671 $h += $_->{height};
672 }
673
674 return ($w, $h);
675}
676
677sub draw_line {
678 my ($self, $tex, $y) = @_;
679
680 glBindTexture GL_TEXTURE_2D, $tex->{name};
681
682 glColor 1, 0, 1;
683
684 glBegin GL_QUADS;
685 glTexCoord 0, 0; glVertex 0 , $y;
686 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
687 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
688 glTexCoord 1, 0; glVertex $tex->{width}, $y;
689 glEnd;
690}
691
692sub _draw {
693 my ($self) = @_;
694
695 glEnable GL_BLEND;
696 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
698
699 my $l = 0;
700 for (@{$self->{txt_lines}}) {
701 $self->draw_line ($_, $l);
702 $l += $_->{height};
703 }
704
705 glDisable GL_BLEND;
706 glDisable GL_TEXTURE_2D;
707}
708 711
709package Crossfire::Client::Widget::MapWidget; 712package Crossfire::Client::Widget::MapWidget;
710 713
711use strict; 714use strict;
712 715
… …
721sub key_down { 724sub key_down {
722 print "MAPKEYDOWN\n"; 725 print "MAPKEYDOWN\n";
723} 726}
724 727
725sub key_up { 728sub key_up {
729}
730
731sub size_request {
732
733}
734
735sub size_allocate {
726} 736}
727 737
728sub _draw { 738sub _draw {
729 my ($self) = @_; 739 my ($self) = @_;
730 740
… …
750 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 760 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
751 } 761 }
752 762
753 glEnable GL_TEXTURE_2D; 763 glEnable GL_TEXTURE_2D;
754 glEnable GL_BLEND; 764 glEnable GL_BLEND;
755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
766
767 my $sw4 = ($sw + 3) & ~3;
768 my $lighting = "\x00" x ($sw4 * $sh);
756 769
757 for my $x (0 .. $sw - 1) { 770 for my $x (0 .. $sw - 1) {
758 for my $y (0 .. $sh - 1) { 771 for my $y (0 .. $sh - 1) {
759 772
760 my $cell = $map->[$x + $xofs][$y + $yofs] 773 my $cell = $map->[$x + $xofs][$y + $yofs]
761 or next; 774 or next;
762 775
763 my $darkness = $cell->[0] * (1 / 255); 776 my $darkness = $cell->[0] * (1 / 255);
764 if ($darkness < 0) { 777 if ($darkness < 0) {
765 glColor 0.3, 0.3, 0.3; 778 $darkness = 0.15;
766 } else {
767 glColor $darkness, $darkness, $darkness;
768 } 779 }
780 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
769 781
770 for my $num (grep $_, @$cell[1,2,3]) { 782 for my $num (grep $_, @$cell[1,2,3]) {
771 my $tex = $::CONN->{face}[$num]{texture} || next; 783 my $tex = $::CONN->{face}[$num]{texture} || next;
772 784
773 glBindTexture GL_TEXTURE_2D, $tex->{name}; 785 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
785 glTexCoord 1, 0; glVertex $px + $w, $py; 797 glTexCoord 1, 0; glVertex $px + $w, $py;
786 glEnd; 798 glEnd;
787 } 799 }
788 } 800 }
789 } 801 }
802
803# if (1) { # higher quality darkness
804# $lighting =~ s/(.)/$1$1$1/gs;
805# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
806#
807# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
808#
809# $lighting = $pb->get_pixels;
810# $lighting =~ s/(.)../$1/gs;
811# }
812
813 $lighting = new Crossfire::Client::Texture
814 width => $sw4,
815 height => $sh,
816 data => $lighting,
817 internalformat => GL_ALPHA4,
818 format => GL_ALPHA;
819
820 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
821 glColor 0, 0, 0, 0.75;
822 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823 glBindTexture GL_TEXTURE_2D, $lighting->{name};
824 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825 glBegin GL_QUADS;
826 glTexCoord 0, 0; glVertex 0 , 0;
827 glTexCoord 0, 1; glVertex 0 , $sh * 32;
828 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830 glEnd;
790 831
791 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
792 glDisable GL_BLEND; 833 glDisable GL_BLEND;
793} 834}
794 835
… …
841 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 882 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
842 $::CONN->send ("command run_stop"); 883 $::CONN->send ("command run_stop");
843 } 884 }
844} 885}
845 886
887#############################################################################
888
889package Crossfire::Client::Widget::Animator;
890
891use SDL::OpenGL;
892
893our @ISA = Crossfire::Client::Widget::Bin::;
894
895sub moveto {
896 my ($self, $x, $y) = @_;
897
898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899 $self->{speed} = 0.2;
900 $self->{time} = 1;
901
902 ::animation_start $self;
903}
904
905sub animate {
906 my ($self, $interval) = @_;
907
908 $self->{time} -= $interval * $self->{speed};
909 if ($self->{time} <= 0) {
910 $self->{time} = 0;
911 ::animation_stop $self;
912 }
913
914 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
915
916 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
917 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
918}
919
920sub _draw {
921 my ($self) = @_;
922
923 glPushMatrix;
924 glRotate $self->{time} * 10000, 0, 1, 0;
925 $self->{children}[0]->draw;
926 glPopMatrix;
927}
928
8461; 9291;
847 930

Diff Legend

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