Changeset 20085

Show
Ignore:
Timestamp:
05/01/07 21:01:39 (2 years ago)
Author:
patrick
Message:

MFT: Renamed the display_system config element property x11_pipes to pipes.

This is done in an effort to break the tight connection between the
display system configuration and the X Window System. With this change,
the Cocoa code can now handle multi-pipe configurations by interpreting
the pipe identifiers in the display system configruation as an index
into the array of available screens. No special handling is being done
for multiple monitors on Windows (yet).

This merges r20021 and r20024.

Rolled the Gadgeteer version to 1.1.27 and the VR Juggler version to 2.1.24.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/modules/gadgeteer/ChangeLog

    r20015 r20085  
    11DATE        AUTHOR      CHANGE 
    22----------- ----------- ------------------------------------------------------- 
     3May-01-2007 patrick     Renamed the x11_pipes property of the display_system 
     4                        config element to pipes. 
     5                        NEW VERSION: 1.1.27 
    36Apr-27-2007 aronb       Changed clustering to be single-threaded. 
    47                        NEW VERSION: 1.1.26 

  • juggler/branches/2.2/modules/gadgeteer/VERSION

    r20015 r20085  
     11.1.27-0 @05/02/2007 02:00:00 UTC@ 
    121.1.26-0 @04/28/2007 14:15:00 UTC@ 
    231.1.25-0 @03/04/2007 05:20:00 UTC@ 

  • juggler/branches/2.2/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowCocoa.mm

    r19865 r20085  
    4545#include <jccl/Config/ConfigElement.h> 
    4646 
     47#include <gadget/InputManager.h> 
    4748#include <gadget/Util/Debug.h> 
    4849 
    …… 
    169170   mY = e->getProperty<float>("origin", 1); 
    170171 
    171    // TODO: We could use the display_number property to choose the NSScreen 
    172    // where this window will be opened. We could even have the display_system 
    173    // pipe identifiers correlate to NSScreen instances so that we continue to 
    174    // have the same level of indirection that is supposed with X11. 
    175 /* 
     172   // Use the display_number property to choose the NSScreen where this window 
     173   // will be opened. The display_system pipe identifiers for Cocoa correlate 
     174   // to NSScreen instances so that we continue to have the same level of 
     175   // indirection that is supported with X11. 
    176176   const int screen_num = e->getProperty<int>("display_number"); 
    177177 
    …… 
    192192   } 
    193193 
    194    if ( screen_num >= 0 ) 
     194   if ( screen_num >= 0 && screen_num < disp_sys_elt->getNum("pipes") ) 
    195195   { 
    196196      mScreen = disp_sys_elt->getProperty<unsigned int>("pipes", screen_num); 
    197197 
    198       NSArray* screens = [NSArray screens]; 
     198      NSArray* screens = [NSScreen screens]; 
    199199      if ( mScreen >= [screens count] ) 
    200200      { 
    …… 
    203203 
    204204      vprDEBUG(gadgetDBG_INPUT_MGR, vprDBG_CONFIG_LVL) 
    205          << "[gadget::InputWindowCocoa] Screen: " << mXDisplayString 
     205         << "[gadget::InputWindowCocoa::config()] Screen: " << mScreen 
    206206         << std::endl << vprDEBUG_FLUSH; 
    207207   } 
    …… 
    210210      mScreen = 0; 
    211211   } 
    212 */ 
    213212 
    214213   return true; 

  • juggler/branches/2.2/modules/gadgeteer/gadget/Devices/KeyboardMouseDevice/InputWindowXWin.cpp

    r19829 r20085  
    104104   if (NULL == disp_sys_elt.get()) 
    105105   { 
    106       vprDEBUG(vprDBG_ERROR,vprDBG_CONFIG_LVL) 
    107          << clrOutNORM(clrRED,"ERROR") 
    108          << ": gadget::InputWindowXWin: display_system element is NULL.\n" 
    109          << vprDEBUG_FLUSH; 
     106      vprDEBUG(vprDBG_ERROR, vprDBG_CONFIG_LVL) 
     107         << clrOutNORM(clrRED, "ERROR") 
     108         << ": [gadget::InputWindowXWin::config()] display_system element " 
     109         << "is NULL.\n" << vprDEBUG_FLUSH; 
    110110      return false; 
    111111   } 
    112112 
    113     
    114    if ((x_disp_num >= 0) && (disp_sys_elt.get() != NULL) ) 
    115    { 
    116       mXDisplayString = disp_sys_elt->getProperty<std::string>("x11_pipes", 
     113   if ( x_disp_num >= 0 && disp_sys_elt.get() != NULL ) 
     114   { 
     115      if ( disp_sys_elt->getVersion() < 3 ) 
     116      { 
     117         vprDEBUG(gadgetDBG_INPUT_MGR, vprDBG_WARNING_LVL) 
     118            << clrOutBOLD(clrYELLOW, "WARNING") << ": Display system element '" 
     119            << disp_sys_elt->getName() << "'" << std::endl; 
     120         vprDEBUG_NEXTnl(gadgetDBG_INPUT_MGR, vprDBG_WARNING_LVL) 
     121            << "         is out of date.\n"; 
     122         vprDEBUG_NEXTnl(gadgetDBG_INPUT_MGR, vprDBG_WARNING_LVL) 
     123            << "         Expected version 3 but found version " 
     124            << disp_sys_elt->getVersion() << ".  Pipe\n"; 
     125         vprDEBUG_NEXTnl(gadgetDBG_INPUT_MGR, vprDBG_WARNING_LVL) 
     126            << "         configurations will not work.\n" << vprDEBUG_FLUSH; 
     127      } 
     128 
     129      mXDisplayString = disp_sys_elt->getProperty<std::string>("pipes", 
    117130                                                               x_disp_num); 
    118131       
    119132      vprDEBUG(gadgetDBG_INPUT_MGR, vprDBG_CONFIG_LVL) 
    120          << "gadget::InputWindowXWin: display: " << mXDisplayString 
     133         << "[gadget::InputWindowXWin::config()] Display: " << mXDisplayString 
    121134         << std::endl << vprDEBUG_FLUSH; 
    122135   } 

  • juggler/branches/2.2/modules/vrjuggler/ChangeLog

    r20000 r20085  
    11DATE        AUTHOR      CHANGE 
    22----------- ----------- ------------------------------------------------------- 
     3May-01-2007 patrick     Renamed the x11_pipes property of the display_system 
     4                        config element to pipes. 
     5                        NEW VERSION: 2.1.24 
    36Apr-22-2007 patrick     Application programmers can now choose to use an 
    47                        NSApplication delegate other than VrjMainController. 

  • juggler/branches/2.2/modules/vrjuggler/VERSION

    r20000 r20085  
     12.1.24-0 @05/02/2007 02:00:00 UTC@ 
    122.1.23-0 @04/22/2007 21:20:00 UTC@ 
    232.1.22-0 @04/07/2007 18:00:00 UTC@ 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/C4.displays.closed.jconf

    r19910 r20085  
    33<configuration xmlns="http://www.vrjuggler.org/jccl/xsd/3.0/configuration" name="Configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vrjuggler.org/jccl/xsd/3.0/configuration http://www.vrjuggler.org/jccl/xsd/3.0/configuration.xsd"> 
    44   <elements> 
    5       <display_system name="Pipe Setup" version="2"> 
     5      <display_system name="Pipe Setup" version="3"> 
    66         <number_of_pipes>4</number_of_pipes> 
    7          <x11_pipes>mammoth:0.0</x11_pipes> 
    8          <x11_pipes>mammoth:1.0</x11_pipes> 
    9          <x11_pipes>mammoth:2.0</x11_pipes> 
    10          <x11_pipes>mammoth:1.0</x11_pipes> 
    11          <x11_pipes>snow:0.0</x11_pipes> 
     7         <pipes>mammoth:0.0</pipes> 
     8         <pipes>mammoth:1.0</pipes> 
     9         <pipes>mammoth:2.0</pipes> 
     10         <pipes>mammoth:1.0</pipes> 
     11         <pipes>snow:0.0</pipes> 
    1212         <use_swap_group>false</use_swap_group> 
    1313      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/C4.displays.closed.mono.jconf

    r19910 r20085  
    33<configuration xmlns="http://www.vrjuggler.org/jccl/xsd/3.0/configuration" name="Configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vrjuggler.org/jccl/xsd/3.0/configuration http://www.vrjuggler.org/jccl/xsd/3.0/configuration.xsd"> 
    44   <elements> 
    5       <display_system name="Pipe Setup" version="2"> 
     5      <display_system name="Pipe Setup" version="3"> 
    66         <number_of_pipes>4</number_of_pipes> 
    7          <x11_pipes>mammoth:0.0</x11_pipes> 
    8          <x11_pipes>mammoth:1.0</x11_pipes> 
    9          <x11_pipes>mammoth:2.0</x11_pipes> 
    10          <x11_pipes>mammoth:1.0</x11_pipes> 
    11          <x11_pipes>snow:0.0</x11_pipes> 
     7         <pipes>mammoth:0.0</pipes> 
     8         <pipes>mammoth:1.0</pipes> 
     9         <pipes>mammoth:2.0</pipes> 
     10         <pipes>mammoth:1.0</pipes> 
     11         <pipes>snow:0.0</pipes> 
    1212         <use_swap_group>false</use_swap_group> 
    1313      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/example.sim.cluster.jconf

    r19910 r20085  
    753753      <cluster_node name="Node 0" version="1"> 
    754754         <display_system> 
    755             <display_system name="Node 0 Display System" version="2"> 
     755            <display_system name="Node 0 Display System" version="3"> 
    756756               <number_of_pipes>1</number_of_pipes> 
    757                <x11_pipes>-1</x11_pipes> 
     757               <pipes>-1</pipes> 
    758758               <use_swap_group>false</use_swap_group> 
    759759            </display_system> 
    …… 
    887887      <cluster_node name="Node 1" version="1"> 
    888888         <display_system> 
    889             <display_system name="Node 1 Display System" version="2"> 
     889            <display_system name="Node 1 Display System" version="3"> 
    890890               <number_of_pipes>1</number_of_pipes> 
    891                <x11_pipes>-1</x11_pipes> 
     891               <pipes>-1</pipes> 
    892892               <use_swap_group>false</use_swap_group> 
    893893            </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/powerwall_18x8.jconf

    r19910 r20085  
    462462         <unit>1</unit> 
    463463      </digital_proxy> 
    464       <display_system name="Pipe Setup" version="2"> 
     464      <display_system name="Pipe Setup" version="3"> 
    465465         <number_of_pipes>1</number_of_pipes> 
    466          <x11_pipes>-1</x11_pipes> 
    467          <x11_pipes>:0.1</x11_pipes> 
    468          <x11_pipes>:0.1</x11_pipes> 
    469          <x11_pipes>:0.0</x11_pipes> 
    470          <x11_pipes>:0.0</x11_pipes> 
    471          <x11_pipes>:0.0</x11_pipes> 
    472          <x11_pipes>:0.0</x11_pipes> 
    473          <x11_pipes>:0.0</x11_pipes> 
     466         <pipes>-1</pipes> 
     467         <pipes>:0.1</pipes> 
     468         <pipes>:0.1</pipes> 
     469         <pipes>:0.0</pipes> 
     470         <pipes>:0.0</pipes> 
     471         <pipes>:0.0</pipes> 
     472         <pipes>:0.0</pipes> 
     473         <pipes>:0.0</pipes> 
    474474         <use_swap_group>false</use_swap_group> 
    475475      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/ptah.cluster.jconf

    r19910 r20085  
    2222      <cluster_node name="Node(ptah-1)" version="1"> 
    2323         <display_system> 
    24             <display_system name="display_system 0" version="2"> 
     24            <display_system name="display_system 0" version="3"> 
    2525               <number_of_pipes>1</number_of_pipes> 
    26                <x11_pipes>-1</x11_pipes> 
     26               <pipes>-1</pipes> 
    2727               <use_swap_group>false</use_swap_group> 
    2828            </display_system> 
    …… 
    9494      <cluster_node name="Node(ptah-2)" version="1"> 
    9595         <display_system> 
    96             <display_system name="display_system 0" version="2"> 
     96            <display_system name="display_system 0" version="3"> 
    9797               <number_of_pipes>1</number_of_pipes> 
    98                <x11_pipes>-1</x11_pipes> 
     98               <pipes>-1</pipes> 
    9999               <use_swap_group>false</use_swap_group> 
    100100            </display_system> 
    …… 
    166166      <cluster_node name="Node(ptah-3)" version="1"> 
    167167         <display_system> 
    168             <display_system name="display_system 0" version="2"> 
     168            <display_system name="display_system 0" version="3"> 
    169169               <number_of_pipes>1</number_of_pipes> 
    170                <x11_pipes>-1</x11_pipes> 
     170               <pipes>-1</pipes> 
    171171               <use_swap_group>false</use_swap_group> 
    172172            </display_system> 
    …… 
    238238      <cluster_node name="Node(ptah-4)" version="1"> 
    239239         <display_system> 
    240             <display_system name="display_system 0" version="2"> 
     240            <display_system name="display_system 0" version="3"> 
    241241               <number_of_pipes>1</number_of_pipes> 
    242                <x11_pipes>-1</x11_pipes> 
     242               <pipes>-1</pipes> 
    243243               <use_swap_group>false</use_swap_group> 
    244244            </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/sim.base.jconf

    r19910 r20085  
    479479         <device_host /> 
    480480      </simulated_digital_device> 
    481       <display_system name="Pipe Setup" version="2"> 
     481      <display_system name="Pipe Setup" version="3"> 
    482482         <number_of_pipes>1</number_of_pipes> 
    483          <x11_pipes>-1</x11_pipes> 
    484          <x11_pipes>-1</x11_pipes> 
    485          <x11_pipes>-1</x11_pipes> 
    486          <x11_pipes>-1</x11_pipes> 
    487          <x11_pipes>-1</x11_pipes> 
    488          <x11_pipes>:0.0</x11_pipes> 
    489          <x11_pipes>:0.0</x11_pipes> 
    490          <x11_pipes>:0.0</x11_pipes> 
     483         <pipes>-1</pipes> 
     484         <pipes>-1</pipes> 
     485         <pipes>-1</pipes> 
     486         <pipes>-1</pipes> 
     487         <pipes>-1</pipes> 
     488         <pipes>:0.0</pipes> 
     489         <pipes>:0.0</pipes> 
     490         <pipes>:0.0</pipes> 
    491491         <use_swap_group>false</use_swap_group> 
    492492      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/sim.trackd.jconf

    r18351 r20085  
    9696         <unit>1</unit> 
    9797      </digital_proxy> 
    98       <display_system name="Pipe Setup" version="2"> 
     98      <display_system name="Pipe Setup" version="3"> 
    9999         <number_of_pipes>1</number_of_pipes> 
    100          <x11_pipes>-1</x11_pipes> 
    101          <x11_pipes>:0.1</x11_pipes> 
    102          <x11_pipes>:0.1</x11_pipes> 
    103          <x11_pipes>:0.0</x11_pipes> 
    104          <x11_pipes>:0.0</x11_pipes> 
    105          <x11_pipes>:0.0</x11_pipes> 
    106          <x11_pipes>:0.0</x11_pipes> 
    107          <x11_pipes>:0.0</x11_pipes> 
     100         <pipes>-1</pipes> 
     101         <pipes>:0.1</pipes> 
     102         <pipes>:0.1</pipes> 
     103         <pipes>:0.0</pipes> 
     104         <pipes>:0.0</pipes> 
     105         <pipes>:0.0</pipes> 
     106         <pipes>:0.0</pipes> 
     107         <pipes>:0.0</pipes> 
    108108         <use_swap_group>false</use_swap_group> 
    109109      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/simstandalone.jconf

    r19910 r20085  
    368368         <unit>5</unit> 
    369369      </digital_proxy> 
    370       <display_system name="Pipe Setup" version="2"> 
     370      <display_system name="Pipe Setup" version="3"> 
    371371         <number_of_pipes>1</number_of_pipes> 
    372          <x11_pipes>-1</x11_pipes> 
    373          <x11_pipes>:0.0</x11_pipes> 
     372         <pipes>-1</pipes> 
     373         <pipes>:0.0</pipes> 
    374374         <use_swap_group>false</use_swap_group> 
    375375      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/configFiles/standalone.jconf

    r19915 r20085  
    353353         <unit>5</unit> 
    354354      </digital_proxy> 
    355       <display_system name="Pipe Setup" version="2"> 
     355      <display_system name="Pipe Setup" version="3"> 
    356356         <number_of_pipes>1</number_of_pipes> 
    357          <x11_pipes>-1</x11_pipes> 
    358          <x11_pipes>:0.1</x11_pipes> 
    359          <x11_pipes>:0.1</x11_pipes> 
    360          <x11_pipes>:0.0</x11_pipes> 
    361          <x11_pipes>:0.0</x11_pipes> 
    362          <x11_pipes>:0.0</x11_pipes> 
    363          <x11_pipes>:0.0</x11_pipes> 
    364          <x11_pipes>:0.0</x11_pipes> 
     357         <pipes>-1</pipes> 
     358         <pipes>:0.1</pipes> 
     359         <pipes>:0.1</pipes> 
     360         <pipes>:0.0</pipes> 
     361         <pipes>:0.0</pipes> 
     362         <pipes>:0.0</pipes> 
     363         <pipes>:0.0</pipes> 
     364         <pipes>:0.0</pipes> 
    365365         <use_swap_group>false</use_swap_group> 
    366366      </display_system> 

  • juggler/branches/2.2/modules/vrjuggler/data/definitions/display_system.jdef

    r19774 r20085  
    5858      </upgrade_transform> 
    5959   </definition_version> 
     60   <definition_version version="3" label="Display System"> 
     61      <abstract>false</abstract> 
     62      <help>Graphics pipe configuration for display windows. (&lt;a href="http://www.infiscape.com/documentation/vrjuggler-config/2.0/configuring_vr_juggler/ch03.html#section.display.manager"&gt;more on the Display Manager&lt;/a&gt;)</help> 
     63      <parent/> 
     64      <category>/Display</category> 
     65      <property valuetype="integer" variable="false" name="number_of_pipes"> 
     66         <help>The number of pipes on the system. (&lt;a href="http://www.infiscape.com/documentation/vrjuggler-config/2.0/configuring_vr_juggler/ch03.html#section.display.manager"&gt;more ...&lt;/a&gt;)</help> 
     67         <value label="Number of Pipes" defaultvalue="0"/> 
     68      </property> 
     69      <property valuetype="string" variable="true" name="pipes"> 
     70         <help>The pipe identifier. For the X Window System, this is the display string for a pipe (e.g., :1.0). The string "-1" is treated as being equal to the &lt;tt&gt;$DISPLAY&lt;/tt&gt; environment variable. For Cocoa, this is treated as an integer index into the available screens. NOTE: This is a zero-based list. (&lt;a href="http://www.infiscape.com/documentation/vrjuggler-config/2.0/configuring_vr_juggler/ch03.html#section.display.manager"&gt;more ...&lt;/a&gt;)</help> 
     71         <value label="Pipe Identifier" defaultvalue=":0.0"/> 
     72      </property> 
     73        <property valuetype="boolean" variable="false" name="use_swap_group"> 
     74         <help>If true, attempt to use a hardware swap group to keep all window buffer swaps in sync.  Also if using cluster this will try to create a swap group across the cluster.</help> 
     75         <value label="Use Swap Group" defaultvalue="false"/> 
     76      </property> 
     77      <upgrade_transform> 
     78         <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jconf="http://www.vrjuggler.org/jccl/xsd/3.0/configuration" version="1.0"> 
     79            <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/> 
     80            <xsl:variable name="jconf">http://www.vrjuggler.org/jccl/xsd/3.0/configuration</xsl:variable> 
     81 
     82            <xsl:template match="/"> 
     83                <xsl:apply-templates/> 
     84            </xsl:template> 
     85 
     86            <xsl:template match="jconf:display_system"> 
     87               <xsl:element namespace="{$jconf}" name="display_system"> 
     88                  <xsl:attribute name="name"> 
     89                     <xsl:value-of select="@name"/> 
     90                  </xsl:attribute> 
     91                  <xsl:attribute name="version">3</xsl:attribute> 
     92                  <xsl:copy-of select="./jconf:number_of_pipes"/> 
     93                  <xsl:for-each select="./jconf:x11_pipes"> 
     94                     <xsl:element namespace="{$jconf}" name="pipes"> 
     95                        <xsl:value-of select="."/> 
     96                     </xsl:element> 
     97                  </xsl:for-each> 
     98                  <xsl:copy-of select="./jconf:use_swap_group"/> 
     99               </xsl:element> 
     100            </xsl:template> 
     101         </xsl:stylesheet> 
     102      </upgrade_transform> 
     103   </definition_version> 
    60104</definition> 

  • juggler/branches/2.2/modules/vrjuggler/vrj/Display/DisplayManager.cpp

    r19873 r20085  
    6363            if ( (*i)->getID() == std::string("display_system") ) 
    6464            { 
    65                mDisplaySystemElement = *i; 
    66                break;         // This guarantees that we get the first displaySystem element. 
     65               setDisplaySystemElement(*i); 
     66               break;         // This guarantees that we get the first display_system element. 
    6767            } 
    6868         } 
    …… 
    9090            if ( (*i).mElement->getID() == std::string("display_system") ) 
    9191            { 
    92                mDisplaySystemElement = (*i).mElement; 
    93                break;         // This guarantees that we get the first displaySystem element. 
     92               setDisplaySystemElement((*i).mElement); 
     93               break;         // This guarantees that we get the first display_system element. 
    9494            } 
    9595         } 
    …… 
    100100 
    101101   return mDisplaySystemElement; 
     102} 
     103 
     104void DisplayManager::setDisplaySystemElement(jccl::ConfigElementPtr elt) 
     105{ 
     106   if ( elt->getVersion() < 3 ) 
     107   { 
     108      vprDEBUG(vrjDBG_DISP_MGR, vprDBG_WARNING_LVL) 
     109         << clrOutBOLD(clrYELLOW, "WARNING") << ": Display system element '" 
     110         << elt->getName() << "'" << std::endl; 
     111      vprDEBUG_NEXTnl(vrjDBG_DISP_MGR, vprDBG_WARNING_LVL) 
     112         << "         is out of date.\n"; 
     113      vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL) 
     114         << "         Expected version 3 but found version " 
     115         << elt->getVersion() << ".  Pipe\n"; 
     116      vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL) 
     117         << "         configurations will not work.\n" << vprDEBUG_FLUSH; 
     118   } 
     119 
     120   mDisplaySystemElement = elt; 
    102121} 
    103122 
    …… 
    271290   return success_flag; 
    272291} 
    273  
    274  
    275  
    276292 
    277293// notifyDrawMgr = 0; Defaults to 0 
    …… 
    384400} 
    385401 
    386  
    387402void DisplayManager::updateProjections(const float scaleFactor) 
    388403{ 
    …… 
    401416} 
    402417 
    403 }; 
     418} 

  • juggler/branches/2.2/modules/vrjuggler/vrj/Display/DisplayManager.h

    r19873 r20085  
    124124 
    125125private: 
     126   void setDisplaySystemElement(jccl::ConfigElementPtr elt); 
     127 
    126128   /** 
    127129    * Adds the element to the configuration. 

  • juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlWindowCocoa.mm

    r19884 r20085  
    4545#include <jccl/Config/ConfigElement.h> 
    4646 
     47#include <vrj/Display/DisplayManager.h> 
    4748#include <vrj/Util/Debug.h> 
    4849#import <vrj/Draw/OGL/GlViewCocoa.h> 
    …… 
    337338      [NSString stringWithUTF8String:display_elt->getName().c_str()]; 
    338339 
    339    // TODO: Could use +screens from NSScreen to allow opening of windows on 
    340    // different screens. The display system configuration isn't necessarily 
    341    // important. We could use the display ID in the display window 
    342    // configuration as the screen index. 
    343 /* 
     340   // Use +screens from NSScreen to allow opening of windows on different 
     341   // screens. 
    344342   const int screen_num = displayWindow->getPipe(); 
    345343 
    …… 
    348346      << std::endl << vprDEBUG_FLUSH; 
    349347 
    350    if ( screen_num >= 0 ) 
    351    { 
    352       jccl::ConfigElementPtr disp_sys_elt = 
    353          DisplayManager::instance()->getDisplaySystemElement(); 
     348   jccl::ConfigElementPtr disp_sys_elt = 
     349      vrj::DisplayManager::instance()->getDisplaySystemElement(); 
     350 
     351   if ( screen_num >= 0 && screen_num < disp_sys_elt->getNum("pipes") ) 
     352   { 
    354353      mScreen = disp_sys_elt->getProperty<unsigned int>("pipes", screen_num); 
    355354 
    356       NSArray* screens = [NSArray screens]; 
     355      NSArray* screens = [NSScreen screens]; 
    357356      if ( mScreen >= [screens count] ) 
    358357      { 
    …… 
    361360 
    362361      vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL) 
    363          << "[vrj::GlWindowCocoa] Screen: " << mScreen << std::endl 
     362         << "[vrj::GlWindowCocoa::config()] Screen: " << mScreen << std::endl 
    364363         << vprDEBUG_FLUSH; 
    365364   } 
    366 */ 
    367365 
    368366   // If we are opening the window full screen, then ignore whatever the 

  • juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlWindowWin32.cpp

    r19917 r20085  
    296296   vprASSERT(mPipe >= 0); 
    297297 
    298    mXDisplayName = disp_sys_elt->getProperty<std::string>("x11_pipes", mPipe); 
     298   mXDisplayName = disp_sys_elt->getProperty<std::string>("pipes", mPipe); 
    299299   if (mXDisplayName == neg_one_STRING)    // Use display env 
    300300   { 

  • juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlWindowXWin.cpp

    r19917 r20085  
    543543   //       not present. So if a pipe string is not specified for this pipe then 
    544544   //       it gets the default value of "-1". 
    545    mXDisplayName = disp_sys_elt->getProperty<std::string>("x11_pipes", mPipe); 
     545   mXDisplayName = disp_sys_elt->getProperty<std::string>("pipes", mPipe); 
    546546 
    547547   if ( mXDisplayName == neg_one_string )    // Use display env 

  • juggler/branches/2.2/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp

    r19938 r20085  
    129129      //       value is not present. So if a pipe string is not specified for 
    130130      //       this pipe then it gets the default value of "-1". 
    131       mPipeStrs.push_back(element->getProperty<std::string>("x11_pipes", i)); 
     131      mPipeStrs.push_back(element->getProperty<std::string>("pipes", i)); 
    132132 
    133133      if ( mPipeStrs[i] == cur_disp_name )    // Use display env